From: João Reis <reis@janeasystems.com>
Date: Wed, 2 Dec 2015 02:37:08 +0000 (+0000)
Subject: configure: use __ARM_ARCH to determine arm version
X-Git-Tag: v4.2.4~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc40b7595996122278cbeb2a44e015ade3f6db91;p=platform%2Fupstream%2Fnodejs.git

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
---

diff --git a/configure b/configure
index bfdc269..6bb85a8 100755
--- a/configure
+++ b/configure
@@ -543,18 +543,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():