allow vfp2 and allow setting arm_version option

Last-Update: 2022-08-29
Forwarded: https://github.com/nodejs/node/issues/44357

Gbp-Pq: Topic armel
Gbp-Pq: Name configure.patch

diff --git a/configure.py b/configure.py
index 978cd3018505d3ef14d242f1241c7f4ad55b8239..4f91634a81e2316bf4bfa591883a67c70793cd68 100755 (executable)
--- a/configure.py
+++ b/configure.py
@@ -50,7 +50,7 @@ valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux',
 valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64el', 'ppc',
               'ppc64', 'x64', 'x86', 'x86_64', 's390x', 'riscv64', 'loong64')
 valid_arm_float_abi = ('soft', 'softfp', 'hard')
-valid_arm_fpu = ('vfp', 'vfpv3', 'vfpv3-d16', 'neon')
+valid_arm_fpu = ('vfp', 'vfpv2', 'vfpv3', 'vfpv3-d16', 'neon')
 valid_mips_arch = ('loongson', 'r1', 'r2', 'r6', 'rx')
 valid_mips_fpu = ('fp32', 'fp64', 'fpxx')
 valid_mips_float_abi = ('soft', 'hard')
@@ -631,6 +631,13 @@ parser.add_argument('--with-arm-fpu',
     choices=valid_arm_fpu,
     help=f"ARM FPU mode ({', '.join(valid_arm_fpu)}) [default: %(default)s]")
 
+parser.add_argument('--with-arm-version',
+    action='store',
+    dest='arm_version',
+    default=None,
+    help='ARM Version'
+)
+
 parser.add_argument('--with-mips-arch-variant',
     action='store',
     dest='mips_arch_variant',
@@ -1300,8 +1307,9 @@ def configure_arm(o):
     arm_float_abi = 'default'
 
   arm_fpu = 'vfp'
-
-  if is_arch_armv7():
+  if options.arm_version:
+    o['variables']['arm_version'] = options.arm_version
+  elif is_arch_armv7():
     arm_fpu = 'vfpv3'
     o['variables']['arm_version'] = '7'
   else: