From 1331c66c937f1c3e10e193932db2037dc38434e9 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Wed, 15 Oct 2014 17:02:16 +1100 Subject: [PATCH 5/6] Fix ARM NEON detection for -mfpu=neon-vfpv4 Upstream-Status: Backport Change-Id: I972d3560d6aa2640a2702f219cf802d2476b1c6e Reviewed-by: Andras Becsi Signed-off-by: Jonathan Liu --- 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 4845af2..66e97f4 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -64,7 +64,7 @@ cross_compile { # If the toolchain does not explicitly specify to use NEON instructions # we use arm_neon_optional for ARMv7 and newer and let chromium decide # about the mfpu option. - contains(MFPU, "neon"): GYP_ARGS += "-D arm_fpu=\"$$MFPU\" -D arm_neon=1" + contains(MFPU, "neon")|contains(MFPU, "neon-vfpv4"): GYP_ARGS += "-D arm_fpu=\"$$MFPU\" -D arm_neon=1" else:!lessThan(MARMV, 7): GYP_ARGS += "-D arm_neon=0 -D arm_neon_optional=1" else: GYP_ARGS += "-D arm_fpu=\"$$MFPU\" -D arm_neon=0 -D arm_neon_optional=0" } -- 2.1.1