From 80f813db5244b4a74c79acc7f41308f78a1e0731 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9my=20Lal?= Date: Fri, 6 Jan 2023 20:15:20 +0000 Subject: [PATCH] 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 --- configure.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/configure.py b/configure.py index 1f504c388..63f13c85f 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') @@ -529,6 +529,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', @@ -1210,8 +1217,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: -- 2.30.2