From 17169c7557bf35821fb66fcb1dd9aea0d01c6592 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 5 Dec 2016 10:09:09 +0100 Subject: Do not disable thumb instructions on ARMv7+ Chromium in particular the bundled FFMPEG does not build on ARMV7 with thumb disabled. Since thumb should always be available on ARMv7 just ignore possible -marm in QMAKE_CFLAGS in that case. Task-number: QTBUG-57037 Change-Id: I09380839dddb97f64fb35ed749e5af0d002fa5fa Reviewed-by: Michal Klocek --- src/core/gyp_run.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 1850447e7..dc22d14bf 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -86,7 +86,7 @@ contains(QT_ARCH, "arm") { !lessThan(MARMV, 7): GYP_CONFIG += arm_neon_optional=1 } - contains(QMAKE_CFLAGS, "-marm"): GYP_CONFIG += arm_thumb=0 + if(isEmpty(MARMV)|lessThan(MARMV, 7)):contains(QMAKE_CFLAGS, "-marm"): GYP_CONFIG += arm_thumb=0 contains(QMAKE_CFLAGS, "-mthumb"): GYP_CONFIG += arm_thumb=1 } -- cgit v1.2.3