summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2015-01-22 21:51:38 +0100
committerBen Noordhuis <info@bnoordhuis.nl>2015-01-22 23:08:28 +0100
commit7d9d7560cfbd24172ede690e74cedbb4b26e32c9 (patch)
tree38564822629841d244d47d26d529563cf46961b3 /configure
parent297cadbab6a37fa4f14811452e4621770a321371 (diff)
downloadandroid-node-v8-7d9d7560cfbd24172ede690e74cedbb4b26e32c9.tar.gz
android-node-v8-7d9d7560cfbd24172ede690e74cedbb4b26e32c9.tar.bz2
android-node-v8-7d9d7560cfbd24172ede690e74cedbb4b26e32c9.zip
configure: disable vfpv3 on armv6
VFPv3 is ARMv7-only, enabling it for ARMv6 is therefore always wrong. Mea culpa, I do believe I'm the original author of that change. Fixes: https://github.com/iojs/io.js/issues/283 PR-URL: https://github.com/iojs/io.js/pull/559 Reviewed-By: Fedor Indutny <fedor@indutny.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 5 insertions, 5 deletions
diff --git a/configure b/configure
index 5fe87b60fc..ef4de3e57c 100755
--- a/configure
+++ b/configure
@@ -468,14 +468,14 @@ def configure_arm(o):
arm_float_abi = 'default'
if is_arch_armv7():
+ o['variables']['arm_fpu'] = 'vfpv3'
+ o['variables']['arm_neon'] = int(is_arm_neon())
o['variables']['arm_version'] = '7'
- elif is_arch_armv6():
- o['variables']['arm_version'] = '6'
else:
- o['variables']['arm_version'] = 'default'
+ o['variables']['arm_fpu'] = 'vfpv2'
+ o['variables']['arm_neon'] = 0
+ o['variables']['arm_version'] = '6' if is_arch_armv6() else 'default'
- o['variables']['arm_fpu'] = 'vfpv3' # V8 3.18 no longer supports VFP2.
- o['variables']['arm_neon'] = int(is_arm_neon())
o['variables']['arm_thumb'] = 0 # -marm
o['variables']['arm_float_abi'] = arm_float_abi