From 9bd4079822e5db0a9808b6fac8d447d705bc1d66 Mon Sep 17 00:00:00 2001 From: Marc Khouri Date: Tue, 8 Sep 2015 20:40:13 -0400 Subject: [PATCH] build: fix ARM vfp in configure for older ARMs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit changes the default vfp name from 'vfpv2' to 'vfp', affecting builds for ARM architectures older than ARMv7. Valid options for 'arm_fpu' in gcc do NOT include 'vfpv2', causing gcc to quit with error: unrecognized argument in option ‘-mfpu=vfpv2’ when using the configure script with --dest-cpu=arm. Gyp also expects only vfp, vfpv3-d16, vfpv3, neon. GCC reference for the -mfpu= option: https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html Gyp makefile reference: https://github.com/nodejs/node/blob/v4.0.0/Makefile.build#L173 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 6c8dfde4324363..b3a67369fde9b0 100755 --- a/configure +++ b/configure @@ -604,7 +604,7 @@ def configure_arm(o): o['variables']['arm_fpu'] = 'vfpv3' o['variables']['arm_version'] = '7' else: - o['variables']['arm_fpu'] = 'vfpv2' + o['variables']['arm_fpu'] = 'vfp' o['variables']['arm_version'] = '6' if is_arch_armv6() else 'default' o['variables']['arm_thumb'] = 0 # -marm