From bffd8eeef26f8a57fcb457e40901ff55de966920 Mon Sep 17 00:00:00 2001 From: dlong Date: Thu, 15 Jan 2015 15:12:38 -0500 Subject: 8068927: AARCH64: better handling of aarch64- triples Summary: convert aarch64- to arm-, let upstream code do the work, then convert back to aarch64- Reviewed-by: ihse --- common/autoconf/build-aux/config.sub | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) (limited to 'common') diff --git a/common/autoconf/build-aux/config.sub b/common/autoconf/build-aux/config.sub index c0f059b..cc958da 100644 --- a/common/autoconf/build-aux/config.sub +++ b/common/autoconf/build-aux/config.sub @@ -41,25 +41,8 @@ while test $# -gt 0 ; do case $1 in -- ) # Stop option processing shift; break ;; - aarch64-gnu ) - sub_args="$sub_args aarch64-unknown-gnu" - shift; ;; - aarch64-linux ) - sub_args="$sub_args aarch64-unknown-linux-gnu" - shift; ;; - aarch64-*-linux ) - os=`echo $1 | sed 's/aarch64-\(.*\)-linux/\1/'` - config="aarch64-unknown-linux-gnu" - sub_args="$sub_args $config" - shift; ;; - aarch64-*-gnu ) - os=`echo $1 | sed 's/aarch64-\(.*\)-gnu.*$/\1/'` - config="aarch64-unknown-gnu" - sub_args="$sub_args $config" - shift; ;; - aarch64-*-linux-* ) - os=`echo $1 | sed 's/aarch64-\(.*\)-linux-.*$/'` - config="aarch64-unknown-linux-gnu" + aarch64-* ) + config=`echo $1 | sed 's/^aarch64-/arm-/'` sub_args="$sub_args $config" shift; ;; - ) # Use stdin as input. @@ -74,9 +57,7 @@ done result=`. $DIR/autoconf-config.sub $sub_args "$@"` exitcode=$? -if [ "x$os" != "x" ] ; then - result=`echo $result | sed "s/-unknown-/-$os-/"` -fi +result=`echo $result | sed "s/^arm-/aarch64-/"` echo $result exit $exitcode -- cgit v1.2.3