autoconf/config.guess - Issue 7676009: Update to latest versions of config.guess and config.sub from GNU

Unified Diff: autoconf/config.guess

Issue 7676009: Update to latest versions of config.guess and config.sub from GNU (Closed) Base URL: http://llvm.org/svn/llvm-project/llvm/trunk/

Patch Set: Reapply r132627 Created 9 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: autoconf/config.guess

===================================================================

--- autoconf/config.guess (revision 137921)

+++ autoconf/config.guess (working copy)

@@ -1,10 +1,10 @@

#! /bin/sh

# Attempt to guess a canonical system name.

-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009

-# Free Software Foundation, Inc.

+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,

+# 2011 Free Software Foundation, Inc.

-timestamp='2009-09-18'

+timestamp='2011-08-17'

# 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

@@ -56,8 +56,9 @@

GNU config.guess ($timestamp)

Originally written by Per Bothner.

-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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."

@@ -180,7 +181,7 @@

;;

- os=netbsd

+ os=netbsd

;;

esac

# The OS release

@@ -223,7 +224,7 @@

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

@@ -269,7 +270,10 @@

# 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

@@ -295,7 +299,7 @@

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}

@@ -334,8 +338,7 @@

echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

exit ;;

i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)

- AUX_ARCH="i386"

- echo ${AUX_ARCH}-pc-auroraux`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

+ echo i386-pc-auroraux${UNAME_RELEASE}

exit ;;

i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)

eval $set_cc_for_build

@@ -395,23 +398,23 @@

# 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 +484,8 @@

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 +498,7 @@

else

echo i586-dg-dgux${UNAME_RELEASE}

- exit ;;

+ exit ;;

M88*:DolphinOS:*:*) # DolphinOS (SVR3)

echo m88k-dolphin-sysv3

exit ;;

@@ -552,7 +555,7 @@

echo rs6000-ibm-aix3.2

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 +598,52 @@

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

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 +734,22 @@

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

- 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 +773,14 @@

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,7 +792,7 @@

echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}

exit ;;

*:FreeBSD:*:*)

- UNAME_PROCESSOR=`/usr/bin/uname -p`

+ UNAME_PROCESSOR=`/usr/bin/uname -p`

case ${UNAME_MACHINE} in

amd64)

echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;

@@ -804,18 +807,18 @@

echo ${UNAME_MACHINE}-pc-mingw32

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*:[3456]*)

- case ${UNAME_MACHINE} in

+ *:Interix*:*)

+ case ${UNAME_MACHINE} in

x86)

echo i586-pc-interix${UNAME_RELEASE}

exit ;;

- EM64T | authenticamd | genuineintel)

+ authenticamd | genuineintel | EM64T)

echo x86_64-unknown-interix${UNAME_RELEASE}

exit ;;

IA64)

@@ -866,7 +869,7 @@

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}

@@ -878,7 +881,13 @@

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

exit ;;

avr32*:Linux:*:*)

@@ -891,10 +900,18 @@

echo crisv32-axis-linux-gnu

exit ;;

frv:Linux:*:*)

- echo frv-unknown-linux-gnu

+ echo frv-unknown-linux-gnu

exit ;;

i*86:Linux:*:*)

- echo ${UNAME_MACHINE}-pc-linux-gnu

+ LIBC=gnu

+ eval $set_cc_for_build

+ sed 's/^ //' << EOF >$dummy.c

+ #ifdef __dietlibc__

+ LIBC=dietlibc

+ #endif

+EOF

+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`

+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"

exit ;;

ia64:Linux:*:*)

echo ${UNAME_MACHINE}-unknown-linux-gnu

@@ -921,11 +938,7 @@

#endif

EOF

- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '

- /^CPU/{

- s: ::g

- p

- }'`"

+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`

test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }

;;

or32:Linux:*:*)

@@ -955,7 +968,7 @@

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

@@ -963,6 +976,9 @@

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

@@ -970,7 +986,7 @@

echo x86_64-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.

@@ -979,11 +995,11 @@

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:*:*)

@@ -1015,7 +1031,7 @@

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

@@ -1043,13 +1059,13 @@

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

@@ -1084,8 +1100,8 @@

/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 \

@@ -1128,10 +1144,10 @@

echo ns32k-sni-sysv

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

@@ -1157,11 +1173,11 @@

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}

- exit ;;

+ exit ;;

BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.

echo powerpc-be-beos

exit ;;

@@ -1226,6 +1242,9 @@

*: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 ;;

@@ -1271,13 +1290,13 @@

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

@@ -1317,11 +1336,11 @@

#include <sys/param.h>

printf ("m68k-sony-newsos%s\n",

#ifdef NEWSOS4

- "4"

+ "4"

#else

- ""

+ ""

#endif

- ); exit (0);

+ ); exit (0);

#endif

« no previous file with comments | « no previous file | autoconf/config.sub » ('j') | no next file with comments »