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 <info@bnoordhuis.nl> PR-URL: https://github.com/nodejs/node/pull/4123
This commit is contained in:
parent
0e3912be0b
commit
a7f5dfd14c
9
configure
vendored
9
configure
vendored
@ -557,18 +557,13 @@ def cc_macros(cc=None):
|
|||||||
def is_arch_armv7():
|
def is_arch_armv7():
|
||||||
"""Check for ARMv7 instructions"""
|
"""Check for ARMv7 instructions"""
|
||||||
cc_macros_cache = cc_macros()
|
cc_macros_cache = cc_macros()
|
||||||
return ('__ARM_ARCH_7__' in cc_macros_cache or
|
return cc_macros_cache.get('__ARM_ARCH') == '7'
|
||||||
'__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)
|
|
||||||
|
|
||||||
|
|
||||||
def is_arch_armv6():
|
def is_arch_armv6():
|
||||||
"""Check for ARMv6 instructions"""
|
"""Check for ARMv6 instructions"""
|
||||||
cc_macros_cache = cc_macros()
|
cc_macros_cache = cc_macros()
|
||||||
return ('__ARM_ARCH_6__' in cc_macros_cache or
|
return cc_macros_cache.get('__ARM_ARCH') == '6'
|
||||||
'__ARM_ARCH_6M__' in cc_macros_cache)
|
|
||||||
|
|
||||||
|
|
||||||
def is_arm_hard_float_abi():
|
def is_arm_hard_float_abi():
|
||||||
|
Loading…
x
Reference in New Issue
Block a user