diff options
author | Tim Rice <tim@multitalents.net> | 2010-03-01 15:57:42 -0800 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2010-03-01 15:57:42 -0800 |
commit | c5b0cb3b7d4f784ef95461d5848219d991264027 (patch) | |
tree | 0983349e0b401509a443bade81df80187113ebc7 | |
parent | 9af0cb9accbf42aca8f87d3f3bfffcac20c2f5b4 (diff) |
- (tim) [config.guess config.sub] Bug 1722: Update to latest versions from
http://git.savannah.gnu.org/gitweb/ (2009-12-30 and 2010-01-22
respectively).
-rw-r--r-- | ChangeLog | 5 | ||||
-rwxr-xr-x | config.guess | 238 | ||||
-rwxr-xr-x | config.sub | 81 |
3 files changed, 173 insertions, 151 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20100302 | ||
2 | - (tim) [config.guess config.sub] Bug 1722: Update to latest versions from | ||
3 | http://git.savannah.gnu.org/gitweb/ (2009-12-30 and 2010-01-22 | ||
4 | respectively). | ||
5 | |||
1 | 20100301 | 6 | 20100301 |
2 | - (dtucker) [regress/{cert-hostkey,cfgmatch,cipher-speed}.sh} Replace | 7 | - (dtucker) [regress/{cert-hostkey,cfgmatch,cipher-speed}.sh} Replace |
3 | "echo -n" with "echon" for portability. | 8 | "echo -n" with "echon" for portability. |
diff --git a/config.guess b/config.guess index c7607c74f..c2246a4f7 100755 --- a/config.guess +++ b/config.guess | |||
@@ -1,10 +1,10 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | # Attempt to guess a canonical system name. | 2 | # Attempt to guess a canonical system name. |
3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
5 | # Free Software Foundation, Inc. | 5 | # Free Software Foundation, Inc. |
6 | 6 | ||
7 | timestamp='2008-04-14' | 7 | timestamp='2009-12-30' |
8 | 8 | ||
9 | # This file is free software; you can redistribute it and/or modify it | 9 | # This file is free software; you can redistribute it and/or modify it |
10 | # under the terms of the GNU General Public License as published by | 10 | # under the terms of the GNU General Public License as published by |
@@ -27,16 +27,16 @@ timestamp='2008-04-14' | |||
27 | # the same distribution terms that you use for the rest of that program. | 27 | # the same distribution terms that you use for the rest of that program. |
28 | 28 | ||
29 | 29 | ||
30 | # Originally written by Per Bothner <per@bothner.com>. | 30 | # Originally written by Per Bothner. Please send patches (context |
31 | # Please send patches to <config-patches@gnu.org>. Submit a context | 31 | # diff format) to <config-patches@gnu.org> and include a ChangeLog |
32 | # diff and a properly formatted ChangeLog entry. | 32 | # entry. |
33 | # | 33 | # |
34 | # This script attempts to guess a canonical system name similar to | 34 | # This script attempts to guess a canonical system name similar to |
35 | # config.sub. If it succeeds, it prints the system name on stdout, and | 35 | # config.sub. If it succeeds, it prints the system name on stdout, and |
36 | # exits with 0. Otherwise, it exits with 1. | 36 | # exits with 0. Otherwise, it exits with 1. |
37 | # | 37 | # |
38 | # The plan is that this can be called by configure scripts if you | 38 | # You can get the latest version of this script from: |
39 | # don't specify an explicit build system type. | 39 | # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
40 | 40 | ||
41 | me=`echo "$0" | sed -e 's,.*/,,'` | 41 | me=`echo "$0" | sed -e 's,.*/,,'` |
42 | 42 | ||
@@ -56,8 +56,9 @@ version="\ | |||
56 | GNU config.guess ($timestamp) | 56 | GNU config.guess ($timestamp) |
57 | 57 | ||
58 | Originally written by Per Bothner. | 58 | Originally written by Per Bothner. |
59 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, | 59 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
60 | 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | 60 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free |
61 | Software Foundation, Inc. | ||
61 | 62 | ||
62 | This is free software; see the source for copying conditions. There is NO | 63 | This is free software; see the source for copying conditions. There is NO |
63 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 64 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
@@ -170,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
170 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) | 171 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) |
171 | eval $set_cc_for_build | 172 | eval $set_cc_for_build |
172 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | 173 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
173 | | grep __ELF__ >/dev/null | 174 | | grep -q __ELF__ |
174 | then | 175 | then |
175 | # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). | 176 | # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). |
176 | # Return netbsd for either. FIX? | 177 | # Return netbsd for either. FIX? |
@@ -324,14 +325,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
324 | case `/usr/bin/uname -p` in | 325 | case `/usr/bin/uname -p` in |
325 | sparc) echo sparc-icl-nx7; exit ;; | 326 | sparc) echo sparc-icl-nx7; exit ;; |
326 | esac ;; | 327 | esac ;; |
328 | s390x:SunOS:*:*) | ||
329 | echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | ||
330 | exit ;; | ||
327 | sun4H:SunOS:5.*:*) | 331 | sun4H:SunOS:5.*:*) |
328 | echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 332 | echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
329 | exit ;; | 333 | exit ;; |
330 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) | 334 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
331 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 335 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
332 | exit ;; | 336 | exit ;; |
337 | i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) | ||
338 | echo i386-pc-auroraux${UNAME_RELEASE} | ||
339 | exit ;; | ||
333 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) | 340 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
334 | echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 341 | eval $set_cc_for_build |
342 | SUN_ARCH="i386" | ||
343 | # If there is a compiler, see if it is configured for 64-bit objects. | ||
344 | # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. | ||
345 | # This test works for both compilers. | ||
346 | if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then | ||
347 | if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ | ||
348 | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ | ||
349 | grep IS_64BIT_ARCH >/dev/null | ||
350 | then | ||
351 | SUN_ARCH="x86_64" | ||
352 | fi | ||
353 | fi | ||
354 | echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | ||
335 | exit ;; | 355 | exit ;; |
336 | sun4*:SunOS:6*:*) | 356 | sun4*:SunOS:6*:*) |
337 | # According to config.sub, this is the proper way to canonicalize | 357 | # According to config.sub, this is the proper way to canonicalize |
@@ -640,7 +660,7 @@ EOF | |||
640 | # => hppa64-hp-hpux11.23 | 660 | # => hppa64-hp-hpux11.23 |
641 | 661 | ||
642 | if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | | 662 | if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | |
643 | grep __LP64__ >/dev/null | 663 | grep -q __LP64__ |
644 | then | 664 | then |
645 | HP_ARCH="hppa2.0w" | 665 | HP_ARCH="hppa2.0w" |
646 | else | 666 | else |
@@ -791,12 +811,12 @@ EOF | |||
791 | i*:PW*:*) | 811 | i*:PW*:*) |
792 | echo ${UNAME_MACHINE}-pc-pw32 | 812 | echo ${UNAME_MACHINE}-pc-pw32 |
793 | exit ;; | 813 | exit ;; |
794 | *:Interix*:[3456]*) | 814 | *:Interix*:*) |
795 | case ${UNAME_MACHINE} in | 815 | case ${UNAME_MACHINE} in |
796 | x86) | 816 | x86) |
797 | echo i586-pc-interix${UNAME_RELEASE} | 817 | echo i586-pc-interix${UNAME_RELEASE} |
798 | exit ;; | 818 | exit ;; |
799 | EM64T | authenticamd) | 819 | authenticamd | genuineintel | EM64T) |
800 | echo x86_64-unknown-interix${UNAME_RELEASE} | 820 | echo x86_64-unknown-interix${UNAME_RELEASE} |
801 | exit ;; | 821 | exit ;; |
802 | IA64) | 822 | IA64) |
@@ -806,6 +826,9 @@ EOF | |||
806 | [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) | 826 | [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) |
807 | echo i${UNAME_MACHINE}-pc-mks | 827 | echo i${UNAME_MACHINE}-pc-mks |
808 | exit ;; | 828 | exit ;; |
829 | 8664:Windows_NT:*) | ||
830 | echo x86_64-pc-mks | ||
831 | exit ;; | ||
809 | i*:Windows_NT*:* | Pentium*:Windows_NT*:*) | 832 | i*:Windows_NT*:* | Pentium*:Windows_NT*:*) |
810 | # How do we know it's Interix rather than the generic POSIX subsystem? | 833 | # How do we know it's Interix rather than the generic POSIX subsystem? |
811 | # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we | 834 | # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we |
@@ -835,6 +858,20 @@ EOF | |||
835 | i*86:Minix:*:*) | 858 | i*86:Minix:*:*) |
836 | echo ${UNAME_MACHINE}-pc-minix | 859 | echo ${UNAME_MACHINE}-pc-minix |
837 | exit ;; | 860 | exit ;; |
861 | alpha:Linux:*:*) | ||
862 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in | ||
863 | EV5) UNAME_MACHINE=alphaev5 ;; | ||
864 | EV56) UNAME_MACHINE=alphaev56 ;; | ||
865 | PCA56) UNAME_MACHINE=alphapca56 ;; | ||
866 | PCA57) UNAME_MACHINE=alphapca56 ;; | ||
867 | EV6) UNAME_MACHINE=alphaev6 ;; | ||
868 | EV67) UNAME_MACHINE=alphaev67 ;; | ||
869 | EV68*) UNAME_MACHINE=alphaev68 ;; | ||
870 | esac | ||
871 | objdump --private-headers /bin/sh | grep -q ld.so.1 | ||
872 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi | ||
873 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} | ||
874 | exit ;; | ||
838 | arm*:Linux:*:*) | 875 | arm*:Linux:*:*) |
839 | eval $set_cc_for_build | 876 | eval $set_cc_for_build |
840 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | 877 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
@@ -857,6 +894,17 @@ EOF | |||
857 | frv:Linux:*:*) | 894 | frv:Linux:*:*) |
858 | echo frv-unknown-linux-gnu | 895 | echo frv-unknown-linux-gnu |
859 | exit ;; | 896 | exit ;; |
897 | i*86:Linux:*:*) | ||
898 | LIBC=gnu | ||
899 | eval $set_cc_for_build | ||
900 | sed 's/^ //' << EOF >$dummy.c | ||
901 | #ifdef __dietlibc__ | ||
902 | LIBC=dietlibc | ||
903 | #endif | ||
904 | EOF | ||
905 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` | ||
906 | echo "${UNAME_MACHINE}-pc-linux-${LIBC}" | ||
907 | exit ;; | ||
860 | ia64:Linux:*:*) | 908 | ia64:Linux:*:*) |
861 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 909 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
862 | exit ;; | 910 | exit ;; |
@@ -866,74 +914,33 @@ EOF | |||
866 | m68*:Linux:*:*) | 914 | m68*:Linux:*:*) |
867 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 915 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
868 | exit ;; | 916 | exit ;; |
869 | mips:Linux:*:*) | 917 | mips:Linux:*:* | mips64:Linux:*:*) |
870 | eval $set_cc_for_build | 918 | eval $set_cc_for_build |
871 | sed 's/^ //' << EOF >$dummy.c | 919 | sed 's/^ //' << EOF >$dummy.c |
872 | #undef CPU | 920 | #undef CPU |
873 | #undef mips | 921 | #undef ${UNAME_MACHINE} |
874 | #undef mipsel | 922 | #undef ${UNAME_MACHINE}el |
875 | #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) | 923 | #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) |
876 | CPU=mipsel | 924 | CPU=${UNAME_MACHINE}el |
877 | #else | 925 | #else |
878 | #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) | 926 | #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) |
879 | CPU=mips | 927 | CPU=${UNAME_MACHINE} |
880 | #else | 928 | #else |
881 | CPU= | 929 | CPU= |
882 | #endif | 930 | #endif |
883 | #endif | 931 | #endif |
884 | EOF | 932 | EOF |
885 | eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' | 933 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
886 | /^CPU/{ | ||
887 | s: ::g | ||
888 | p | ||
889 | }'`" | ||
890 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } | ||
891 | ;; | ||
892 | mips64:Linux:*:*) | ||
893 | eval $set_cc_for_build | ||
894 | sed 's/^ //' << EOF >$dummy.c | ||
895 | #undef CPU | ||
896 | #undef mips64 | ||
897 | #undef mips64el | ||
898 | #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) | ||
899 | CPU=mips64el | ||
900 | #else | ||
901 | #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) | ||
902 | CPU=mips64 | ||
903 | #else | ||
904 | CPU= | ||
905 | #endif | ||
906 | #endif | ||
907 | EOF | ||
908 | eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' | ||
909 | /^CPU/{ | ||
910 | s: ::g | ||
911 | p | ||
912 | }'`" | ||
913 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } | 934 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
914 | ;; | 935 | ;; |
915 | or32:Linux:*:*) | 936 | or32:Linux:*:*) |
916 | echo or32-unknown-linux-gnu | 937 | echo or32-unknown-linux-gnu |
917 | exit ;; | 938 | exit ;; |
918 | ppc:Linux:*:*) | 939 | padre:Linux:*:*) |
919 | echo powerpc-unknown-linux-gnu | 940 | echo sparc-unknown-linux-gnu |
920 | exit ;; | ||
921 | ppc64:Linux:*:*) | ||
922 | echo powerpc64-unknown-linux-gnu | ||
923 | exit ;; | 941 | exit ;; |
924 | alpha:Linux:*:*) | 942 | parisc64:Linux:*:* | hppa64:Linux:*:*) |
925 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in | 943 | echo hppa64-unknown-linux-gnu |
926 | EV5) UNAME_MACHINE=alphaev5 ;; | ||
927 | EV56) UNAME_MACHINE=alphaev56 ;; | ||
928 | PCA56) UNAME_MACHINE=alphapca56 ;; | ||
929 | PCA57) UNAME_MACHINE=alphapca56 ;; | ||
930 | EV6) UNAME_MACHINE=alphaev6 ;; | ||
931 | EV67) UNAME_MACHINE=alphaev67 ;; | ||
932 | EV68*) UNAME_MACHINE=alphaev68 ;; | ||
933 | esac | ||
934 | objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null | ||
935 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi | ||
936 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} | ||
937 | exit ;; | 944 | exit ;; |
938 | parisc:Linux:*:* | hppa:Linux:*:*) | 945 | parisc:Linux:*:* | hppa:Linux:*:*) |
939 | # Look for CPU level | 946 | # Look for CPU level |
@@ -943,8 +950,11 @@ EOF | |||
943 | *) echo hppa-unknown-linux-gnu ;; | 950 | *) echo hppa-unknown-linux-gnu ;; |
944 | esac | 951 | esac |
945 | exit ;; | 952 | exit ;; |
946 | parisc64:Linux:*:* | hppa64:Linux:*:*) | 953 | ppc64:Linux:*:*) |
947 | echo hppa64-unknown-linux-gnu | 954 | echo powerpc64-unknown-linux-gnu |
955 | exit ;; | ||
956 | ppc:Linux:*:*) | ||
957 | echo powerpc-unknown-linux-gnu | ||
948 | exit ;; | 958 | exit ;; |
949 | s390:Linux:*:* | s390x:Linux:*:*) | 959 | s390:Linux:*:* | s390x:Linux:*:*) |
950 | echo ${UNAME_MACHINE}-ibm-linux | 960 | echo ${UNAME_MACHINE}-ibm-linux |
@@ -967,66 +977,6 @@ EOF | |||
967 | xtensa*:Linux:*:*) | 977 | xtensa*:Linux:*:*) |
968 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 978 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
969 | exit ;; | 979 | exit ;; |
970 | i*86:Linux:*:*) | ||
971 | # The BFD linker knows what the default object file format is, so | ||
972 | # first see if it will tell us. cd to the root directory to prevent | ||
973 | # problems with other programs or directories called `ld' in the path. | ||
974 | # Set LC_ALL=C to ensure ld outputs messages in English. | ||
975 | ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ | ||
976 | | sed -ne '/supported targets:/!d | ||
977 | s/[ ][ ]*/ /g | ||
978 | s/.*supported targets: *// | ||
979 | s/ .*// | ||
980 | p'` | ||
981 | case "$ld_supported_targets" in | ||
982 | elf32-i386) | ||
983 | TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" | ||
984 | ;; | ||
985 | a.out-i386-linux) | ||
986 | echo "${UNAME_MACHINE}-pc-linux-gnuaout" | ||
987 | exit ;; | ||
988 | "") | ||
989 | # Either a pre-BFD a.out linker (linux-gnuoldld) or | ||
990 | # one that does not give us useful --help. | ||
991 | echo "${UNAME_MACHINE}-pc-linux-gnuoldld" | ||
992 | exit ;; | ||
993 | esac | ||
994 | # Determine whether the default compiler is a.out or elf | ||
995 | eval $set_cc_for_build | ||
996 | sed 's/^ //' << EOF >$dummy.c | ||
997 | #include <features.h> | ||
998 | #ifdef __ELF__ | ||
999 | # ifdef __GLIBC__ | ||
1000 | # if __GLIBC__ >= 2 | ||
1001 | LIBC=gnu | ||
1002 | # else | ||
1003 | LIBC=gnulibc1 | ||
1004 | # endif | ||
1005 | # else | ||
1006 | LIBC=gnulibc1 | ||
1007 | # endif | ||
1008 | #else | ||
1009 | #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) | ||
1010 | LIBC=gnu | ||
1011 | #else | ||
1012 | LIBC=gnuaout | ||
1013 | #endif | ||
1014 | #endif | ||
1015 | #ifdef __dietlibc__ | ||
1016 | LIBC=dietlibc | ||
1017 | #endif | ||
1018 | EOF | ||
1019 | eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' | ||
1020 | /^LIBC/{ | ||
1021 | s: ::g | ||
1022 | p | ||
1023 | }'`" | ||
1024 | test x"${LIBC}" != x && { | ||
1025 | echo "${UNAME_MACHINE}-pc-linux-${LIBC}" | ||
1026 | exit | ||
1027 | } | ||
1028 | test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } | ||
1029 | ;; | ||
1030 | i*86:DYNIX/ptx:4*:*) | 980 | i*86:DYNIX/ptx:4*:*) |
1031 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. | 981 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
1032 | # earlier versions are messed up and put the nodename in both | 982 | # earlier versions are messed up and put the nodename in both |
@@ -1055,7 +1005,7 @@ EOF | |||
1055 | i*86:syllable:*:*) | 1005 | i*86:syllable:*:*) |
1056 | echo ${UNAME_MACHINE}-pc-syllable | 1006 | echo ${UNAME_MACHINE}-pc-syllable |
1057 | exit ;; | 1007 | exit ;; |
1058 | i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) | 1008 | i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) |
1059 | echo i386-unknown-lynxos${UNAME_RELEASE} | 1009 | echo i386-unknown-lynxos${UNAME_RELEASE} |
1060 | exit ;; | 1010 | exit ;; |
1061 | i*86:*DOS:*:*) | 1011 | i*86:*DOS:*:*) |
@@ -1099,8 +1049,11 @@ EOF | |||
1099 | pc:*:*:*) | 1049 | pc:*:*:*) |
1100 | # Left here for compatibility: | 1050 | # Left here for compatibility: |
1101 | # uname -m prints for DJGPP always 'pc', but it prints nothing about | 1051 | # uname -m prints for DJGPP always 'pc', but it prints nothing about |
1102 | # the processor, so we play safe by assuming i386. | 1052 | # the processor, so we play safe by assuming i586. |
1103 | echo i386-pc-msdosdjgpp | 1053 | # Note: whatever this is, it MUST be the same as what config.sub |
1054 | # prints for the "djgpp" host, or else GDB configury will decide that | ||
1055 | # this is a cross-build. | ||
1056 | echo i586-pc-msdosdjgpp | ||
1104 | exit ;; | 1057 | exit ;; |
1105 | Intel:Mach:3*:*) | 1058 | Intel:Mach:3*:*) |
1106 | echo i386-pc-mach3 | 1059 | echo i386-pc-mach3 |
@@ -1138,6 +1091,16 @@ EOF | |||
1138 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) | 1091 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
1139 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ | 1092 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1140 | && { echo i486-ncr-sysv4; exit; } ;; | 1093 | && { echo i486-ncr-sysv4; exit; } ;; |
1094 | NCR*:*:4.2:* | MPRAS*:*:4.2:*) | ||
1095 | OS_REL='.3' | ||
1096 | test -r /etc/.relid \ | ||
1097 | && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` | ||
1098 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ | ||
1099 | && { echo i486-ncr-sysv4.3${OS_REL}; exit; } | ||
1100 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ | ||
1101 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } | ||
1102 | /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ | ||
1103 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; | ||
1141 | m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) | 1104 | m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) |
1142 | echo m68k-unknown-lynxos${UNAME_RELEASE} | 1105 | echo m68k-unknown-lynxos${UNAME_RELEASE} |
1143 | exit ;; | 1106 | exit ;; |
@@ -1150,7 +1113,7 @@ EOF | |||
1150 | rs6000:LynxOS:2.*:*) | 1113 | rs6000:LynxOS:2.*:*) |
1151 | echo rs6000-unknown-lynxos${UNAME_RELEASE} | 1114 | echo rs6000-unknown-lynxos${UNAME_RELEASE} |
1152 | exit ;; | 1115 | exit ;; |
1153 | PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) | 1116 | PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) |
1154 | echo powerpc-unknown-lynxos${UNAME_RELEASE} | 1117 | echo powerpc-unknown-lynxos${UNAME_RELEASE} |
1155 | exit ;; | 1118 | exit ;; |
1156 | SM[BE]S:UNIX_SV:*:*) | 1119 | SM[BE]S:UNIX_SV:*:*) |
@@ -1243,6 +1206,16 @@ EOF | |||
1243 | *:Darwin:*:*) | 1206 | *:Darwin:*:*) |
1244 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown | 1207 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
1245 | case $UNAME_PROCESSOR in | 1208 | case $UNAME_PROCESSOR in |
1209 | i386) | ||
1210 | eval $set_cc_for_build | ||
1211 | if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then | ||
1212 | if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ | ||
1213 | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ | ||
1214 | grep IS_64BIT_ARCH >/dev/null | ||
1215 | then | ||
1216 | UNAME_PROCESSOR="x86_64" | ||
1217 | fi | ||
1218 | fi ;; | ||
1246 | unknown) UNAME_PROCESSOR=powerpc ;; | 1219 | unknown) UNAME_PROCESSOR=powerpc ;; |
1247 | esac | 1220 | esac |
1248 | echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} | 1221 | echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
@@ -1324,6 +1297,9 @@ EOF | |||
1324 | i*86:rdos:*:*) | 1297 | i*86:rdos:*:*) |
1325 | echo ${UNAME_MACHINE}-pc-rdos | 1298 | echo ${UNAME_MACHINE}-pc-rdos |
1326 | exit ;; | 1299 | exit ;; |
1300 | i*86:AROS:*:*) | ||
1301 | echo ${UNAME_MACHINE}-pc-aros | ||
1302 | exit ;; | ||
1327 | esac | 1303 | esac |
1328 | 1304 | ||
1329 | #echo '(No uname command or uname output not recognized.)' 1>&2 | 1305 | #echo '(No uname command or uname output not recognized.)' 1>&2 |
diff --git a/config.sub b/config.sub index a649350a6..c2d125724 100755 --- a/config.sub +++ b/config.sub | |||
@@ -1,10 +1,10 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | # Configuration validation subroutine script. | 2 | # Configuration validation subroutine script. |
3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
5 | # Free Software Foundation, Inc. | 5 | # Free Software Foundation, Inc. |
6 | 6 | ||
7 | timestamp='2008-06-16' | 7 | timestamp='2010-01-22' |
8 | 8 | ||
9 | # This file is (in principle) common to ALL GNU software. | 9 | # This file is (in principle) common to ALL GNU software. |
10 | # The presence of a machine in this file suggests that SOME GNU software | 10 | # The presence of a machine in this file suggests that SOME GNU software |
@@ -32,13 +32,16 @@ timestamp='2008-06-16' | |||
32 | 32 | ||
33 | 33 | ||
34 | # Please send patches to <config-patches@gnu.org>. Submit a context | 34 | # Please send patches to <config-patches@gnu.org>. Submit a context |
35 | # diff and a properly formatted ChangeLog entry. | 35 | # diff and a properly formatted GNU ChangeLog entry. |
36 | # | 36 | # |
37 | # Configuration subroutine to validate and canonicalize a configuration type. | 37 | # Configuration subroutine to validate and canonicalize a configuration type. |
38 | # Supply the specified configuration type as an argument. | 38 | # Supply the specified configuration type as an argument. |
39 | # If it is invalid, we print an error message on stderr and exit with code 1. | 39 | # If it is invalid, we print an error message on stderr and exit with code 1. |
40 | # Otherwise, we print the canonical config type on stdout and succeed. | 40 | # Otherwise, we print the canonical config type on stdout and succeed. |
41 | 41 | ||
42 | # You can get the latest version of this script from: | ||
43 | # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD | ||
44 | |||
42 | # This file is supposed to be the same for all GNU packages | 45 | # This file is supposed to be the same for all GNU packages |
43 | # and recognize all the CPU types, system types and aliases | 46 | # and recognize all the CPU types, system types and aliases |
44 | # that are meaningful with *any* GNU software. | 47 | # that are meaningful with *any* GNU software. |
@@ -72,8 +75,9 @@ Report bugs and patches to <config-patches@gnu.org>." | |||
72 | version="\ | 75 | version="\ |
73 | GNU config.sub ($timestamp) | 76 | GNU config.sub ($timestamp) |
74 | 77 | ||
75 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, | 78 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
76 | 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | 79 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free |
80 | Software Foundation, Inc. | ||
77 | 81 | ||
78 | This is free software; see the source for copying conditions. There is NO | 82 | This is free software; see the source for copying conditions. There is NO |
79 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 83 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
@@ -122,6 +126,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` | |||
122 | case $maybe_os in | 126 | case $maybe_os in |
123 | nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ | 127 | nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ |
124 | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ | 128 | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ |
129 | kopensolaris*-gnu* | \ | ||
125 | storm-chaos* | os2-emx* | rtmk-nova*) | 130 | storm-chaos* | os2-emx* | rtmk-nova*) |
126 | os=-$maybe_os | 131 | os=-$maybe_os |
127 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` | 132 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
@@ -148,10 +153,13 @@ case $os in | |||
148 | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ | 153 | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ |
149 | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ | 154 | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ |
150 | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ | 155 | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ |
151 | -apple | -axis | -knuth | -cray) | 156 | -apple | -axis | -knuth | -cray | -microblaze) |
152 | os= | 157 | os= |
153 | basic_machine=$1 | 158 | basic_machine=$1 |
154 | ;; | 159 | ;; |
160 | -bluegene*) | ||
161 | os=-cnk | ||
162 | ;; | ||
155 | -sim | -cisco | -oki | -wec | -winbond) | 163 | -sim | -cisco | -oki | -wec | -winbond) |
156 | os= | 164 | os= |
157 | basic_machine=$1 | 165 | basic_machine=$1 |
@@ -249,6 +257,7 @@ case $basic_machine in | |||
249 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | 257 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
250 | | i370 | i860 | i960 | ia64 \ | 258 | | i370 | i860 | i960 | ia64 \ |
251 | | ip2k | iq2000 \ | 259 | | ip2k | iq2000 \ |
260 | | lm32 \ | ||
252 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ | 261 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
253 | | maxq | mb | microblaze | mcore | mep | metag \ | 262 | | maxq | mb | microblaze | mcore | mep | metag \ |
254 | | mips | mipsbe | mipseb | mipsel | mipsle \ | 263 | | mips | mipsbe | mipseb | mipsel | mipsle \ |
@@ -270,6 +279,7 @@ case $basic_machine in | |||
270 | | mipsisa64sr71k | mipsisa64sr71kel \ | 279 | | mipsisa64sr71k | mipsisa64sr71kel \ |
271 | | mipstx39 | mipstx39el \ | 280 | | mipstx39 | mipstx39el \ |
272 | | mn10200 | mn10300 \ | 281 | | mn10200 | mn10300 \ |
282 | | moxie \ | ||
273 | | mt \ | 283 | | mt \ |
274 | | msp430 \ | 284 | | msp430 \ |
275 | | nios | nios2 \ | 285 | | nios | nios2 \ |
@@ -278,20 +288,22 @@ case $basic_machine in | |||
278 | | pdp10 | pdp11 | pj | pjl \ | 288 | | pdp10 | pdp11 | pj | pjl \ |
279 | | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | 289 | | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
280 | | pyramid \ | 290 | | pyramid \ |
291 | | rx \ | ||
281 | | score \ | 292 | | score \ |
282 | | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | 293 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
283 | | sh64 | sh64le \ | 294 | | sh64 | sh64le \ |
284 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | 295 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
285 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | 296 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
286 | | spu | strongarm \ | 297 | | spu | strongarm \ |
287 | | tahoe | thumb | tic4x | tic80 | tron \ | 298 | | tahoe | thumb | tic4x | tic80 | tron \ |
299 | | ubicom32 \ | ||
288 | | v850 | v850e \ | 300 | | v850 | v850e \ |
289 | | we32k \ | 301 | | we32k \ |
290 | | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | 302 | | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ |
291 | | z8k) | 303 | | z8k | z80) |
292 | basic_machine=$basic_machine-unknown | 304 | basic_machine=$basic_machine-unknown |
293 | ;; | 305 | ;; |
294 | m6811 | m68hc11 | m6812 | m68hc12) | 306 | m6811 | m68hc11 | m6812 | m68hc12 | picochip) |
295 | # Motorola 68HC11/12. | 307 | # Motorola 68HC11/12. |
296 | basic_machine=$basic_machine-unknown | 308 | basic_machine=$basic_machine-unknown |
297 | os=-none | 309 | os=-none |
@@ -331,9 +343,10 @@ case $basic_machine in | |||
331 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | 343 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ |
332 | | i*86-* | i860-* | i960-* | ia64-* \ | 344 | | i*86-* | i860-* | i960-* | ia64-* \ |
333 | | ip2k-* | iq2000-* \ | 345 | | ip2k-* | iq2000-* \ |
346 | | lm32-* \ | ||
334 | | m32c-* | m32r-* | m32rle-* \ | 347 | | m32c-* | m32r-* | m32rle-* \ |
335 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | 348 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
336 | | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | 349 | | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ |
337 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | 350 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ |
338 | | mips16-* \ | 351 | | mips16-* \ |
339 | | mips64-* | mips64el-* \ | 352 | | mips64-* | mips64el-* \ |
@@ -361,21 +374,23 @@ case $basic_machine in | |||
361 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | 374 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
362 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | 375 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
363 | | pyramid-* \ | 376 | | pyramid-* \ |
364 | | romp-* | rs6000-* \ | 377 | | romp-* | rs6000-* | rx-* \ |
365 | | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | 378 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
366 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | 379 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
367 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | 380 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
368 | | sparclite-* \ | 381 | | sparclite-* \ |
369 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | 382 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ |
370 | | tahoe-* | thumb-* \ | 383 | | tahoe-* | thumb-* \ |
371 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | 384 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
385 | | tile-* | tilegx-* \ | ||
372 | | tron-* \ | 386 | | tron-* \ |
387 | | ubicom32-* \ | ||
373 | | v850-* | v850e-* | vax-* \ | 388 | | v850-* | v850e-* | vax-* \ |
374 | | we32k-* \ | 389 | | we32k-* \ |
375 | | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | 390 | | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ |
376 | | xstormy16-* | xtensa*-* \ | 391 | | xstormy16-* | xtensa*-* \ |
377 | | ymp-* \ | 392 | | ymp-* \ |
378 | | z8k-*) | 393 | | z8k-* | z80-*) |
379 | ;; | 394 | ;; |
380 | # Recognize the basic CPU types without company name, with glob match. | 395 | # Recognize the basic CPU types without company name, with glob match. |
381 | xtensa*) | 396 | xtensa*) |
@@ -443,6 +458,10 @@ case $basic_machine in | |||
443 | basic_machine=m68k-apollo | 458 | basic_machine=m68k-apollo |
444 | os=-bsd | 459 | os=-bsd |
445 | ;; | 460 | ;; |
461 | aros) | ||
462 | basic_machine=i386-pc | ||
463 | os=-aros | ||
464 | ;; | ||
446 | aux) | 465 | aux) |
447 | basic_machine=m68k-apple | 466 | basic_machine=m68k-apple |
448 | os=-aux | 467 | os=-aux |
@@ -459,6 +478,10 @@ case $basic_machine in | |||
459 | basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` | 478 | basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` |
460 | os=-linux | 479 | os=-linux |
461 | ;; | 480 | ;; |
481 | bluegene*) | ||
482 | basic_machine=powerpc-ibm | ||
483 | os=-cnk | ||
484 | ;; | ||
462 | c90) | 485 | c90) |
463 | basic_machine=c90-cray | 486 | basic_machine=c90-cray |
464 | os=-unicos | 487 | os=-unicos |
@@ -711,6 +734,9 @@ case $basic_machine in | |||
711 | basic_machine=ns32k-utek | 734 | basic_machine=ns32k-utek |
712 | os=-sysv | 735 | os=-sysv |
713 | ;; | 736 | ;; |
737 | microblaze) | ||
738 | basic_machine=microblaze-xilinx | ||
739 | ;; | ||
714 | mingw32) | 740 | mingw32) |
715 | basic_machine=i386-pc | 741 | basic_machine=i386-pc |
716 | os=-mingw32 | 742 | os=-mingw32 |
@@ -1061,6 +1087,11 @@ case $basic_machine in | |||
1061 | basic_machine=tic6x-unknown | 1087 | basic_machine=tic6x-unknown |
1062 | os=-coff | 1088 | os=-coff |
1063 | ;; | 1089 | ;; |
1090 | # This must be matched before tile*. | ||
1091 | tilegx*) | ||
1092 | basic_machine=tilegx-unknown | ||
1093 | os=-linux-gnu | ||
1094 | ;; | ||
1064 | tile*) | 1095 | tile*) |
1065 | basic_machine=tile-unknown | 1096 | basic_machine=tile-unknown |
1066 | os=-linux-gnu | 1097 | os=-linux-gnu |
@@ -1140,6 +1171,10 @@ case $basic_machine in | |||
1140 | basic_machine=z8k-unknown | 1171 | basic_machine=z8k-unknown |
1141 | os=-sim | 1172 | os=-sim |
1142 | ;; | 1173 | ;; |
1174 | z80-*-coff) | ||
1175 | basic_machine=z80-unknown | ||
1176 | os=-sim | ||
1177 | ;; | ||
1143 | none) | 1178 | none) |
1144 | basic_machine=none-none | 1179 | basic_machine=none-none |
1145 | os=-none | 1180 | os=-none |
@@ -1178,7 +1213,7 @@ case $basic_machine in | |||
1178 | we32k) | 1213 | we32k) |
1179 | basic_machine=we32k-att | 1214 | basic_machine=we32k-att |
1180 | ;; | 1215 | ;; |
1181 | sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) | 1216 | sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) |
1182 | basic_machine=sh-unknown | 1217 | basic_machine=sh-unknown |
1183 | ;; | 1218 | ;; |
1184 | sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) | 1219 | sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) |
@@ -1228,6 +1263,9 @@ case $os in | |||
1228 | # First match some system type aliases | 1263 | # First match some system type aliases |
1229 | # that might get confused with valid system types. | 1264 | # that might get confused with valid system types. |
1230 | # -solaris* is a basic system type, with this one exception. | 1265 | # -solaris* is a basic system type, with this one exception. |
1266 | -auroraux) | ||
1267 | os=-auroraux | ||
1268 | ;; | ||
1231 | -solaris1 | -solaris1.*) | 1269 | -solaris1 | -solaris1.*) |
1232 | os=`echo $os | sed -e 's|solaris1|sunos4|'` | 1270 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
1233 | ;; | 1271 | ;; |
@@ -1248,10 +1286,11 @@ case $os in | |||
1248 | # Each alternative MUST END IN A *, to match a version number. | 1286 | # Each alternative MUST END IN A *, to match a version number. |
1249 | # -sysv* is not here because it comes later, after sysvr4. | 1287 | # -sysv* is not here because it comes later, after sysvr4. |
1250 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | 1288 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
1251 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | 1289 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
1252 | | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | 1290 | | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ |
1291 | | -sym* | -kopensolaris* \ | ||
1253 | | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | 1292 | | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ |
1254 | | -aos* \ | 1293 | | -aos* | -aros* \ |
1255 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | 1294 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
1256 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | 1295 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ |
1257 | | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ | 1296 | | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ |
@@ -1270,7 +1309,7 @@ case $os in | |||
1270 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | 1309 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
1271 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | 1310 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
1272 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | 1311 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
1273 | | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) | 1312 | | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) |
1274 | # Remember, each alternative MUST END IN *, to match a version number. | 1313 | # Remember, each alternative MUST END IN *, to match a version number. |
1275 | ;; | 1314 | ;; |
1276 | -qnx*) | 1315 | -qnx*) |
@@ -1403,6 +1442,8 @@ case $os in | |||
1403 | -dicos*) | 1442 | -dicos*) |
1404 | os=-dicos | 1443 | os=-dicos |
1405 | ;; | 1444 | ;; |
1445 | -nacl*) | ||
1446 | ;; | ||
1406 | -none) | 1447 | -none) |
1407 | ;; | 1448 | ;; |
1408 | *) | 1449 | *) |
@@ -1600,7 +1641,7 @@ case $basic_machine in | |||
1600 | -sunos*) | 1641 | -sunos*) |
1601 | vendor=sun | 1642 | vendor=sun |
1602 | ;; | 1643 | ;; |
1603 | -aix*) | 1644 | -cnk*|-aix*) |
1604 | vendor=ibm | 1645 | vendor=ibm |
1605 | ;; | 1646 | ;; |
1606 | -beos*) | 1647 | -beos*) |