From: Richard Henderson <rth@twiddle.net>
Date: Fri, 15 Feb 2013 20:54:26 +0000 (-0800)
Subject: arm: Update preconfigure fragment for gcc 4.8
X-Git-Tag: glibc-2.18~634
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60812ba09d346d2d355bd8272c5e75ca55bc8f03;p=thirdparty%2Fglibc.git

arm: Update preconfigure fragment for gcc 4.8

New defines from gcc 4.8:
 #define __ARM_ARCH_ISA_ARM 1
 #define __ARM_ARCH_PROFILE 65
 #define __ARM_ARCH_ISA_THUMB 2
 #define __ARM_ARCH 7

all of which got in the way of the one we wanted:
 #define __ARM_ARCH_7A__ 1
---

diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 9e91ad112b4..e7bc402591e 100644
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,3 +1,7 @@
+2013-02-28  Richard Henderson <rth@redhat.com>
+
+	* sysdeps/arm/preconfigure: Adjust scan for __ARM_ARCH_* defines.
+
 2013-02-27  Roland McGrath  <roland@hack.frob.com>
 
 	* sysdeps/arm/sysdep.h (CFI_SECTIONS): New macro.
diff --git a/ports/sysdeps/arm/preconfigure b/ports/sysdeps/arm/preconfigure
index 20f6d91a12b..e3762afc25f 100644
--- a/ports/sysdeps/arm/preconfigure
+++ b/ports/sysdeps/arm/preconfigure
@@ -10,7 +10,7 @@ arm*)
 		# an appropriate directory exists in sysdeps/arm
 		archcppflag=`echo "" |
 		$CC $CFLAGS $CPPFLAGS -E -dM - |
-		  grep __ARM_ARCH |
+		  grep '__ARM_ARCH_[0-9].*__' |
 		  sed -e 's/^#define //' -e 's/ .*//'`
 
 		case x$archcppflag in