From: Jérémy Lal <kapouer@melix.org>
Date: Wed, 9 Nov 2022 17:16:06 +0000 (+0000)
Subject: allow vfp2 and allow setting arm_version option
X-Git-Tag: archive/raspbian/18.12.1+dfsg-2+rpi1^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c66d35db095cd820719ac0806bc76cdfa1c68a63;p=nodejs.git

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 1ceb942d7..fd59bc7f9 100755
--- a/configure.py
+++ b/configure.py
@@ -49,7 +49,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')
@@ -522,6 +522,13 @@ parser.add_argument('--with-arm-fpu',
     help='ARM FPU mode ({0}) [default: %(default)s]'.format(
         ', '.join(valid_arm_fpu)))
 
+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',
@@ -1191,8 +1198,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: