configure: use __ARM_ARCH to determine arm version

joaocgreis · joaocgreis · commit a7f5dfd14cff · 2015-12-09T14:59:25.000Z
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: #4123
diff --git 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():

-Original file line number
+Diff line change
 defis_arch_armv7():
 """Check for ARMv7 instructions"""
 cc_macros_cache=cc_macros()
 -return ('__ARM_ARCH_7__'incc_macros_cacheor
 -'__ARM_ARCH_7A__'incc_macros_cacheor
 -'__ARM_ARCH_7R__'incc_macros_cacheor
 -'__ARM_ARCH_7M__'incc_macros_cacheor
 -'__ARM_ARCH_7S__'incc_macros_cache)
 +returncc_macros_cache.get('__ARM_ARCH') =='7'
 defis_arch_armv6():
 """Check for ARMv6 instructions"""
 cc_macros_cache=cc_macros()
 -return ('__ARM_ARCH_6__'incc_macros_cacheor
 -'__ARM_ARCH_6M__'incc_macros_cache)
 +returncc_macros_cache.get('__ARM_ARCH') =='6'
 defis_arm_hard_float_abi():