summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2014-10-15 17:02:16 +1100
committerJonathan Liu <net147@gmail.com>2014-10-15 11:43:30 +0200
commit6b64f42363308a80044cc85ae8ba6c9bf1aac8a7 (patch)
tree2307bfc3bc145818169b9fd5ae6fce9ea5405855
parentca0da5d74a495247c2d7408fba8d918754ad49d3 (diff)
Fix ARM NEON detection for -mfpu=neon-vfpv4
Change-Id: I972d3560d6aa2640a2702f219cf802d2476b1c6e Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-rw-r--r--src/core/gyp_run.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index f79972a2..026e3a2f 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -69,7 +69,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"
}