diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-03-03 17:10:55 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-03-03 17:10:55 +0000 |
| commit | d15f124ff59606604c0243ee19cd67bc99ecd09f (patch) | |
| tree | f0b18e431b15b797d5f5dc980928cd1a26b8f74a /libc/ports/sysdeps/arm/preconfigure | |
| parent | c1078e9067234e88d5c1ca8af18ae67b64141d66 (diff) | |
Merge changes between r22241 and r22552 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@22553 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/ports/sysdeps/arm/preconfigure')
| -rw-r--r-- | libc/ports/sysdeps/arm/preconfigure | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libc/ports/sysdeps/arm/preconfigure b/libc/ports/sysdeps/arm/preconfigure index 20f6d91a1..6d61b1428 100644 --- a/libc/ports/sysdeps/arm/preconfigure +++ b/libc/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 @@ -28,7 +28,10 @@ arm*) machine=armv6t2 echo "Found compiler is configured for $machine" ;; - + x__ARM_ARCH_6*__) + machine=armv6 + echo "Found compiler is configured for $machine" + ;; *) machine=arm echo 2>&1 "arm/preconfigure: Did not find ARM architecture type; using default" |