From 51976cc1206b79f44231074a0559634816529e32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Wed, 2 Dec 2015 02:37:08 +0000 Subject: [PATCH] configure: use __ARM_ARCH to determine arm version Before this change, configure used processor specific macro defines (like __ARM_ARCH_6M__) to detect the arm processor version. This changes configure to use __ARM_ARCH, that should be defined to the correct version. Reviewed-By: Ben Noordhuis PR-URL: https://github.com/nodejs/node/pull/4123 --- configure | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 10ca4d6a35..2d5919aa0b 100755 --- a/configure +++ b/configure @@ -557,18 +557,13 @@ def cc_macros(cc=None): def is_arch_armv7(): """Check for ARMv7 instructions""" cc_macros_cache = cc_macros() - return ('__ARM_ARCH_7__' in cc_macros_cache or - '__ARM_ARCH_7A__' in cc_macros_cache or - '__ARM_ARCH_7R__' in cc_macros_cache or - '__ARM_ARCH_7M__' in cc_macros_cache or - '__ARM_ARCH_7S__' in cc_macros_cache) + return cc_macros_cache.get('__ARM_ARCH') == '7' def is_arch_armv6(): """Check for ARMv6 instructions""" cc_macros_cache = cc_macros() - return ('__ARM_ARCH_6__' in cc_macros_cache or - '__ARM_ARCH_6M__' in cc_macros_cache) + return cc_macros_cache.get('__ARM_ARCH') == '6' def is_arm_hard_float_abi():