about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2013-02-15 12:54:26 -0800
committerRichard Henderson <rth@twiddle.net>2013-02-28 00:04:34 -0800
commit60812ba09d346d2d355bd8272c5e75ca55bc8f03 (patch)
treec39e82dda4fb314fde6b97ae5dba78eaaf3b88e4
parent8d19fe64eeeece42639c65f9a73558f89ffbe7bb (diff)
downloadglibc-60812ba09d346d2d355bd8272c5e75ca55bc8f03.tar.gz
glibc-60812ba09d346d2d355bd8272c5e75ca55bc8f03.tar.xz
glibc-60812ba09d346d2d355bd8272c5e75ca55bc8f03.zip
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
-rw-r--r--ports/ChangeLog.arm4
-rw-r--r--ports/sysdeps/arm/preconfigure2
2 files changed, 5 insertions, 1 deletions
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 9e91ad112b..e7bc402591 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 20f6d91a12..e3762afc25 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