Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

BUILD: Updated config.guess and config.sub from latest GNU libtool.

  • Loading branch information...
commit 05a72fbb2880633272c5bbe139fd288ae176cf5b 1 parent 9debde0
Matt Lewandowsky lewellyn authored fuzzie committed

Showing 2 changed files with 243 additions and 163 deletions. Show diff stats Hide diff stats

  1. +125 107 config.guess
  2. +118 56 config.sub
232 config.guess
... ... @@ -1,10 +1,10 @@
1 1 #! /bin/sh
2 2 # Attempt to guess a canonical system name.
3 3 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4   -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
5   -# Free Software Foundation, Inc.
  4 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
  5 +# 2011 Free Software Foundation, Inc.
6 6
7   -timestamp='2009-12-13'
  7 +timestamp='2011-10-01'
8 8
9 9 # This file is free software; you can redistribute it and/or modify it
10 10 # under the terms of the GNU General Public License as published by
@@ -56,8 +56,9 @@ version="\
56 56 GNU config.guess ($timestamp)
57 57
58 58 Originally written by Per Bothner.
59   -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
60   -2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  59 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
  60 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
  61 +Software Foundation, Inc.
61 62
62 63 This is free software; see the source for copying conditions. There is NO
63 64 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -180,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
180 181 fi
181 182 ;;
182 183 *)
183   - os=netbsd
  184 + os=netbsd
184 185 ;;
185 186 esac
186 187 # The OS release
@@ -223,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
223 224 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
224 225 ;;
225 226 *5.*)
226   - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
  227 + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
227 228 ;;
228 229 esac
229 230 # According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
269 270 # A Xn.n version is an unreleased experimental baselevel.
270 271 # 1.2 uses "1.2" for uname -r.
271 272 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
272   - exit ;;
  273 + # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
  274 + exitcode=$?
  275 + trap '' 0
  276 + exit $exitcode ;;
273 277 Alpha\ *:Windows_NT*:*)
274 278 # How do we know it's Interix rather than the generic POSIX subsystem?
275 279 # Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
295 299 echo s390-ibm-zvmoe
296 300 exit ;;
297 301 *:OS400:*:*)
298   - echo powerpc-ibm-os400
  302 + echo powerpc-ibm-os400
299 303 exit ;;
300 304 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
301 305 echo arm-acorn-riscix${UNAME_RELEASE}
@@ -394,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
394 398 # MiNT. But MiNT is downward compatible to TOS, so this should
395 399 # be no problem.
396 400 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
397   - echo m68k-atari-mint${UNAME_RELEASE}
  401 + echo m68k-atari-mint${UNAME_RELEASE}
398 402 exit ;;
399 403 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
400 404 echo m68k-atari-mint${UNAME_RELEASE}
401   - exit ;;
  405 + exit ;;
402 406 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
403   - echo m68k-atari-mint${UNAME_RELEASE}
  407 + echo m68k-atari-mint${UNAME_RELEASE}
404 408 exit ;;
405 409 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
406   - echo m68k-milan-mint${UNAME_RELEASE}
407   - exit ;;
  410 + echo m68k-milan-mint${UNAME_RELEASE}
  411 + exit ;;
408 412 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
409   - echo m68k-hades-mint${UNAME_RELEASE}
410   - exit ;;
  413 + echo m68k-hades-mint${UNAME_RELEASE}
  414 + exit ;;
411 415 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
412   - echo m68k-unknown-mint${UNAME_RELEASE}
413   - exit ;;
  416 + echo m68k-unknown-mint${UNAME_RELEASE}
  417 + exit ;;
414 418 m68k:machten:*:*)
415 419 echo m68k-apple-machten${UNAME_RELEASE}
416 420 exit ;;
@@ -480,8 +484,8 @@ EOF
480 484 echo m88k-motorola-sysv3
481 485 exit ;;
482 486 AViiON:dgux:*:*)
483   - # DG/UX returns AViiON for all architectures
484   - UNAME_PROCESSOR=`/usr/bin/uname -p`
  487 + # DG/UX returns AViiON for all architectures
  488 + UNAME_PROCESSOR=`/usr/bin/uname -p`
485 489 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
486 490 then
487 491 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -494,7 +498,7 @@ EOF
494 498 else
495 499 echo i586-dg-dgux${UNAME_RELEASE}
496 500 fi
497   - exit ;;
  501 + exit ;;
498 502 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
499 503 echo m88k-dolphin-sysv3
500 504 exit ;;
@@ -551,7 +555,7 @@ EOF
551 555 echo rs6000-ibm-aix3.2
552 556 fi
553 557 exit ;;
554   - *:AIX:*:[456])
  558 + *:AIX:*:[4567])
555 559 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
556 560 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
557 561 IBM_ARCH=rs6000
@@ -594,52 +598,52 @@ EOF
594 598 9000/[678][0-9][0-9])
595 599 if [ -x /usr/bin/getconf ]; then
596 600 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
597   - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
598   - case "${sc_cpu_version}" in
599   - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
600   - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
601   - 532) # CPU_PA_RISC2_0
602   - case "${sc_kernel_bits}" in
603   - 32) HP_ARCH="hppa2.0n" ;;
604   - 64) HP_ARCH="hppa2.0w" ;;
  601 + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
  602 + case "${sc_cpu_version}" in
  603 + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
  604 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
  605 + 532) # CPU_PA_RISC2_0
  606 + case "${sc_kernel_bits}" in
  607 + 32) HP_ARCH="hppa2.0n" ;;
  608 + 64) HP_ARCH="hppa2.0w" ;;
605 609 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
606   - esac ;;
607   - esac
  610 + esac ;;
  611 + esac
608 612 fi
609 613 if [ "${HP_ARCH}" = "" ]; then
610 614 eval $set_cc_for_build
611   - sed 's/^ //' << EOF >$dummy.c
  615 + sed 's/^ //' << EOF >$dummy.c
612 616
613   - #define _HPUX_SOURCE
614   - #include <stdlib.h>
615   - #include <unistd.h>
  617 + #define _HPUX_SOURCE
  618 + #include <stdlib.h>
  619 + #include <unistd.h>
616 620
617   - int main ()
618   - {
619   - #if defined(_SC_KERNEL_BITS)
620   - long bits = sysconf(_SC_KERNEL_BITS);
621   - #endif
622   - long cpu = sysconf (_SC_CPU_VERSION);
  621 + int main ()
  622 + {
  623 + #if defined(_SC_KERNEL_BITS)
  624 + long bits = sysconf(_SC_KERNEL_BITS);
  625 + #endif
  626 + long cpu = sysconf (_SC_CPU_VERSION);
623 627
624   - switch (cpu)
625   - {
626   - case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
627   - case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
628   - case CPU_PA_RISC2_0:
629   - #if defined(_SC_KERNEL_BITS)
630   - switch (bits)
631   - {
632   - case 64: puts ("hppa2.0w"); break;
633   - case 32: puts ("hppa2.0n"); break;
634   - default: puts ("hppa2.0"); break;
635   - } break;
636   - #else /* !defined(_SC_KERNEL_BITS) */
637   - puts ("hppa2.0"); break;
638   - #endif
639   - default: puts ("hppa1.0"); break;
640   - }
641   - exit (0);
642   - }
  628 + switch (cpu)
  629 + {
  630 + case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
  631 + case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
  632 + case CPU_PA_RISC2_0:
  633 + #if defined(_SC_KERNEL_BITS)
  634 + switch (bits)
  635 + {
  636 + case 64: puts ("hppa2.0w"); break;
  637 + case 32: puts ("hppa2.0n"); break;
  638 + default: puts ("hppa2.0"); break;
  639 + } break;
  640 + #else /* !defined(_SC_KERNEL_BITS) */
  641 + puts ("hppa2.0"); break;
  642 + #endif
  643 + default: puts ("hppa1.0"); break;
  644 + }
  645 + exit (0);
  646 + }
643 647 EOF
644 648 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
645 649 test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -730,22 +734,22 @@ EOF
730 734 exit ;;
731 735 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
732 736 echo c1-convex-bsd
733   - exit ;;
  737 + exit ;;
734 738 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
735 739 if getsysinfo -f scalar_acc
736 740 then echo c32-convex-bsd
737 741 else echo c2-convex-bsd
738 742 fi
739   - exit ;;
  743 + exit ;;
740 744 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
741 745 echo c34-convex-bsd
742   - exit ;;
  746 + exit ;;
743 747 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
744 748 echo c38-convex-bsd
745   - exit ;;
  749 + exit ;;
746 750 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
747 751 echo c4-convex-bsd
748   - exit ;;
  752 + exit ;;
749 753 CRAY*Y-MP:*:*:*)
750 754 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
751 755 exit ;;
@@ -769,14 +773,14 @@ EOF
769 773 exit ;;
770 774 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
771 775 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
772   - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
773   - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
774   - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
775   - exit ;;
  776 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
  777 + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
  778 + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
  779 + exit ;;
776 780 5000:UNIX_System_V:4.*:*)
777   - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
778   - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
779   - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
  781 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
  782 + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
  783 + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
780 784 exit ;;
781 785 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
782 786 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -788,13 +792,12 @@ EOF
788 792 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
789 793 exit ;;
790 794 *:FreeBSD:*:*)
791   - case ${UNAME_MACHINE} in
792   - pc98)
793   - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
  795 + UNAME_PROCESSOR=`/usr/bin/uname -p`
  796 + case ${UNAME_PROCESSOR} in
794 797 amd64)
795 798 echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
796 799 *)
797   - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
  800 + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
798 801 esac
799 802 exit ;;
800 803 i*:CYGWIN*:*)
@@ -804,14 +807,14 @@ EOF
804 807 echo ${UNAME_MACHINE}-pc-mingw32
805 808 exit ;;
806 809 i*:windows32*:*)
807   - # uname -m includes "-pc" on this system.
808   - echo ${UNAME_MACHINE}-mingw32
  810 + # uname -m includes "-pc" on this system.
  811 + echo ${UNAME_MACHINE}-mingw32
809 812 exit ;;
810 813 i*:PW*:*)
811 814 echo ${UNAME_MACHINE}-pc-pw32
812 815 exit ;;
813 816 *:Interix*:*)
814   - case ${UNAME_MACHINE} in
  817 + case ${UNAME_MACHINE} in
815 818 x86)
816 819 echo i586-pc-interix${UNAME_RELEASE}
817 820 exit ;;
@@ -866,7 +869,7 @@ EOF
866 869 EV6) UNAME_MACHINE=alphaev6 ;;
867 870 EV67) UNAME_MACHINE=alphaev67 ;;
868 871 EV68*) UNAME_MACHINE=alphaev68 ;;
869   - esac
  872 + esac
870 873 objdump --private-headers /bin/sh | grep -q ld.so.1
871 874 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
872 875 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -878,7 +881,13 @@ EOF
878 881 then
879 882 echo ${UNAME_MACHINE}-unknown-linux-gnu
880 883 else
881   - echo ${UNAME_MACHINE}-unknown-linux-gnueabi
  884 + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
  885 + | grep -q __ARM_PCS_VFP
  886 + then
  887 + echo ${UNAME_MACHINE}-unknown-linux-gnueabi
  888 + else
  889 + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
  890 + fi
882 891 fi
883 892 exit ;;
884 893 avr32*:Linux:*:*)
@@ -891,7 +900,10 @@ EOF
891 900 echo crisv32-axis-linux-gnu
892 901 exit ;;
893 902 frv:Linux:*:*)
894   - echo frv-unknown-linux-gnu
  903 + echo frv-unknown-linux-gnu
  904 + exit ;;
  905 + hexagon:Linux:*:*)
  906 + echo hexagon-unknown-linux-gnu
895 907 exit ;;
896 908 i*86:Linux:*:*)
897 909 LIBC=gnu
@@ -959,7 +971,7 @@ EOF
959 971 echo ${UNAME_MACHINE}-ibm-linux
960 972 exit ;;
961 973 sh64*:Linux:*:*)
962   - echo ${UNAME_MACHINE}-unknown-linux-gnu
  974 + echo ${UNAME_MACHINE}-unknown-linux-gnu
963 975 exit ;;
964 976 sh*:Linux:*:*)
965 977 echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -967,6 +979,9 @@ EOF
967 979 sparc:Linux:*:* | sparc64:Linux:*:*)
968 980 echo ${UNAME_MACHINE}-unknown-linux-gnu
969 981 exit ;;
  982 + tile*:Linux:*:*)
  983 + echo ${UNAME_MACHINE}-unknown-linux-gnu
  984 + exit ;;
970 985 vax:Linux:*:*)
971 986 echo ${UNAME_MACHINE}-dec-linux-gnu
972 987 exit ;;
@@ -974,7 +989,7 @@ EOF
974 989 echo x86_64-unknown-linux-gnu
975 990 exit ;;
976 991 xtensa*:Linux:*:*)
977   - echo ${UNAME_MACHINE}-unknown-linux-gnu
  992 + echo ${UNAME_MACHINE}-unknown-linux-gnu
978 993 exit ;;
979 994 i*86:DYNIX/ptx:4*:*)
980 995 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -983,11 +998,11 @@ EOF
983 998 echo i386-sequent-sysv4
984 999 exit ;;
985 1000 i*86:UNIX_SV:4.2MP:2.*)
986   - # Unixware is an offshoot of SVR4, but it has its own version
987   - # number series starting with 2...
988   - # I am not positive that other SVR4 systems won't match this,
  1001 + # Unixware is an offshoot of SVR4, but it has its own version
  1002 + # number series starting with 2...
  1003 + # I am not positive that other SVR4 systems won't match this,
989 1004 # I just have to hope. -- rms.
990   - # Use sysv4.2uw... so that sysv4* matches it.
  1005 + # Use sysv4.2uw... so that sysv4* matches it.
991 1006 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
992 1007 exit ;;
993 1008 i*86:OS/2:*:*)
@@ -1019,7 +1034,7 @@ EOF
1019 1034 fi
1020 1035 exit ;;
1021 1036 i*86:*:5:[678]*)
1022   - # UnixWare 7.x, OpenUNIX and OpenServer 6.
  1037 + # UnixWare 7.x, OpenUNIX and OpenServer 6.
1023 1038 case `/bin/uname -X | grep "^Machine"` in
1024 1039 *486*) UNAME_MACHINE=i486 ;;
1025 1040 *Pentium) UNAME_MACHINE=i586 ;;
@@ -1047,13 +1062,13 @@ EOF
1047 1062 exit ;;
1048 1063 pc:*:*:*)
1049 1064 # Left here for compatibility:
1050   - # uname -m prints for DJGPP always 'pc', but it prints nothing about
1051   - # the processor, so we play safe by assuming i586.
  1065 + # uname -m prints for DJGPP always 'pc', but it prints nothing about
  1066 + # the processor, so we play safe by assuming i586.
1052 1067 # Note: whatever this is, it MUST be the same as what config.sub
1053 1068 # prints for the "djgpp" host, or else GDB configury will decide that
1054 1069 # this is a cross-build.
1055 1070 echo i586-pc-msdosdjgpp
1056   - exit ;;
  1071 + exit ;;
1057 1072 Intel:Mach:3*:*)
1058 1073 echo i386-pc-mach3
1059 1074 exit ;;
@@ -1088,8 +1103,8 @@ EOF
1088 1103 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1089 1104 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1090 1105 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1091   - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1092   - && { echo i486-ncr-sysv4; exit; } ;;
  1106 + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
  1107 + && { echo i486-ncr-sysv4; exit; } ;;
1093 1108 NCR*:*:4.2:* | MPRAS*:*:4.2:*)
1094 1109 OS_REL='.3'
1095 1110 test -r /etc/.relid \
@@ -1132,10 +1147,10 @@ EOF
1132 1147 echo ns32k-sni-sysv
1133 1148 fi
1134 1149 exit ;;
1135   - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1136   - # says <Richard.M.Bartel@ccMail.Census.GOV>
1137   - echo i586-unisys-sysv4
1138   - exit ;;
  1150 + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
  1151 + # says <Richard.M.Bartel@ccMail.Census.GOV>
  1152 + echo i586-unisys-sysv4
  1153 + exit ;;
1139 1154 *:UNIX_System_V:4*:FTX*)
1140 1155 # From Gerald Hewes <hewes@openmarket.com>.
1141 1156 # How about differentiating between stratus architectures? -djm
@@ -1161,11 +1176,11 @@ EOF
1161 1176 exit ;;
1162 1177 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1163 1178 if [ -d /usr/nec ]; then
1164   - echo mips-nec-sysv${UNAME_RELEASE}
  1179 + echo mips-nec-sysv${UNAME_RELEASE}
1165 1180 else
1166   - echo mips-unknown-sysv${UNAME_RELEASE}
  1181 + echo mips-unknown-sysv${UNAME_RELEASE}
1167 1182 fi
1168   - exit ;;
  1183 + exit ;;
1169 1184 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
1170 1185 echo powerpc-be-beos
1171 1186 exit ;;
@@ -1230,6 +1245,9 @@ EOF
1230 1245 *:QNX:*:4*)
1231 1246 echo i386-pc-qnx
1232 1247 exit ;;
  1248 + NEO-?:NONSTOP_KERNEL:*:*)
  1249 + echo neo-tandem-nsk${UNAME_RELEASE}
  1250 + exit ;;
1233 1251 NSE-?:NONSTOP_KERNEL:*:*)
1234 1252 echo nse-tandem-nsk${UNAME_RELEASE}
1235 1253 exit ;;
@@ -1275,13 +1293,13 @@ EOF
1275 1293 echo pdp10-unknown-its
1276 1294 exit ;;
1277 1295 SEI:*:*:SEIUX)
1278   - echo mips-sei-seiux${UNAME_RELEASE}
  1296 + echo mips-sei-seiux${UNAME_RELEASE}
1279 1297 exit ;;
1280 1298 *:DragonFly:*:*)
1281 1299 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1282 1300 exit ;;
1283 1301 *:*VMS:*:*)
1284   - UNAME_MACHINE=`(uname -p) 2>/dev/null`
  1302 + UNAME_MACHINE=`(uname -p) 2>/dev/null`
1285 1303 case "${UNAME_MACHINE}" in
1286 1304 A*) echo alpha-dec-vms ; exit ;;
1287 1305 I*) echo ia64-dec-vms ; exit ;;
@@ -1321,11 +1339,11 @@ main ()
1321 1339 #include <sys/param.h>
1322 1340 printf ("m68k-sony-newsos%s\n",
1323 1341 #ifdef NEWSOS4
1324   - "4"
  1342 + "4"
1325 1343 #else
1326   - ""
  1344 + ""
1327 1345 #endif
1328   - ); exit (0);
  1346 + ); exit (0);
1329 1347 #endif
1330 1348 #endif
1331 1349
174 config.sub
... ... @@ -1,10 +1,10 @@
1 1 #! /bin/sh
2 2 # Configuration validation subroutine script.
3 3 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4   -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
5   -# Free Software Foundation, Inc.
  4 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
  5 +# 2011 Free Software Foundation, Inc.
6 6
7   -timestamp='2009-12-13'
  7 +timestamp='2011-10-08'
8 8
9 9 # This file is (in principle) common to ALL GNU software.
10 10 # The presence of a machine in this file suggests that SOME GNU software
@@ -75,8 +75,9 @@ Report bugs and patches to <config-patches@gnu.org>."
75 75 version="\
76 76 GNU config.sub ($timestamp)
77 77
78   -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
79   -2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  78 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
  79 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
  80 +Software Foundation, Inc.
80 81
81 82 This is free software; see the source for copying conditions. There is NO
82 83 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -123,8 +124,9 @@ esac
123 124 # Here we must recognize all the valid KERNEL-OS combinations.
124 125 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
125 126 case $maybe_os in
126   - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
127   - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
  127 + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
  128 + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
  129 + knetbsd*-gnu* | netbsd*-gnu* | \
128 130 kopensolaris*-gnu* | \
129 131 storm-chaos* | os2-emx* | rtmk-nova*)
130 132 os=-$maybe_os
@@ -156,8 +158,8 @@ case $os in
156 158 os=
157 159 basic_machine=$1
158 160 ;;
159   - -bluegene*)
160   - os=-cnk
  161 + -bluegene*)
  162 + os=-cnk
161 163 ;;
162 164 -sim | -cisco | -oki | -wec | -winbond)
163 165 os=
@@ -173,10 +175,10 @@ case $os in
173 175 os=-chorusos
174 176 basic_machine=$1
175 177 ;;
176   - -chorusrdb)
177   - os=-chorusrdb
  178 + -chorusrdb)
  179 + os=-chorusrdb
178 180 basic_machine=$1
179   - ;;
  181 + ;;
180 182 -hiux*)
181 183 os=-hiuxwe2
182 184 ;;
@@ -249,13 +251,17 @@ case $basic_machine in
249 251 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
250 252 | am33_2.0 \
251 253 | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
  254 + | be32 | be64 \
252 255 | bfin \
253 256 | c4x | clipper \
254 257 | d10v | d30v | dlx | dsp16xx \
  258 + | epiphany \
255 259 | fido | fr30 | frv \
256 260 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
  261 + | hexagon \
257 262 | i370 | i860 | i960 | ia64 \
258 263 | ip2k | iq2000 \
  264 + | le32 | le64 \
259 265 | lm32 \
260 266 | m32c | m32r | m32rle | m68000 | m68k | m88k \
261 267 | maxq | mb | microblaze | mcore | mep | metag \
@@ -281,11 +287,13 @@ case $basic_machine in
281 287 | moxie \
282 288 | mt \
283 289 | msp430 \
  290 + | nds32 | nds32le | nds32be \
284 291 | nios | nios2 \
285 292 | ns16k | ns32k \
  293 + | open8 \
286 294 | or32 \
287 295 | pdp10 | pdp11 | pj | pjl \
288   - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
  296 + | powerpc | powerpc64 | powerpc64le | powerpcle \
289 297 | pyramid \
290 298 | rx \
291 299 | score \
@@ -293,15 +301,24 @@ case $basic_machine in
293 301 | sh64 | sh64le \
294 302 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
295 303 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
296   - | spu | strongarm \
297   - | tahoe | thumb | tic4x | tic80 | tron \
  304 + | spu \
  305 + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
298 306 | ubicom32 \
299   - | v850 | v850e \
  307 + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
300 308 | we32k \
301   - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
  309 + | x86 | xc16x | xstormy16 | xtensa \
302 310 | z8k | z80)
303 311 basic_machine=$basic_machine-unknown
304 312 ;;
  313 + c54x)
  314 + basic_machine=tic54x-unknown
  315 + ;;
  316 + c55x)
  317 + basic_machine=tic55x-unknown
  318 + ;;
  319 + c6x)
  320 + basic_machine=tic6x-unknown
  321 + ;;
305 322 m6811 | m68hc11 | m6812 | m68hc12 | picochip)
306 323 # Motorola 68HC11/12.
307 324 basic_machine=$basic_machine-unknown
@@ -313,6 +330,18 @@ case $basic_machine in
313 330 basic_machine=mt-unknown
314 331 ;;
315 332
  333 + strongarm | thumb | xscale)
  334 + basic_machine=arm-unknown
  335 + ;;
  336 +
  337 + xscaleeb)
  338 + basic_machine=armeb-unknown
  339 + ;;
  340 +
  341 + xscaleel)
  342 + basic_machine=armel-unknown
  343 + ;;
  344 +
316 345 # We use `pc' rather than `unknown'
317 346 # because (1) that's what they normally are, and
318 347 # (2) the word "unknown" tends to confuse beginning users.
@@ -332,16 +361,19 @@ case $basic_machine in
332 361 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
333 362 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
334 363 | avr-* | avr32-* \
  364 + | be32-* | be64-* \
335 365 | bfin-* | bs2000-* \
336   - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
  366 + | c[123]* | c30-* | [cjt]90-* | c4x-* \
337 367 | clipper-* | craynv-* | cydra-* \
338 368 | d10v-* | d30v-* | dlx-* \
339 369 | elxsi-* \
340 370 | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
341 371 | h8300-* | h8500-* \
342 372 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
  373 + | hexagon-* \
343 374 | i*86-* | i860-* | i960-* | ia64-* \
344 375 | ip2k-* | iq2000-* \
  376 + | le32-* | le64-* \
345 377 | lm32-* \
346 378 | m32c-* | m32r-* | m32rle-* \
347 379 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -367,25 +399,29 @@ case $basic_machine in
367 399 | mmix-* \
368 400 | mt-* \
369 401 | msp430-* \
  402 + | nds32-* | nds32le-* | nds32be-* \
370 403 | nios-* | nios2-* \
371 404 | none-* | np1-* | ns16k-* | ns32k-* \
  405 + | open8-* \
372 406 | orion-* \
373 407 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
374   - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
  408 + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
375 409 | pyramid-* \
376 410 | romp-* | rs6000-* | rx-* \
377 411 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
378 412 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
379 413 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
380 414 | sparclite-* \
381   - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
382   - | tahoe-* | thumb-* \
383   - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
  415 + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
  416 + | tahoe-* \
  417 + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
  418 + | tile*-* \
384 419 | tron-* \
385 420 | ubicom32-* \
386   - | v850-* | v850e-* | vax-* \
  421 + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
  422 + | vax-* \
387 423 | we32k-* \
388   - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
  424 + | x86-* | x86_64-* | xc16x-* | xps100-* \
389 425 | xstormy16-* | xtensa*-* \
390 426 | ymp-* \
391 427 | z8k-* | z80-*)
@@ -410,7 +446,7 @@ case $basic_machine in
410 446 basic_machine=a29k-amd
411 447 os=-udi
412 448 ;;
413   - abacus)
  449 + abacus)
414 450 basic_machine=abacus-unknown
415 451 ;;
416 452 adobe68k)
@@ -480,11 +516,20 @@ case $basic_machine in
480 516 basic_machine=powerpc-ibm
481 517 os=-cnk
482 518 ;;
  519 + c54x-*)
  520 + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
  521 + ;;
  522 + c55x-*)
  523 + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
  524 + ;;
  525 + c6x-*)
  526 + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
  527 + ;;
483 528 c90)
484 529 basic_machine=c90-cray
485 530 os=-unicos
486 531 ;;
487   - cegcc)
  532 + cegcc)
488 533 basic_machine=arm-unknown
489 534 os=-cegcc
490 535 ;;
@@ -516,7 +561,7 @@ case $basic_machine in
516 561 basic_machine=craynv-cray
517 562 os=-unicosmp
518 563 ;;
519   - cr16)
  564 + cr16 | cr16-*)
520 565 basic_machine=cr16-unknown
521 566 os=-elf
522 567 ;;
@@ -732,7 +777,7 @@ case $basic_machine in
732 777 basic_machine=ns32k-utek
733 778 os=-sysv
734 779 ;;
735   - microblaze)
  780 + microblaze)
736 781 basic_machine=microblaze-xilinx
737 782 ;;
738 783 mingw32)
@@ -775,6 +820,10 @@ case $basic_machine in
775 820 basic_machine=i370-ibm
776 821 os=-mvs
777 822 ;;
  823 + nacl)
  824 + basic_machine=le32-unknown
  825 + os=-nacl
  826 + ;;
778 827 ncr3000)
779 828 basic_machine=i486-ncr
780 829 os=-sysv4
@@ -839,6 +888,12 @@ case $basic_machine in
839 888 np1)
840 889 basic_machine=np1-gould
841 890 ;;
  891 + neo-tandem)
  892 + basic_machine=neo-tandem
  893 + ;;
  894 + nse-tandem)
  895 + basic_machine=nse-tandem
  896 + ;;
842 897 nsr-tandem)
843 898 basic_machine=nsr-tandem
844 899 ;;
@@ -921,9 +976,10 @@ case $basic_machine in
921 976 ;;
922 977 power) basic_machine=power-ibm
923 978 ;;
924   - ppc) basic_machine=powerpc-unknown
  979 + ppc | ppcbe) basic_machine=powerpc-unknown
925 980 ;;
926   - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
  981 + ppc-* | ppcbe-*)
  982 + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
927 983 ;;
928 984 ppcle | powerpclittle | ppc-le | powerpc-little)
929 985 basic_machine=powerpcle-unknown
@@ -1017,6 +1073,9 @@ case $basic_machine in
1017 1073 basic_machine=i860-stratus
1018 1074 os=-sysv4
1019 1075 ;;
  1076 + strongarm-* | thumb-*)
  1077 + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
  1078 + ;;
1020 1079 sun2)
1021 1080 basic_machine=m68000-sun
1022 1081 ;;
@@ -1073,20 +1132,8 @@ case $basic_machine in
1073 1132 basic_machine=t90-cray
1074 1133 os=-unicos
1075 1134 ;;
1076   - tic54x | c54x*)
1077   - basic_machine=tic54x-unknown
1078   - os=-coff
1079   - ;;
1080   - tic55x | c55x*)
1081   - basic_machine=tic55x-unknown
1082   - os=-coff
1083   - ;;
1084   - tic6x | c6x*)
1085   - basic_machine=tic6x-unknown
1086   - os=-coff
1087   - ;;
1088 1135 tile*)
1089   - basic_machine=tile-unknown
  1136 + basic_machine=$basic_machine-unknown
1090 1137 os=-linux-gnu
1091 1138 ;;
1092 1139 tx39)
@@ -1156,6 +1203,9 @@ case $basic_machine in
1156 1203 xps | xps100)
1157 1204 basic_machine=xps100-honeywell
1158 1205 ;;
  1206 + xscale-* | xscalee[bl]-*)
  1207 + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
  1208 + ;;
1159 1209 ymp)
1160 1210 basic_machine=ymp-cray
1161 1211 os=-unicos
@@ -1253,11 +1303,11 @@ esac
1253 1303 if [ x"$os" != x"" ]
1254 1304 then
1255 1305 case $os in
1256   - # First match some system type aliases
1257   - # that might get confused with valid system types.
  1306 + # First match some system type aliases
  1307 + # that might get confused with valid system types.
1258 1308 # -solaris* is a basic system type, with this one exception.
1259   - -auroraux)
1260   - os=-auroraux
  1309 + -auroraux)
  1310 + os=-auroraux
1261 1311 ;;
1262 1312 -solaris1 | -solaris1.*)
1263 1313 os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1294,7 +1344,8 @@ case $os in
1294 1344 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1295 1345 | -chorusos* | -chorusrdb* | -cegcc* \
1296 1346 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1297   - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
  1347 + | -mingw32* | -linux-gnu* | -linux-android* \
  1348 + | -linux-newlib* | -linux-uclibc* \
1298 1349 | -uxpv* | -beos* | -mpeix* | -udk* \
1299 1350 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1300 1351 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1341,7 +1392,7 @@ case $os in
1341 1392 -opened*)
1342 1393 os=-openedition
1343 1394 ;;
1344   - -os400*)
  1395 + -os400*)
1345 1396 os=-os400
1346 1397 ;;
1347 1398 -wince*)
@@ -1390,7 +1441,7 @@ case $os in
1390 1441 -sinix*)
1391 1442 os=-sysv4
1392 1443 ;;
1393   - -tpf*)
  1444 + -tpf*)
1394 1445 os=-tpf
1395 1446 ;;
1396 1447 -triton*)
@@ -1435,6 +1486,8 @@ case $os in
1435 1486 -dicos*)
1436 1487 os=-dicos
1437 1488 ;;
  1489 + -nacl*)
  1490 + ;;
1438 1491 -none)
1439 1492 ;;
1440 1493 *)
@@ -1457,10 +1510,10 @@ else
1457 1510 # system, and we'll never get to this point.
1458 1511
1459 1512 case $basic_machine in
1460   - score-*)
  1513 + score-*)
1461 1514 os=-elf
1462 1515 ;;
1463   - spu-*)
  1516 + spu-*)
1464 1517 os=-elf
1465 1518 ;;
1466 1519 *-acorn)
@@ -1472,8 +1525,17 @@ case $basic_machine in
1472 1525 arm*-semi)
1473 1526 os=-aout
1474 1527 ;;
1475   - c4x-* | tic4x-*)
1476   - os=-coff
  1528 + c4x-* | tic4x-*)
  1529 + os=-coff
  1530 + ;;
  1531 + tic54x-*)
  1532 + os=-coff
  1533 + ;;
  1534 + tic55x-*)
  1535 + os=-coff
  1536 + ;;
  1537 + tic6x-*)
  1538 + os=-coff
1477 1539 ;;
1478 1540 # This must come before the *-dec entry.
1479 1541 pdp10-*)
@@ -1500,7 +1562,7 @@ case $basic_machine in
1500 1562 m68*-cisco)
1501 1563 os=-aout
1502 1564 ;;
1503   - mep-*)
  1565 + mep-*)
1504 1566 os=-elf
1505 1567 ;;
1506 1568 mips*-cisco)
@@ -1527,7 +1589,7 @@ case $basic_machine in
1527 1589 *-ibm)
1528 1590 os=-aix
1529 1591 ;;
1530   - *-knuth)
  1592 + *-knuth)
1531 1593 os=-mmixware
1532 1594 ;;
1533 1595 *-wec)

0 comments on commit 05a72fb

Please sign in to comment.
Something went wrong with that request. Please try again.