Clean up ARM preconfigure.

This commit is contained in:
Roland McGrath 2013-03-11 09:26:43 -07:00
parent 80f844c9d8
commit 3ad6c54707
3 changed files with 109 additions and 46 deletions

View File

@ -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> 2013-03-11 Andreas Schwab <schwab@suse.de>
[BZ #15234] [BZ #15234]

View File

@ -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 case "$machine" in
arm*) arm*)
base_machine=arm case $config_os in
case $config_os in linux-gnueabi*)
linux-gnueabi*) if "${CFLAGS+set}" != "set" ; then
# Lets ask the compiler which ARM family we've got CFLAGS="-g -O2"
# Unfortunately it doesn't define any flags for implementations fi
# that you might pass to -mcpu or -mtune CFLAGS="$CFLAGS -fno-unwind-tables"
# Note if you add patterns here you must ensure that ;;
# an appropriate directory exists in sysdeps/arm linux*)
archcppflag=`echo "" | as_fn_error $? "Old ABI no longer supported" "$LINENO" 5
$CC $CFLAGS $CPPFLAGS -E -dM - | ;;
grep '__ARM_ARCH_[0-9].*__' | esac
sed -e 's/^#define //' -e 's/ .*//'`
case x$archcppflag in base_machine=arm
x__ARM_ARCH_[89]*__) # Lets ask the compiler which ARM family we've got
machine=armv7 # Unfortunately it doesn't define any flags for implementations
echo "Found compiler is configured for something newer than v7 - using v7" # 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'`
x__ARM_ARCH_7A__) case "x$archcppflag" in
machine=armv7 x__ARM_ARCH_89*__)
echo "Found compiler is configured for $machine" 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_6T2__) x__ARM_ARCH_7A__)
machine=armv6t2 machine=armv7
echo "Found compiler is configured for $machine" { $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
echo "Found compiler is configured for $machine"
;;
*)
machine=arm
echo 2>&1 "arm/preconfigure: Did not find ARM architecture type; using default"
;;
esac
machine=arm/$machine x__ARM_ARCH_6T2__)
if [ "${CFLAGS+set}" != "set" ]; then machine=armv6t2
CFLAGS="-g -O2" { $as_echo "$as_me:${as_lineno-$LINENO}: Found compiler is configured for $machine" >&5
fi $as_echo "$as_me: Found compiler is configured for $machine" >&6;}
CFLAGS="$CFLAGS -fno-unwind-tables" ;;
;; x__ARM_ARCH_6*__)
linux*) machine=armv6
echo "Old ABI no longer supported" 2>&1 { $as_echo "$as_me:${as_lineno-$LINENO}: Found compiler is configured for $machine" >&5
exit 1 $as_echo "$as_me: Found compiler is configured for $machine" >&6;}
;; ;;
esac *)
;; 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
esac esac

View File

@ -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