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 9e91ad1..e7bc402 100644 (file)
--- 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 20f6d91..e3762af 100644 (file)
--- 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