diff options
| -rw-r--r-- | ports/ChangeLog.arm | 5 | ||||
| -rw-r--r-- | ports/sysdeps/arm/preconfigure | 97 | ||||
| -rw-r--r-- | ports/sysdeps/arm/preconfigure.in | 53 |
3 files changed, 109 insertions, 46 deletions
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm index 3837c6750e..55184f69da 100644 --- a/ports/ChangeLog.arm +++ b/ports/ChangeLog.arm @@ -1,3 +1,8 @@ +2013-03-11 Roland McGrath <roland@hack.frob.com> + + * sysdeps/arm/preconfigure.in: New file. + * sysdeps/arm/preconfigure: Replaced with generated file. + 2013-03-11 Andreas Schwab <schwab@suse.de> [BZ #15234] diff --git a/ports/sysdeps/arm/preconfigure b/ports/sysdeps/arm/preconfigure index 6d61b14281..0042aaf240 100644 --- a/ports/sysdeps/arm/preconfigure +++ b/ports/sysdeps/arm/preconfigure @@ -1,53 +1,58 @@ +# This file is generated from configure.in by Autoconf. DO NOT EDIT! + # Local preconfigure fragment for sysdeps/arm + case "$machine" in arm*) - base_machine=arm - case $config_os in - linux-gnueabi*) - # Lets ask the compiler which ARM family we've got - # Unfortunately it doesn't define any flags for implementations - # that you might pass to -mcpu or -mtune - # Note if you add patterns here you must ensure that - # an appropriate directory exists in sysdeps/arm - archcppflag=`echo "" | - $CC $CFLAGS $CPPFLAGS -E -dM - | - grep '__ARM_ARCH_[0-9].*__' | - sed -e 's/^#define //' -e 's/ .*//'` + case $config_os in + linux-gnueabi*) + if "${CFLAGS+set}" != "set" ; then + CFLAGS="-g -O2" + fi + CFLAGS="$CFLAGS -fno-unwind-tables" + ;; + linux*) + as_fn_error $? "Old ABI no longer supported" "$LINENO" 5 + ;; + esac + + base_machine=arm + # Lets ask the compiler which ARM family we've got + # Unfortunately it doesn't define any flags for implementations + # that you might pass to -mcpu or -mtune + # Note if you add patterns here you must ensure that + # an appropriate directory exists in sysdeps/arm + archcppflag=`$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null | + sed -n 's/^#define \(__ARM_ARCH_[0-9].*__\) .*$/\1/p'` - case x$archcppflag in - x__ARM_ARCH_[89]*__) - machine=armv7 - echo "Found compiler is configured for something newer than v7 - using v7" - ;; + case "x$archcppflag" in + x__ARM_ARCH_89*__) + machine=armv7 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found compiler is configured for something newer than v7 - using v7" >&5 +$as_echo "$as_me: Found compiler is configured for something newer than v7 - using v7" >&6;} + ;; - x__ARM_ARCH_7A__) - machine=armv7 - echo "Found compiler is configured for $machine" - ;; + x__ARM_ARCH_7A__) + machine=armv7 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found compiler is configured for $machine" >&5 +$as_echo "$as_me: Found compiler is configured for $machine" >&6;} + ;; - x__ARM_ARCH_6T2__) - 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" - ;; - esac + x__ARM_ARCH_6T2__) + machine=armv6t2 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found compiler is configured for $machine" >&5 +$as_echo "$as_me: Found compiler is configured for $machine" >&6;} + ;; + x__ARM_ARCH_6*__) + machine=armv6 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found compiler is configured for $machine" >&5 +$as_echo "$as_me: Found compiler is configured for $machine" >&6;} + ;; + *) + machine=arm + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: arm/preconfigure: Did not find ARM architecture type; using default" >&5 +$as_echo "$as_me: WARNING: arm/preconfigure: Did not find ARM architecture type; using default" >&2;} + ;; + esac - machine=arm/$machine - if [ "${CFLAGS+set}" != "set" ]; then - CFLAGS="-g -O2" - fi - CFLAGS="$CFLAGS -fno-unwind-tables" - ;; - linux*) - echo "Old ABI no longer supported" 2>&1 - exit 1 - ;; - esac - ;; + machine=arm/$machine esac diff --git a/ports/sysdeps/arm/preconfigure.in b/ports/sysdeps/arm/preconfigure.in new file mode 100644 index 0000000000..f3272f11cd --- /dev/null +++ b/ports/sysdeps/arm/preconfigure.in @@ -0,0 +1,53 @@ +GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. +# Local preconfigure fragment for sysdeps/arm + +case "$machine" in +arm*) + case $config_os in + linux-gnueabi*) + if [ "${CFLAGS+set}" != "set" ]; then + CFLAGS="-g -O2" + fi + CFLAGS="$CFLAGS -fno-unwind-tables" + ;; + linux*) + AC_MSG_ERROR([Old ABI no longer supported]) + ;; + esac + + base_machine=arm + # Lets ask the compiler which ARM family we've got + # Unfortunately it doesn't define any flags for implementations + # that you might pass to -mcpu or -mtune + # Note if you add patterns here you must ensure that + # an appropriate directory exists in sysdeps/arm + archcppflag=`$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null | + sed -n 's/^#define \(__ARM_ARCH_[0-9].*__\) .*$/\1/p'` + + case "x$archcppflag" in + x__ARM_ARCH_[89]*__) + machine=armv7 + AC_MSG_NOTICE([Found compiler is configured for something newer than v7 - using v7]) + ;; + + x__ARM_ARCH_7A__) + machine=armv7 + AC_MSG_NOTICE([Found compiler is configured for $machine]) + ;; + + x__ARM_ARCH_6T2__) + machine=armv6t2 + AC_MSG_NOTICE([Found compiler is configured for $machine]) + ;; + x__ARM_ARCH_6*__) + machine=armv6 + AC_MSG_NOTICE([Found compiler is configured for $machine]) + ;; + *) + machine=arm + AC_MSG_WARN([arm/preconfigure: Did not find ARM architecture type; using default]) + ;; + esac + + machine=arm/$machine +esac |