| Message ID | 1393648440-21407-1-git-send-email-ian.campbell@citrix.com |
|---|---|
| State | New |
| Headers | show |
Ping? On Sat, 2014-03-01 at 04:33 +0000, Ian Campbell wrote: > Update to versions from Debian Wheezy's autotools-dev package (20120608.1) > > Adds ARM aarch64 support. > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > --- > Please queue for 4.4.1. I mistakenly thought Wheezy's versions didn't include > aarch64 which is why I didn't send this sooner. > --- > config.guess | 258 ++++++++++++++++++++++++++++++++-------------------------- > config.sub | 218 ++++++++++++++++++++++++++++++++----------------- > 2 files changed, 286 insertions(+), 190 deletions(-) > > diff --git a/config.guess b/config.guess > index c2246a4..d622a44 100755 > --- a/config.guess > +++ b/config.guess > @@ -1,10 +1,10 @@ > #! /bin/sh > # Attempt to guess a canonical system name. > # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, > -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 > -# Free Software Foundation, Inc. > +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, > +# 2011, 2012 Free Software Foundation, Inc. > > -timestamp='2009-12-30' > +timestamp='2012-02-10' > > # This file is free software; you can redistribute it and/or modify it > # under the terms of the GNU General Public License as published by > @@ -17,9 +17,7 @@ timestamp='2009-12-30' > # General Public License for more details. > # > # You should have received a copy of the GNU General Public License > -# along with this program; if not, write to the Free Software > -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA > -# 02110-1301, USA. > +# along with this program; if not, see <http://www.gnu.org/licenses/>. > # > # As a special exception to the GNU General Public License, if you > # distribute this file as part of a program that contains a > @@ -57,8 +55,8 @@ GNU config.guess ($timestamp) > > Originally written by Per Bothner. > Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, > -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free > -Software Foundation, Inc. > +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 > +Free Software Foundation, Inc. > > This is free software; see the source for copying conditions. There is NO > warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." > @@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown > case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in > *:NetBSD:*:*) > # NetBSD (nbsd) targets should (where applicable) match one or > - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, > + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, > # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently > # switched to ELF, *-*-netbsd* would select the old > # object file format. This provides both forward > @@ -181,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in > fi > ;; > *) > - os=netbsd > + os=netbsd > ;; > esac > # The OS release > @@ -224,7 +222,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in > UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` > ;; > *5.*) > - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` > + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` > ;; > esac > # According to Compaq, /usr/sbin/psrinfo has been available on > @@ -270,7 +268,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in > # A Xn.n version is an unreleased experimental baselevel. > # 1.2 uses "1.2" for uname -r. > echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` > - exit ;; > + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. > + exitcode=$? > + trap '' 0 > + exit $exitcode ;; > Alpha\ *:Windows_NT*:*) > # How do we know it's Interix rather than the generic POSIX subsystem? > # Should we change UNAME_MACHINE based on the output of uname instead > @@ -296,7 +297,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in > echo s390-ibm-zvmoe > exit ;; > *:OS400:*:*) > - echo powerpc-ibm-os400 > + echo powerpc-ibm-os400 > exit ;; > arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) > echo arm-acorn-riscix${UNAME_RELEASE} > @@ -395,23 +396,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in > # MiNT. But MiNT is downward compatible to TOS, so this should > # be no problem. > atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) > - echo m68k-atari-mint${UNAME_RELEASE} > + echo m68k-atari-mint${UNAME_RELEASE} > exit ;; > atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) > echo m68k-atari-mint${UNAME_RELEASE} > - exit ;; > + exit ;; > *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) > - echo m68k-atari-mint${UNAME_RELEASE} > + echo m68k-atari-mint${UNAME_RELEASE} > exit ;; > milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) > - echo m68k-milan-mint${UNAME_RELEASE} > - exit ;; > + echo m68k-milan-mint${UNAME_RELEASE} > + exit ;; > hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) > - echo m68k-hades-mint${UNAME_RELEASE} > - exit ;; > + echo m68k-hades-mint${UNAME_RELEASE} > + exit ;; > *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) > - echo m68k-unknown-mint${UNAME_RELEASE} > - exit ;; > + echo m68k-unknown-mint${UNAME_RELEASE} > + exit ;; > m68k:machten:*:*) > echo m68k-apple-machten${UNAME_RELEASE} > exit ;; > @@ -481,8 +482,8 @@ EOF > echo m88k-motorola-sysv3 > exit ;; > AViiON:dgux:*:*) > - # DG/UX returns AViiON for all architectures > - UNAME_PROCESSOR=`/usr/bin/uname -p` > + # DG/UX returns AViiON for all architectures > + UNAME_PROCESSOR=`/usr/bin/uname -p` > if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] > then > if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ > @@ -495,7 +496,7 @@ EOF > else > echo i586-dg-dgux${UNAME_RELEASE} > fi > - exit ;; > + exit ;; > M88*:DolphinOS:*:*) # DolphinOS (SVR3) > echo m88k-dolphin-sysv3 > exit ;; > @@ -552,7 +553,7 @@ EOF > echo rs6000-ibm-aix3.2 > fi > exit ;; > - *:AIX:*:[456]) > + *:AIX:*:[4567]) > IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` > if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then > IBM_ARCH=rs6000 > @@ -595,52 +596,52 @@ EOF > 9000/[678][0-9][0-9]) > if [ -x /usr/bin/getconf ]; then > sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` > - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` > - case "${sc_cpu_version}" in > - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 > - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 > - 532) # CPU_PA_RISC2_0 > - case "${sc_kernel_bits}" in > - 32) HP_ARCH="hppa2.0n" ;; > - 64) HP_ARCH="hppa2.0w" ;; > + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` > + case "${sc_cpu_version}" in > + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 > + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 > + 532) # CPU_PA_RISC2_0 > + case "${sc_kernel_bits}" in > + 32) HP_ARCH="hppa2.0n" ;; > + 64) HP_ARCH="hppa2.0w" ;; > '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 > - esac ;; > - esac > + esac ;; > + esac > fi > if [ "${HP_ARCH}" = "" ]; then > eval $set_cc_for_build > - sed 's/^ //' << EOF >$dummy.c > + sed 's/^ //' << EOF >$dummy.c > > - #define _HPUX_SOURCE > - #include <stdlib.h> > - #include <unistd.h> > + #define _HPUX_SOURCE > + #include <stdlib.h> > + #include <unistd.h> > > - int main () > - { > - #if defined(_SC_KERNEL_BITS) > - long bits = sysconf(_SC_KERNEL_BITS); > - #endif > - long cpu = sysconf (_SC_CPU_VERSION); > + int main () > + { > + #if defined(_SC_KERNEL_BITS) > + long bits = sysconf(_SC_KERNEL_BITS); > + #endif > + long cpu = sysconf (_SC_CPU_VERSION); > > - switch (cpu) > - { > - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; > - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; > - case CPU_PA_RISC2_0: > - #if defined(_SC_KERNEL_BITS) > - switch (bits) > - { > - case 64: puts ("hppa2.0w"); break; > - case 32: puts ("hppa2.0n"); break; > - default: puts ("hppa2.0"); break; > - } break; > - #else /* !defined(_SC_KERNEL_BITS) */ > - puts ("hppa2.0"); break; > - #endif > - default: puts ("hppa1.0"); break; > - } > - exit (0); > - } > + switch (cpu) > + { > + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; > + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; > + case CPU_PA_RISC2_0: > + #if defined(_SC_KERNEL_BITS) > + switch (bits) > + { > + case 64: puts ("hppa2.0w"); break; > + case 32: puts ("hppa2.0n"); break; > + default: puts ("hppa2.0"); break; > + } break; > + #else /* !defined(_SC_KERNEL_BITS) */ > + puts ("hppa2.0"); break; > + #endif > + default: puts ("hppa1.0"); break; > + } > + exit (0); > + } > EOF > (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` > test -z "$HP_ARCH" && HP_ARCH=hppa > @@ -731,22 +732,22 @@ EOF > exit ;; > C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) > echo c1-convex-bsd > - exit ;; > + exit ;; > C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) > if getsysinfo -f scalar_acc > then echo c32-convex-bsd > else echo c2-convex-bsd > fi > - exit ;; > + exit ;; > C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) > echo c34-convex-bsd > - exit ;; > + exit ;; > C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) > echo c38-convex-bsd > - exit ;; > + exit ;; > C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) > echo c4-convex-bsd > - exit ;; > + exit ;; > CRAY*Y-MP:*:*:*) > echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' > exit ;; > @@ -770,14 +771,14 @@ EOF > exit ;; > F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) > FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` > - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` > - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` > - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" > - exit ;; > + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` > + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` > + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" > + exit ;; > 5000:UNIX_System_V:4.*:*) > - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` > - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` > - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" > + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` > + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` > + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" > exit ;; > i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) > echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} > @@ -789,13 +790,12 @@ EOF > echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} > exit ;; > *:FreeBSD:*:*) > - case ${UNAME_MACHINE} in > - pc98) > - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; > + UNAME_PROCESSOR=`/usr/bin/uname -p` > + case ${UNAME_PROCESSOR} in > amd64) > echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; > *) > - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; > + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; > esac > exit ;; > i*:CYGWIN*:*) > @@ -804,15 +804,18 @@ EOF > *:MINGW*:*) > echo ${UNAME_MACHINE}-pc-mingw32 > exit ;; > + i*:MSYS*:*) > + echo ${UNAME_MACHINE}-pc-msys > + exit ;; > i*:windows32*:*) > - # uname -m includes "-pc" on this system. > - echo ${UNAME_MACHINE}-mingw32 > + # uname -m includes "-pc" on this system. > + echo ${UNAME_MACHINE}-mingw32 > exit ;; > i*:PW*:*) > echo ${UNAME_MACHINE}-pc-pw32 > exit ;; > *:Interix*:*) > - case ${UNAME_MACHINE} in > + case ${UNAME_MACHINE} in > x86) > echo i586-pc-interix${UNAME_RELEASE} > exit ;; > @@ -858,6 +861,13 @@ EOF > i*86:Minix:*:*) > echo ${UNAME_MACHINE}-pc-minix > exit ;; > + aarch64:Linux:*:*) > + echo ${UNAME_MACHINE}-unknown-linux-gnu > + exit ;; > + aarch64_be:Linux:*:*) > + UNAME_MACHINE=aarch64_be > + echo ${UNAME_MACHINE}-unknown-linux-gnu > + exit ;; > alpha:Linux:*:*) > case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in > EV5) UNAME_MACHINE=alphaev5 ;; > @@ -867,7 +877,7 @@ EOF > EV6) UNAME_MACHINE=alphaev6 ;; > EV67) UNAME_MACHINE=alphaev67 ;; > EV68*) UNAME_MACHINE=alphaev68 ;; > - esac > + esac > objdump --private-headers /bin/sh | grep -q ld.so.1 > if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi > echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} > @@ -879,20 +889,29 @@ EOF > then > echo ${UNAME_MACHINE}-unknown-linux-gnu > else > - echo ${UNAME_MACHINE}-unknown-linux-gnueabi > + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ > + | grep -q __ARM_PCS_VFP > + then > + echo ${UNAME_MACHINE}-unknown-linux-gnueabi > + else > + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf > + fi > fi > exit ;; > avr32*:Linux:*:*) > echo ${UNAME_MACHINE}-unknown-linux-gnu > exit ;; > cris:Linux:*:*) > - echo cris-axis-linux-gnu > + echo ${UNAME_MACHINE}-axis-linux-gnu > exit ;; > crisv32:Linux:*:*) > - echo crisv32-axis-linux-gnu > + echo ${UNAME_MACHINE}-axis-linux-gnu > exit ;; > frv:Linux:*:*) > - echo frv-unknown-linux-gnu > + echo ${UNAME_MACHINE}-unknown-linux-gnu > + exit ;; > + hexagon:Linux:*:*) > + echo ${UNAME_MACHINE}-unknown-linux-gnu > exit ;; > i*86:Linux:*:*) > LIBC=gnu > @@ -934,7 +953,7 @@ EOF > test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } > ;; > or32:Linux:*:*) > - echo or32-unknown-linux-gnu > + echo ${UNAME_MACHINE}-unknown-linux-gnu > exit ;; > padre:Linux:*:*) > echo sparc-unknown-linux-gnu > @@ -960,7 +979,7 @@ EOF > echo ${UNAME_MACHINE}-ibm-linux > exit ;; > sh64*:Linux:*:*) > - echo ${UNAME_MACHINE}-unknown-linux-gnu > + echo ${UNAME_MACHINE}-unknown-linux-gnu > exit ;; > sh*:Linux:*:*) > echo ${UNAME_MACHINE}-unknown-linux-gnu > @@ -968,14 +987,17 @@ EOF > sparc:Linux:*:* | sparc64:Linux:*:*) > echo ${UNAME_MACHINE}-unknown-linux-gnu > exit ;; > + tile*:Linux:*:*) > + echo ${UNAME_MACHINE}-unknown-linux-gnu > + exit ;; > vax:Linux:*:*) > echo ${UNAME_MACHINE}-dec-linux-gnu > exit ;; > x86_64:Linux:*:*) > - echo x86_64-unknown-linux-gnu > + echo ${UNAME_MACHINE}-unknown-linux-gnu > exit ;; > xtensa*:Linux:*:*) > - echo ${UNAME_MACHINE}-unknown-linux-gnu > + echo ${UNAME_MACHINE}-unknown-linux-gnu > exit ;; > i*86:DYNIX/ptx:4*:*) > # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. > @@ -984,11 +1006,11 @@ EOF > echo i386-sequent-sysv4 > exit ;; > i*86:UNIX_SV:4.2MP:2.*) > - # Unixware is an offshoot of SVR4, but it has its own version > - # number series starting with 2... > - # I am not positive that other SVR4 systems won't match this, > + # Unixware is an offshoot of SVR4, but it has its own version > + # number series starting with 2... > + # I am not positive that other SVR4 systems won't match this, > # I just have to hope. -- rms. > - # Use sysv4.2uw... so that sysv4* matches it. > + # Use sysv4.2uw... so that sysv4* matches it. > echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} > exit ;; > i*86:OS/2:*:*) > @@ -1020,7 +1042,7 @@ EOF > fi > exit ;; > i*86:*:5:[678]*) > - # UnixWare 7.x, OpenUNIX and OpenServer 6. > + # UnixWare 7.x, OpenUNIX and OpenServer 6. > case `/bin/uname -X | grep "^Machine"` in > *486*) UNAME_MACHINE=i486 ;; > *Pentium) UNAME_MACHINE=i586 ;; > @@ -1048,13 +1070,13 @@ EOF > exit ;; > pc:*:*:*) > # Left here for compatibility: > - # uname -m prints for DJGPP always 'pc', but it prints nothing about > - # the processor, so we play safe by assuming i586. > + # uname -m prints for DJGPP always 'pc', but it prints nothing about > + # the processor, so we play safe by assuming i586. > # Note: whatever this is, it MUST be the same as what config.sub > # prints for the "djgpp" host, or else GDB configury will decide that > # this is a cross-build. > echo i586-pc-msdosdjgpp > - exit ;; > + exit ;; > Intel:Mach:3*:*) > echo i386-pc-mach3 > exit ;; > @@ -1089,8 +1111,8 @@ EOF > /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ > && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; > 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) > - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ > - && { echo i486-ncr-sysv4; exit; } ;; > + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ > + && { echo i486-ncr-sysv4; exit; } ;; > NCR*:*:4.2:* | MPRAS*:*:4.2:*) > OS_REL='.3' > test -r /etc/.relid \ > @@ -1133,10 +1155,10 @@ EOF > echo ns32k-sni-sysv > fi > exit ;; > - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort > - # says <Richard.M.Bartel@ccMail.Census.GOV> > - echo i586-unisys-sysv4 > - exit ;; > + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort > + # says <Richard.M.Bartel@ccMail.Census.GOV> > + echo i586-unisys-sysv4 > + exit ;; > *:UNIX_System_V:4*:FTX*) > # From Gerald Hewes <hewes@openmarket.com>. > # How about differentiating between stratus architectures? -djm > @@ -1162,11 +1184,11 @@ EOF > exit ;; > R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) > if [ -d /usr/nec ]; then > - echo mips-nec-sysv${UNAME_RELEASE} > + echo mips-nec-sysv${UNAME_RELEASE} > else > - echo mips-unknown-sysv${UNAME_RELEASE} > + echo mips-unknown-sysv${UNAME_RELEASE} > fi > - exit ;; > + exit ;; > BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. > echo powerpc-be-beos > exit ;; > @@ -1231,6 +1253,9 @@ EOF > *:QNX:*:4*) > echo i386-pc-qnx > exit ;; > + NEO-?:NONSTOP_KERNEL:*:*) > + echo neo-tandem-nsk${UNAME_RELEASE} > + exit ;; > NSE-?:NONSTOP_KERNEL:*:*) > echo nse-tandem-nsk${UNAME_RELEASE} > exit ;; > @@ -1276,13 +1301,13 @@ EOF > echo pdp10-unknown-its > exit ;; > SEI:*:*:SEIUX) > - echo mips-sei-seiux${UNAME_RELEASE} > + echo mips-sei-seiux${UNAME_RELEASE} > exit ;; > *:DragonFly:*:*) > echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` > exit ;; > *:*VMS:*:*) > - UNAME_MACHINE=`(uname -p) 2>/dev/null` > + UNAME_MACHINE=`(uname -p) 2>/dev/null` > case "${UNAME_MACHINE}" in > A*) echo alpha-dec-vms ; exit ;; > I*) echo ia64-dec-vms ; exit ;; > @@ -1300,6 +1325,9 @@ EOF > i*86:AROS:*:*) > echo ${UNAME_MACHINE}-pc-aros > exit ;; > + x86_64:VMkernel:*:*) > + echo ${UNAME_MACHINE}-unknown-esx > + exit ;; > esac > > #echo '(No uname command or uname output not recognized.)' 1>&2 > @@ -1322,11 +1350,11 @@ main () > #include <sys/param.h> > printf ("m68k-sony-newsos%s\n", > #ifdef NEWSOS4 > - "4" > + "4" > #else > - "" > + "" > #endif > - ); exit (0); > + ); exit (0); > #endif > #endif > > diff --git a/config.sub b/config.sub > index c2d1257..6205f84 100755 > --- a/config.sub > +++ b/config.sub > @@ -1,10 +1,10 @@ > #! /bin/sh > # Configuration validation subroutine script. > # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, > -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 > -# Free Software Foundation, Inc. > +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, > +# 2011, 2012 Free Software Foundation, Inc. > > -timestamp='2010-01-22' > +timestamp='2012-04-18' > > # This file is (in principle) common to ALL GNU software. > # The presence of a machine in this file suggests that SOME GNU software > @@ -21,9 +21,7 @@ timestamp='2010-01-22' > # GNU General Public License for more details. > # > # You should have received a copy of the GNU General Public License > -# along with this program; if not, write to the Free Software > -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA > -# 02110-1301, USA. > +# along with this program; if not, see <http://www.gnu.org/licenses/>. > # > # As a special exception to the GNU General Public License, if you > # distribute this file as part of a program that contains a > @@ -76,8 +74,8 @@ version="\ > GNU config.sub ($timestamp) > > Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, > -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free > -Software Foundation, Inc. > +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 > +Free Software Foundation, Inc. > > This is free software; see the source for copying conditions. There is NO > warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." > @@ -124,13 +122,18 @@ esac > # Here we must recognize all the valid KERNEL-OS combinations. > maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` > case $maybe_os in > - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ > - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ > + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ > + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ > + knetbsd*-gnu* | netbsd*-gnu* | \ > kopensolaris*-gnu* | \ > storm-chaos* | os2-emx* | rtmk-nova*) > os=-$maybe_os > basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` > ;; > + android-linux) > + os=-linux-android > + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown > + ;; > *) > basic_machine=`echo $1 | sed 's/-[^-]*$//'` > if [ $basic_machine != $1 ] > @@ -157,8 +160,8 @@ case $os in > os= > basic_machine=$1 > ;; > - -bluegene*) > - os=-cnk > + -bluegene*) > + os=-cnk > ;; > -sim | -cisco | -oki | -wec | -winbond) > os= > @@ -174,10 +177,10 @@ case $os in > os=-chorusos > basic_machine=$1 > ;; > - -chorusrdb) > - os=-chorusrdb > + -chorusrdb) > + os=-chorusrdb > basic_machine=$1 > - ;; > + ;; > -hiux*) > os=-hiuxwe2 > ;; > @@ -222,6 +225,12 @@ case $os in > -isc*) > basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` > ;; > + -lynx*178) > + os=-lynxos178 > + ;; > + -lynx*5) > + os=-lynxos5 > + ;; > -lynx*) > os=-lynxos > ;; > @@ -246,17 +255,22 @@ case $basic_machine in > # Some are omitted here because they have special meanings below. > 1750a | 580 \ > | a29k \ > + | aarch64 | aarch64_be \ > | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ > | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ > | am33_2.0 \ > | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ > + | be32 | be64 \ > | bfin \ > | c4x | clipper \ > | d10v | d30v | dlx | dsp16xx \ > + | epiphany \ > | fido | fr30 | frv \ > | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ > + | hexagon \ > | i370 | i860 | i960 | ia64 \ > | ip2k | iq2000 \ > + | le32 | le64 \ > | lm32 \ > | m32c | m32r | m32rle | m68000 | m68k | m88k \ > | maxq | mb | microblaze | mcore | mep | metag \ > @@ -282,29 +296,39 @@ case $basic_machine in > | moxie \ > | mt \ > | msp430 \ > + | nds32 | nds32le | nds32be \ > | nios | nios2 \ > | ns16k | ns32k \ > + | open8 \ > | or32 \ > | pdp10 | pdp11 | pj | pjl \ > - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ > + | powerpc | powerpc64 | powerpc64le | powerpcle \ > | pyramid \ > - | rx \ > + | rl78 | rx \ > | score \ > | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ > | sh64 | sh64le \ > | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ > | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ > - | spu | strongarm \ > - | tahoe | thumb | tic4x | tic80 | tron \ > + | spu \ > + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ > | ubicom32 \ > - | v850 | v850e \ > + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ > | we32k \ > - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ > + | x86 | xc16x | xstormy16 | xtensa \ > | z8k | z80) > basic_machine=$basic_machine-unknown > ;; > - m6811 | m68hc11 | m6812 | m68hc12 | picochip) > - # Motorola 68HC11/12. > + c54x) > + basic_machine=tic54x-unknown > + ;; > + c55x) > + basic_machine=tic55x-unknown > + ;; > + c6x) > + basic_machine=tic6x-unknown > + ;; > + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) > basic_machine=$basic_machine-unknown > os=-none > ;; > @@ -314,6 +338,21 @@ case $basic_machine in > basic_machine=mt-unknown > ;; > > + strongarm | thumb | xscale) > + basic_machine=arm-unknown > + ;; > + xgate) > + basic_machine=$basic_machine-unknown > + os=-none > + ;; > + xscaleeb) > + basic_machine=armeb-unknown > + ;; > + > + xscaleel) > + basic_machine=armel-unknown > + ;; > + > # We use `pc' rather than `unknown' > # because (1) that's what they normally are, and > # (2) the word "unknown" tends to confuse beginning users. > @@ -328,21 +367,25 @@ case $basic_machine in > # Recognize the basic CPU types with company name. > 580-* \ > | a29k-* \ > + | aarch64-* | aarch64_be-* \ > | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ > | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ > | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ > | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ > | avr-* | avr32-* \ > + | be32-* | be64-* \ > | bfin-* | bs2000-* \ > - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ > + | c[123]* | c30-* | [cjt]90-* | c4x-* \ > | clipper-* | craynv-* | cydra-* \ > | d10v-* | d30v-* | dlx-* \ > | elxsi-* \ > | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ > | h8300-* | h8500-* \ > | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ > + | hexagon-* \ > | i*86-* | i860-* | i960-* | ia64-* \ > | ip2k-* | iq2000-* \ > + | le32-* | le64-* \ > | lm32-* \ > | m32c-* | m32r-* | m32rle-* \ > | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ > @@ -368,26 +411,29 @@ case $basic_machine in > | mmix-* \ > | mt-* \ > | msp430-* \ > + | nds32-* | nds32le-* | nds32be-* \ > | nios-* | nios2-* \ > | none-* | np1-* | ns16k-* | ns32k-* \ > + | open8-* \ > | orion-* \ > | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ > - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ > + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ > | pyramid-* \ > - | romp-* | rs6000-* | rx-* \ > + | rl78-* | romp-* | rs6000-* | rx-* \ > | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ > | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ > | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ > | sparclite-* \ > - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ > - | tahoe-* | thumb-* \ > + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ > + | tahoe-* \ > | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ > - | tile-* | tilegx-* \ > + | tile*-* \ > | tron-* \ > | ubicom32-* \ > - | v850-* | v850e-* | vax-* \ > + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ > + | vax-* \ > | we32k-* \ > - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ > + | x86-* | x86_64-* | xc16x-* | xps100-* \ > | xstormy16-* | xtensa*-* \ > | ymp-* \ > | z8k-* | z80-*) > @@ -412,7 +458,7 @@ case $basic_machine in > basic_machine=a29k-amd > os=-udi > ;; > - abacus) > + abacus) > basic_machine=abacus-unknown > ;; > adobe68k) > @@ -482,11 +528,20 @@ case $basic_machine in > basic_machine=powerpc-ibm > os=-cnk > ;; > + c54x-*) > + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` > + ;; > + c55x-*) > + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` > + ;; > + c6x-*) > + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` > + ;; > c90) > basic_machine=c90-cray > os=-unicos > ;; > - cegcc) > + cegcc) > basic_machine=arm-unknown > os=-cegcc > ;; > @@ -518,7 +573,7 @@ case $basic_machine in > basic_machine=craynv-cray > os=-unicosmp > ;; > - cr16) > + cr16 | cr16-*) > basic_machine=cr16-unknown > os=-elf > ;; > @@ -676,7 +731,6 @@ case $basic_machine in > i370-ibm* | ibm*) > basic_machine=i370-ibm > ;; > -# I'm not sure what "Sysv32" means. Should this be sysv3.2? > i*86v32) > basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` > os=-sysv32 > @@ -734,7 +788,7 @@ case $basic_machine in > basic_machine=ns32k-utek > os=-sysv > ;; > - microblaze) > + microblaze) > basic_machine=microblaze-xilinx > ;; > mingw32) > @@ -773,10 +827,18 @@ case $basic_machine in > ms1-*) > basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` > ;; > + msys) > + basic_machine=i386-pc > + os=-msys > + ;; > mvs) > basic_machine=i370-ibm > os=-mvs > ;; > + nacl) > + basic_machine=le32-unknown > + os=-nacl > + ;; > ncr3000) > basic_machine=i486-ncr > os=-sysv4 > @@ -841,6 +903,12 @@ case $basic_machine in > np1) > basic_machine=np1-gould > ;; > + neo-tandem) > + basic_machine=neo-tandem > + ;; > + nse-tandem) > + basic_machine=nse-tandem > + ;; > nsr-tandem) > basic_machine=nsr-tandem > ;; > @@ -923,9 +991,10 @@ case $basic_machine in > ;; > power) basic_machine=power-ibm > ;; > - ppc) basic_machine=powerpc-unknown > + ppc | ppcbe) basic_machine=powerpc-unknown > ;; > - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` > + ppc-* | ppcbe-*) > + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` > ;; > ppcle | powerpclittle | ppc-le | powerpc-little) > basic_machine=powerpcle-unknown > @@ -1019,6 +1088,9 @@ case $basic_machine in > basic_machine=i860-stratus > os=-sysv4 > ;; > + strongarm-* | thumb-*) > + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` > + ;; > sun2) > basic_machine=m68000-sun > ;; > @@ -1075,25 +1147,8 @@ case $basic_machine in > basic_machine=t90-cray > os=-unicos > ;; > - tic54x | c54x*) > - basic_machine=tic54x-unknown > - os=-coff > - ;; > - tic55x | c55x*) > - basic_machine=tic55x-unknown > - os=-coff > - ;; > - tic6x | c6x*) > - basic_machine=tic6x-unknown > - os=-coff > - ;; > - # This must be matched before tile*. > - tilegx*) > - basic_machine=tilegx-unknown > - os=-linux-gnu > - ;; > tile*) > - basic_machine=tile-unknown > + basic_machine=$basic_machine-unknown > os=-linux-gnu > ;; > tx39) > @@ -1163,6 +1218,9 @@ case $basic_machine in > xps | xps100) > basic_machine=xps100-honeywell > ;; > + xscale-* | xscalee[bl]-*) > + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` > + ;; > ymp) > basic_machine=ymp-cray > os=-unicos > @@ -1260,11 +1318,11 @@ esac > if [ x"$os" != x"" ] > then > case $os in > - # First match some system type aliases > - # that might get confused with valid system types. > + # First match some system type aliases > + # that might get confused with valid system types. > # -solaris* is a basic system type, with this one exception. > - -auroraux) > - os=-auroraux > + -auroraux) > + os=-auroraux > ;; > -solaris1 | -solaris1.*) > os=`echo $os | sed -e 's|solaris1|sunos4|'` > @@ -1300,8 +1358,9 @@ case $os in > | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ > | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ > | -chorusos* | -chorusrdb* | -cegcc* \ > - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ > - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ > + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ > + | -mingw32* | -linux-gnu* | -linux-android* \ > + | -linux-newlib* | -linux-uclibc* \ > | -uxpv* | -beos* | -mpeix* | -udk* \ > | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ > | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ > @@ -1348,7 +1407,7 @@ case $os in > -opened*) > os=-openedition > ;; > - -os400*) > + -os400*) > os=-os400 > ;; > -wince*) > @@ -1397,7 +1456,7 @@ case $os in > -sinix*) > os=-sysv4 > ;; > - -tpf*) > + -tpf*) > os=-tpf > ;; > -triton*) > @@ -1442,8 +1501,8 @@ case $os in > -dicos*) > os=-dicos > ;; > - -nacl*) > - ;; > + -nacl*) > + ;; > -none) > ;; > *) > @@ -1466,10 +1525,10 @@ else > # system, and we'll never get to this point. > > case $basic_machine in > - score-*) > + score-*) > os=-elf > ;; > - spu-*) > + spu-*) > os=-elf > ;; > *-acorn) > @@ -1481,8 +1540,20 @@ case $basic_machine in > arm*-semi) > os=-aout > ;; > - c4x-* | tic4x-*) > - os=-coff > + c4x-* | tic4x-*) > + os=-coff > + ;; > + hexagon-*) > + os=-elf > + ;; > + tic54x-*) > + os=-coff > + ;; > + tic55x-*) > + os=-coff > + ;; > + tic6x-*) > + os=-coff > ;; > # This must come before the *-dec entry. > pdp10-*) > @@ -1502,14 +1573,11 @@ case $basic_machine in > ;; > m68000-sun) > os=-sunos3 > - # This also exists in the configure program, but was not the > - # default. > - # os=-sunos4 > ;; > m68*-cisco) > os=-aout > ;; > - mep-*) > + mep-*) > os=-elf > ;; > mips*-cisco) > @@ -1536,7 +1604,7 @@ case $basic_machine in > *-ibm) > os=-aix > ;; > - *-knuth) > + *-knuth) > os=-mmixware > ;; > *-wec)
Ian Campbell writes ("Re: [PATCH] tools: update config.{sub,guess}"):
> Ping?
>
> On Sat, 2014-03-01 at 04:33 +0000, Ian Campbell wrote:
> > Update to versions from Debian Wheezy's autotools-dev package (20120608.1)
> >
> > Adds ARM aarch64 support.
> >
> > Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> > ---
> > Please queue for 4.4.1. I mistakenly thought Wheezy's versions didn't include
> > aarch64 which is why I didn't send this sooner.
Shouldn't this go via unstable first ? In which case, for unstable:
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Ian.
On Thu, 2014-03-13 at 17:23 +0000, Ian Jackson wrote: > Ian Campbell writes ("Re: [PATCH] tools: update config.{sub,guess}"): > > Ping? > > > > On Sat, 2014-03-01 at 04:33 +0000, Ian Campbell wrote: > > > Update to versions from Debian Wheezy's autotools-dev package (20120608.1) > > > > > > Adds ARM aarch64 support. > > > > > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > > > --- > > > Please queue for 4.4.1. I mistakenly thought Wheezy's versions didn't include > > > aarch64 which is why I didn't send this sooner. > > Shouldn't this go via unstable first ? Yes, what I meant was "apply to unstable and put on the list for backport to 4.4.1". > In which case, for unstable: > > Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Thanks.
Ian Campbell writes ("[PATCH] tools: update config.{sub,guess}"):
> Update to versions from Debian Wheezy's autotools-dev package (20120608.1)
>
> Adds ARM aarch64 support.
>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Applied.
> Please queue for 4.4.1. I mistakenly thought Wheezy's versions didn't include
> aarch64 which is why I didn't send this sooner.
Done.
Ian.
On Fri, 2014-03-14 at 14:22 +0000, Ian Jackson wrote: > Ian Campbell writes ("[PATCH] tools: update config.{sub,guess}"): > > Update to versions from Debian Wheezy's autotools-dev package (20120608.1) > > > > Adds ARM aarch64 support. > > > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > > Applied. Me too (WIP, not pushed). I shall drop it from my queue! > > Please queue for 4.4.1. I mistakenly thought Wheezy's versions didn't include > > aarch64 which is why I didn't send this sooner. > > Done. Thanks, Ian.
Ian Campbell writes ("Re: [PATCH] tools: update config.{sub,guess}"):
> On Thu, 2014-03-13 at 17:23 +0000, Ian Jackson wrote:
> > Ian Campbell writes ("Re: [PATCH] tools: update config.{sub,guess}"):
> > > Ping?
> > >
> > > On Sat, 2014-03-01 at 04:33 +0000, Ian Campbell wrote:
> > > > Update to versions from Debian Wheezy's autotools-dev package (20120608.1)
> > > >
> > > > Adds ARM aarch64 support.
> > > >
> > > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> > > > ---
> > > > Please queue for 4.4.1. I mistakenly thought Wheezy's versions didn't include
> > > > aarch64 which is why I didn't send this sooner.
> >
> > Shouldn't this go via unstable first ?
>
> Yes, what I meant was "apply to unstable and put on the list for
> backport to 4.4.1".
I have pushed this to staging-4.4.
Thanks,
Ian.
diff --git a/config.guess b/config.guess index c2246a4..d622a44 100755 --- a/config.guess +++ b/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-12-30' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ timestamp='2009-12-30' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see <http://www.gnu.org/licenses/>. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -57,8 +55,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -181,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -224,7 +222,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -270,7 +268,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -296,7 +297,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -395,23 +396,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -481,8 +482,8 @@ EOF echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -495,7 +496,7 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -552,7 +553,7 @@ EOF echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -595,52 +596,52 @@ EOF 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c - #define _HPUX_SOURCE - #include <stdlib.h> - #include <unistd.h> + #define _HPUX_SOURCE + #include <stdlib.h> + #include <unistd.h> - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -731,22 +732,22 @@ EOF exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -770,14 +771,14 @@ EOF exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -789,13 +790,12 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -804,15 +804,18 @@ EOF *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -858,6 +861,13 @@ EOF i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -867,7 +877,7 @@ EOF EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} @@ -879,20 +889,29 @@ EOF then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -934,7 +953,7 @@ EOF test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -960,7 +979,7 @@ EOF echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -968,14 +987,17 @@ EOF sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -984,11 +1006,11 @@ EOF echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1020,7 +1042,7 @@ EOF fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1048,13 +1070,13 @@ EOF exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1089,8 +1111,8 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1133,10 +1155,10 @@ EOF echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says <Richard.M.Bartel@ccMail.Census.GOV> - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says <Richard.M.Bartel@ccMail.Census.GOV> + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes <hewes@openmarket.com>. # How about differentiating between stratus architectures? -djm @@ -1162,11 +1184,11 @@ EOF exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1231,6 +1253,9 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1276,13 +1301,13 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1300,6 +1325,9 @@ EOF i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1322,11 +1350,11 @@ main () #include <sys/param.h> printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff --git a/config.sub b/config.sub index c2d1257..6205f84 100755 --- a/config.sub +++ b/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2010-01-22' +timestamp='2012-04-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ timestamp='2010-01-22' # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see <http://www.gnu.org/licenses/>. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -76,8 +74,8 @@ version="\ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -124,13 +122,18 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -157,8 +160,8 @@ case $os in os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -174,10 +177,10 @@ case $os in os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -222,6 +225,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -246,17 +255,22 @@ case $basic_machine in # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -282,29 +296,39 @@ case $basic_machine in | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -314,6 +338,21 @@ case $basic_machine in basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -328,21 +367,25 @@ case $basic_machine in # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -368,26 +411,29 @@ case $basic_machine in | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -412,7 +458,7 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -482,11 +528,20 @@ case $basic_machine in basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -518,7 +573,7 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -676,7 +731,6 @@ case $basic_machine in i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -734,7 +788,7 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -773,10 +827,18 @@ case $basic_machine in ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -841,6 +903,12 @@ case $basic_machine in np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -923,9 +991,10 @@ case $basic_machine in ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -1019,6 +1088,9 @@ case $basic_machine in basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1075,25 +1147,8 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1163,6 +1218,9 @@ case $basic_machine in xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1260,11 +1318,11 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1300,8 +1358,9 @@ case $os in | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1348,7 +1407,7 @@ case $os in -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1397,7 +1456,7 @@ case $os in -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1442,8 +1501,8 @@ case $os in -dicos*) os=-dicos ;; - -nacl*) - ;; + -nacl*) + ;; -none) ;; *) @@ -1466,10 +1525,10 @@ else # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1481,8 +1540,20 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1502,14 +1573,11 @@ case $basic_machine in ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1536,7 +1604,7 @@ case $basic_machine in *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec)
Update to versions from Debian Wheezy's autotools-dev package (20120608.1) Adds ARM aarch64 support. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- Please queue for 4.4.1. I mistakenly thought Wheezy's versions didn't include aarch64 which is why I didn't send this sooner. --- config.guess | 258 ++++++++++++++++++++++++++++++++-------------------------- config.sub | 218 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 286 insertions(+), 190 deletions(-)