summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xconfig.guess262
-rwxr-xr-xconfig.sub190
3 files changed, 270 insertions, 186 deletions
diff --git a/ChangeLog b/ChangeLog
index d7180176e..c9f466d1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120130418
2 - (djm) [config.guess config.sub] Update to last versions before they switch
3 to GPL3. ok dtucker@
4
120130404 520130404
2 - (dtucker) OpenBSD CVS Sync 6 - (dtucker) OpenBSD CVS Sync
3 - dtucker@cvs.openbsd.org 2013/02/17 23:16:57 7 - dtucker@cvs.openbsd.org 2013/02/17 23:16:57
diff --git a/config.guess b/config.guess
index 78553c4ea..b94cde8ef 100755
--- a/config.guess
+++ b/config.guess
@@ -2,9 +2,9 @@
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, 2009, 2010, 4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5# 2011 Free Software Foundation, Inc. 5# 2011, 2012, 2013 Free Software Foundation, Inc.
6 6
7timestamp='2011-01-23' 7timestamp='2012-12-23'
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
@@ -17,9 +17,7 @@ timestamp='2011-01-23'
17# General Public License for more details. 17# General Public License for more details.
18# 18#
19# You should have received a copy of the GNU General Public License 19# You should have received a copy of the GNU General Public License
20# along with this program; if not, write to the Free Software 20# along with this program; if not, see <http://www.gnu.org/licenses/>.
21# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
22# 02110-1301, USA.
23# 21#
24# As a special exception to the GNU General Public License, if you 22# As a special exception to the GNU General Public License, if you
25# distribute this file as part of a program that contains a 23# distribute this file as part of a program that contains a
@@ -57,8 +55,8 @@ GNU config.guess ($timestamp)
57 55
58Originally written by Per Bothner. 56Originally written by Per Bothner.
59Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 57Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
602001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free 582001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
61Software Foundation, Inc. 592012, 2013 Free Software Foundation, Inc.
62 60
63This is free software; see the source for copying conditions. There is NO 61This is free software; see the source for copying conditions. There is NO
64warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 62warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
145case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in 143case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
146 *:NetBSD:*:*) 144 *:NetBSD:*:*)
147 # NetBSD (nbsd) targets should (where applicable) match one or 145 # NetBSD (nbsd) targets should (where applicable) match one or
148 # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, 146 # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
149 # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently 147 # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
150 # switched to ELF, *-*-netbsd* would select the old 148 # switched to ELF, *-*-netbsd* would select the old
151 # object file format. This provides both forward 149 # object file format. This provides both forward
@@ -181,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
181 fi 179 fi
182 ;; 180 ;;
183 *) 181 *)
184 os=netbsd 182 os=netbsd
185 ;; 183 ;;
186 esac 184 esac
187 # The OS release 185 # The OS release
@@ -202,6 +200,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
202 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. 200 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
203 echo "${machine}-${os}${release}" 201 echo "${machine}-${os}${release}"
204 exit ;; 202 exit ;;
203 *:Bitrig:*:*)
204 UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
205 echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
206 exit ;;
205 *:OpenBSD:*:*) 207 *:OpenBSD:*:*)
206 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` 208 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
207 echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} 209 echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -224,7 +226,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
224 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` 226 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
225 ;; 227 ;;
226 *5.*) 228 *5.*)
227 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` 229 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
228 ;; 230 ;;
229 esac 231 esac
230 # According to Compaq, /usr/sbin/psrinfo has been available on 232 # According to Compaq, /usr/sbin/psrinfo has been available on
@@ -299,12 +301,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
299 echo s390-ibm-zvmoe 301 echo s390-ibm-zvmoe
300 exit ;; 302 exit ;;
301 *:OS400:*:*) 303 *:OS400:*:*)
302 echo powerpc-ibm-os400 304 echo powerpc-ibm-os400
303 exit ;; 305 exit ;;
304 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) 306 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
305 echo arm-acorn-riscix${UNAME_RELEASE} 307 echo arm-acorn-riscix${UNAME_RELEASE}
306 exit ;; 308 exit ;;
307 arm:riscos:*:*|arm:RISCOS:*:*) 309 arm*:riscos:*:*|arm*:RISCOS:*:*)
308 echo arm-unknown-riscos 310 echo arm-unknown-riscos
309 exit ;; 311 exit ;;
310 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) 312 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -398,23 +400,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
398 # MiNT. But MiNT is downward compatible to TOS, so this should 400 # MiNT. But MiNT is downward compatible to TOS, so this should
399 # be no problem. 401 # be no problem.
400 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) 402 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
401 echo m68k-atari-mint${UNAME_RELEASE} 403 echo m68k-atari-mint${UNAME_RELEASE}
402 exit ;; 404 exit ;;
403 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) 405 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
404 echo m68k-atari-mint${UNAME_RELEASE} 406 echo m68k-atari-mint${UNAME_RELEASE}
405 exit ;; 407 exit ;;
406 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) 408 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
407 echo m68k-atari-mint${UNAME_RELEASE} 409 echo m68k-atari-mint${UNAME_RELEASE}
408 exit ;; 410 exit ;;
409 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) 411 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
410 echo m68k-milan-mint${UNAME_RELEASE} 412 echo m68k-milan-mint${UNAME_RELEASE}
411 exit ;; 413 exit ;;
412 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) 414 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
413 echo m68k-hades-mint${UNAME_RELEASE} 415 echo m68k-hades-mint${UNAME_RELEASE}
414 exit ;; 416 exit ;;
415 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) 417 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
416 echo m68k-unknown-mint${UNAME_RELEASE} 418 echo m68k-unknown-mint${UNAME_RELEASE}
417 exit ;; 419 exit ;;
418 m68k:machten:*:*) 420 m68k:machten:*:*)
419 echo m68k-apple-machten${UNAME_RELEASE} 421 echo m68k-apple-machten${UNAME_RELEASE}
420 exit ;; 422 exit ;;
@@ -484,8 +486,8 @@ EOF
484 echo m88k-motorola-sysv3 486 echo m88k-motorola-sysv3
485 exit ;; 487 exit ;;
486 AViiON:dgux:*:*) 488 AViiON:dgux:*:*)
487 # DG/UX returns AViiON for all architectures 489 # DG/UX returns AViiON for all architectures
488 UNAME_PROCESSOR=`/usr/bin/uname -p` 490 UNAME_PROCESSOR=`/usr/bin/uname -p`
489 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] 491 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
490 then 492 then
491 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ 493 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -498,7 +500,7 @@ EOF
498 else 500 else
499 echo i586-dg-dgux${UNAME_RELEASE} 501 echo i586-dg-dgux${UNAME_RELEASE}
500 fi 502 fi
501 exit ;; 503 exit ;;
502 M88*:DolphinOS:*:*) # DolphinOS (SVR3) 504 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
503 echo m88k-dolphin-sysv3 505 echo m88k-dolphin-sysv3
504 exit ;; 506 exit ;;
@@ -598,52 +600,52 @@ EOF
598 9000/[678][0-9][0-9]) 600 9000/[678][0-9][0-9])
599 if [ -x /usr/bin/getconf ]; then 601 if [ -x /usr/bin/getconf ]; then
600 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` 602 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
601 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` 603 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
602 case "${sc_cpu_version}" in 604 case "${sc_cpu_version}" in
603 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 605 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
604 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 606 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
605 532) # CPU_PA_RISC2_0 607 532) # CPU_PA_RISC2_0
606 case "${sc_kernel_bits}" in 608 case "${sc_kernel_bits}" in
607 32) HP_ARCH="hppa2.0n" ;; 609 32) HP_ARCH="hppa2.0n" ;;
608 64) HP_ARCH="hppa2.0w" ;; 610 64) HP_ARCH="hppa2.0w" ;;
609 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 611 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
610 esac ;; 612 esac ;;
611 esac 613 esac
612 fi 614 fi
613 if [ "${HP_ARCH}" = "" ]; then 615 if [ "${HP_ARCH}" = "" ]; then
614 eval $set_cc_for_build 616 eval $set_cc_for_build
615 sed 's/^ //' << EOF >$dummy.c 617 sed 's/^ //' << EOF >$dummy.c
616 618
617 #define _HPUX_SOURCE 619 #define _HPUX_SOURCE
618 #include <stdlib.h> 620 #include <stdlib.h>
619 #include <unistd.h> 621 #include <unistd.h>
620 622
621 int main () 623 int main ()
622 { 624 {
623 #if defined(_SC_KERNEL_BITS) 625 #if defined(_SC_KERNEL_BITS)
624 long bits = sysconf(_SC_KERNEL_BITS); 626 long bits = sysconf(_SC_KERNEL_BITS);
625 #endif 627 #endif
626 long cpu = sysconf (_SC_CPU_VERSION); 628 long cpu = sysconf (_SC_CPU_VERSION);
627 629
628 switch (cpu) 630 switch (cpu)
629 { 631 {
630 case CPU_PA_RISC1_0: puts ("hppa1.0"); break; 632 case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
631 case CPU_PA_RISC1_1: puts ("hppa1.1"); break; 633 case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
632 case CPU_PA_RISC2_0: 634 case CPU_PA_RISC2_0:
633 #if defined(_SC_KERNEL_BITS) 635 #if defined(_SC_KERNEL_BITS)
634 switch (bits) 636 switch (bits)
635 { 637 {
636 case 64: puts ("hppa2.0w"); break; 638 case 64: puts ("hppa2.0w"); break;
637 case 32: puts ("hppa2.0n"); break; 639 case 32: puts ("hppa2.0n"); break;
638 default: puts ("hppa2.0"); break; 640 default: puts ("hppa2.0"); break;
639 } break; 641 } break;
640 #else /* !defined(_SC_KERNEL_BITS) */ 642 #else /* !defined(_SC_KERNEL_BITS) */
641 puts ("hppa2.0"); break; 643 puts ("hppa2.0"); break;
642 #endif 644 #endif
643 default: puts ("hppa1.0"); break; 645 default: puts ("hppa1.0"); break;
644 } 646 }
645 exit (0); 647 exit (0);
646 } 648 }
647EOF 649EOF
648 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` 650 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
649 test -z "$HP_ARCH" && HP_ARCH=hppa 651 test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -734,22 +736,22 @@ EOF
734 exit ;; 736 exit ;;
735 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) 737 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
736 echo c1-convex-bsd 738 echo c1-convex-bsd
737 exit ;; 739 exit ;;
738 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) 740 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
739 if getsysinfo -f scalar_acc 741 if getsysinfo -f scalar_acc
740 then echo c32-convex-bsd 742 then echo c32-convex-bsd
741 else echo c2-convex-bsd 743 else echo c2-convex-bsd
742 fi 744 fi
743 exit ;; 745 exit ;;
744 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) 746 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
745 echo c34-convex-bsd 747 echo c34-convex-bsd
746 exit ;; 748 exit ;;
747 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) 749 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
748 echo c38-convex-bsd 750 echo c38-convex-bsd
749 exit ;; 751 exit ;;
750 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) 752 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
751 echo c4-convex-bsd 753 echo c4-convex-bsd
752 exit ;; 754 exit ;;
753 CRAY*Y-MP:*:*:*) 755 CRAY*Y-MP:*:*:*)
754 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 756 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
755 exit ;; 757 exit ;;
@@ -773,14 +775,14 @@ EOF
773 exit ;; 775 exit ;;
774 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) 776 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
775 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 777 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
776 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 778 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
777 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` 779 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
778 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 780 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
779 exit ;; 781 exit ;;
780 5000:UNIX_System_V:4.*:*) 782 5000:UNIX_System_V:4.*:*)
781 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 783 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
782 FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` 784 FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
783 echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 785 echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
784 exit ;; 786 exit ;;
785 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) 787 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
786 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} 788 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -792,30 +794,35 @@ EOF
792 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} 794 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
793 exit ;; 795 exit ;;
794 *:FreeBSD:*:*) 796 *:FreeBSD:*:*)
795 case ${UNAME_MACHINE} in 797 UNAME_PROCESSOR=`/usr/bin/uname -p`
796 pc98) 798 case ${UNAME_PROCESSOR} in
797 echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
798 amd64) 799 amd64)
799 echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; 800 echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
800 *) 801 *)
801 echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; 802 echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
802 esac 803 esac
803 exit ;; 804 exit ;;
804 i*:CYGWIN*:*) 805 i*:CYGWIN*:*)
805 echo ${UNAME_MACHINE}-pc-cygwin 806 echo ${UNAME_MACHINE}-pc-cygwin
806 exit ;; 807 exit ;;
808 *:MINGW64*:*)
809 echo ${UNAME_MACHINE}-pc-mingw64
810 exit ;;
807 *:MINGW*:*) 811 *:MINGW*:*)
808 echo ${UNAME_MACHINE}-pc-mingw32 812 echo ${UNAME_MACHINE}-pc-mingw32
809 exit ;; 813 exit ;;
814 i*:MSYS*:*)
815 echo ${UNAME_MACHINE}-pc-msys
816 exit ;;
810 i*:windows32*:*) 817 i*:windows32*:*)
811 # uname -m includes "-pc" on this system. 818 # uname -m includes "-pc" on this system.
812 echo ${UNAME_MACHINE}-mingw32 819 echo ${UNAME_MACHINE}-mingw32
813 exit ;; 820 exit ;;
814 i*:PW*:*) 821 i*:PW*:*)
815 echo ${UNAME_MACHINE}-pc-pw32 822 echo ${UNAME_MACHINE}-pc-pw32
816 exit ;; 823 exit ;;
817 *:Interix*:*) 824 *:Interix*:*)
818 case ${UNAME_MACHINE} in 825 case ${UNAME_MACHINE} in
819 x86) 826 x86)
820 echo i586-pc-interix${UNAME_RELEASE} 827 echo i586-pc-interix${UNAME_RELEASE}
821 exit ;; 828 exit ;;
@@ -861,6 +868,13 @@ EOF
861 i*86:Minix:*:*) 868 i*86:Minix:*:*)
862 echo ${UNAME_MACHINE}-pc-minix 869 echo ${UNAME_MACHINE}-pc-minix
863 exit ;; 870 exit ;;
871 aarch64:Linux:*:*)
872 echo ${UNAME_MACHINE}-unknown-linux-gnu
873 exit ;;
874 aarch64_be:Linux:*:*)
875 UNAME_MACHINE=aarch64_be
876 echo ${UNAME_MACHINE}-unknown-linux-gnu
877 exit ;;
864 alpha:Linux:*:*) 878 alpha:Linux:*:*)
865 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in 879 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
866 EV5) UNAME_MACHINE=alphaev5 ;; 880 EV5) UNAME_MACHINE=alphaev5 ;;
@@ -870,7 +884,7 @@ EOF
870 EV6) UNAME_MACHINE=alphaev6 ;; 884 EV6) UNAME_MACHINE=alphaev6 ;;
871 EV67) UNAME_MACHINE=alphaev67 ;; 885 EV67) UNAME_MACHINE=alphaev67 ;;
872 EV68*) UNAME_MACHINE=alphaev68 ;; 886 EV68*) UNAME_MACHINE=alphaev68 ;;
873 esac 887 esac
874 objdump --private-headers /bin/sh | grep -q ld.so.1 888 objdump --private-headers /bin/sh | grep -q ld.so.1
875 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi 889 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
876 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} 890 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -882,20 +896,29 @@ EOF
882 then 896 then
883 echo ${UNAME_MACHINE}-unknown-linux-gnu 897 echo ${UNAME_MACHINE}-unknown-linux-gnu
884 else 898 else
885 echo ${UNAME_MACHINE}-unknown-linux-gnueabi 899 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
900 | grep -q __ARM_PCS_VFP
901 then
902 echo ${UNAME_MACHINE}-unknown-linux-gnueabi
903 else
904 echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
905 fi
886 fi 906 fi
887 exit ;; 907 exit ;;
888 avr32*:Linux:*:*) 908 avr32*:Linux:*:*)
889 echo ${UNAME_MACHINE}-unknown-linux-gnu 909 echo ${UNAME_MACHINE}-unknown-linux-gnu
890 exit ;; 910 exit ;;
891 cris:Linux:*:*) 911 cris:Linux:*:*)
892 echo cris-axis-linux-gnu 912 echo ${UNAME_MACHINE}-axis-linux-gnu
893 exit ;; 913 exit ;;
894 crisv32:Linux:*:*) 914 crisv32:Linux:*:*)
895 echo crisv32-axis-linux-gnu 915 echo ${UNAME_MACHINE}-axis-linux-gnu
896 exit ;; 916 exit ;;
897 frv:Linux:*:*) 917 frv:Linux:*:*)
898 echo frv-unknown-linux-gnu 918 echo ${UNAME_MACHINE}-unknown-linux-gnu
919 exit ;;
920 hexagon:Linux:*:*)
921 echo ${UNAME_MACHINE}-unknown-linux-gnu
899 exit ;; 922 exit ;;
900 i*86:Linux:*:*) 923 i*86:Linux:*:*)
901 LIBC=gnu 924 LIBC=gnu
@@ -937,7 +960,7 @@ EOF
937 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } 960 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
938 ;; 961 ;;
939 or32:Linux:*:*) 962 or32:Linux:*:*)
940 echo or32-unknown-linux-gnu 963 echo ${UNAME_MACHINE}-unknown-linux-gnu
941 exit ;; 964 exit ;;
942 padre:Linux:*:*) 965 padre:Linux:*:*)
943 echo sparc-unknown-linux-gnu 966 echo sparc-unknown-linux-gnu
@@ -963,7 +986,7 @@ EOF
963 echo ${UNAME_MACHINE}-ibm-linux 986 echo ${UNAME_MACHINE}-ibm-linux
964 exit ;; 987 exit ;;
965 sh64*:Linux:*:*) 988 sh64*:Linux:*:*)
966 echo ${UNAME_MACHINE}-unknown-linux-gnu 989 echo ${UNAME_MACHINE}-unknown-linux-gnu
967 exit ;; 990 exit ;;
968 sh*:Linux:*:*) 991 sh*:Linux:*:*)
969 echo ${UNAME_MACHINE}-unknown-linux-gnu 992 echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -972,16 +995,16 @@ EOF
972 echo ${UNAME_MACHINE}-unknown-linux-gnu 995 echo ${UNAME_MACHINE}-unknown-linux-gnu
973 exit ;; 996 exit ;;
974 tile*:Linux:*:*) 997 tile*:Linux:*:*)
975 echo ${UNAME_MACHINE}-tilera-linux-gnu 998 echo ${UNAME_MACHINE}-unknown-linux-gnu
976 exit ;; 999 exit ;;
977 vax:Linux:*:*) 1000 vax:Linux:*:*)
978 echo ${UNAME_MACHINE}-dec-linux-gnu 1001 echo ${UNAME_MACHINE}-dec-linux-gnu
979 exit ;; 1002 exit ;;
980 x86_64:Linux:*:*) 1003 x86_64:Linux:*:*)
981 echo x86_64-unknown-linux-gnu 1004 echo ${UNAME_MACHINE}-unknown-linux-gnu
982 exit ;; 1005 exit ;;
983 xtensa*:Linux:*:*) 1006 xtensa*:Linux:*:*)
984 echo ${UNAME_MACHINE}-unknown-linux-gnu 1007 echo ${UNAME_MACHINE}-unknown-linux-gnu
985 exit ;; 1008 exit ;;
986 i*86:DYNIX/ptx:4*:*) 1009 i*86:DYNIX/ptx:4*:*)
987 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. 1010 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -990,11 +1013,11 @@ EOF
990 echo i386-sequent-sysv4 1013 echo i386-sequent-sysv4
991 exit ;; 1014 exit ;;
992 i*86:UNIX_SV:4.2MP:2.*) 1015 i*86:UNIX_SV:4.2MP:2.*)
993 # Unixware is an offshoot of SVR4, but it has its own version 1016 # Unixware is an offshoot of SVR4, but it has its own version
994 # number series starting with 2... 1017 # number series starting with 2...
995 # I am not positive that other SVR4 systems won't match this, 1018 # I am not positive that other SVR4 systems won't match this,
996 # I just have to hope. -- rms. 1019 # I just have to hope. -- rms.
997 # Use sysv4.2uw... so that sysv4* matches it. 1020 # Use sysv4.2uw... so that sysv4* matches it.
998 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} 1021 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
999 exit ;; 1022 exit ;;
1000 i*86:OS/2:*:*) 1023 i*86:OS/2:*:*)
@@ -1026,7 +1049,7 @@ EOF
1026 fi 1049 fi
1027 exit ;; 1050 exit ;;
1028 i*86:*:5:[678]*) 1051 i*86:*:5:[678]*)
1029 # UnixWare 7.x, OpenUNIX and OpenServer 6. 1052 # UnixWare 7.x, OpenUNIX and OpenServer 6.
1030 case `/bin/uname -X | grep "^Machine"` in 1053 case `/bin/uname -X | grep "^Machine"` in
1031 *486*) UNAME_MACHINE=i486 ;; 1054 *486*) UNAME_MACHINE=i486 ;;
1032 *Pentium) UNAME_MACHINE=i586 ;; 1055 *Pentium) UNAME_MACHINE=i586 ;;
@@ -1054,13 +1077,13 @@ EOF
1054 exit ;; 1077 exit ;;
1055 pc:*:*:*) 1078 pc:*:*:*)
1056 # Left here for compatibility: 1079 # Left here for compatibility:
1057 # uname -m prints for DJGPP always 'pc', but it prints nothing about 1080 # uname -m prints for DJGPP always 'pc', but it prints nothing about
1058 # the processor, so we play safe by assuming i586. 1081 # the processor, so we play safe by assuming i586.
1059 # Note: whatever this is, it MUST be the same as what config.sub 1082 # Note: whatever this is, it MUST be the same as what config.sub
1060 # prints for the "djgpp" host, or else GDB configury will decide that 1083 # prints for the "djgpp" host, or else GDB configury will decide that
1061 # this is a cross-build. 1084 # this is a cross-build.
1062 echo i586-pc-msdosdjgpp 1085 echo i586-pc-msdosdjgpp
1063 exit ;; 1086 exit ;;
1064 Intel:Mach:3*:*) 1087 Intel:Mach:3*:*)
1065 echo i386-pc-mach3 1088 echo i386-pc-mach3
1066 exit ;; 1089 exit ;;
@@ -1095,8 +1118,8 @@ EOF
1095 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ 1118 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1096 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 1119 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1097 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) 1120 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1098 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 1121 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1099 && { echo i486-ncr-sysv4; exit; } ;; 1122 && { echo i486-ncr-sysv4; exit; } ;;
1100 NCR*:*:4.2:* | MPRAS*:*:4.2:*) 1123 NCR*:*:4.2:* | MPRAS*:*:4.2:*)
1101 OS_REL='.3' 1124 OS_REL='.3'
1102 test -r /etc/.relid \ 1125 test -r /etc/.relid \
@@ -1139,10 +1162,10 @@ EOF
1139 echo ns32k-sni-sysv 1162 echo ns32k-sni-sysv
1140 fi 1163 fi
1141 exit ;; 1164 exit ;;
1142 PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort 1165 PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1143 # says <Richard.M.Bartel@ccMail.Census.GOV> 1166 # says <Richard.M.Bartel@ccMail.Census.GOV>
1144 echo i586-unisys-sysv4 1167 echo i586-unisys-sysv4
1145 exit ;; 1168 exit ;;
1146 *:UNIX_System_V:4*:FTX*) 1169 *:UNIX_System_V:4*:FTX*)
1147 # From Gerald Hewes <hewes@openmarket.com>. 1170 # From Gerald Hewes <hewes@openmarket.com>.
1148 # How about differentiating between stratus architectures? -djm 1171 # How about differentiating between stratus architectures? -djm
@@ -1168,11 +1191,11 @@ EOF
1168 exit ;; 1191 exit ;;
1169 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) 1192 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1170 if [ -d /usr/nec ]; then 1193 if [ -d /usr/nec ]; then
1171 echo mips-nec-sysv${UNAME_RELEASE} 1194 echo mips-nec-sysv${UNAME_RELEASE}
1172 else 1195 else
1173 echo mips-unknown-sysv${UNAME_RELEASE} 1196 echo mips-unknown-sysv${UNAME_RELEASE}
1174 fi 1197 fi
1175 exit ;; 1198 exit ;;
1176 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. 1199 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
1177 echo powerpc-be-beos 1200 echo powerpc-be-beos
1178 exit ;; 1201 exit ;;
@@ -1185,6 +1208,9 @@ EOF
1185 BePC:Haiku:*:*) # Haiku running on Intel PC compatible. 1208 BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
1186 echo i586-pc-haiku 1209 echo i586-pc-haiku
1187 exit ;; 1210 exit ;;
1211 x86_64:Haiku:*:*)
1212 echo x86_64-unknown-haiku
1213 exit ;;
1188 SX-4:SUPER-UX:*:*) 1214 SX-4:SUPER-UX:*:*)
1189 echo sx4-nec-superux${UNAME_RELEASE} 1215 echo sx4-nec-superux${UNAME_RELEASE}
1190 exit ;; 1216 exit ;;
@@ -1240,7 +1266,7 @@ EOF
1240 NEO-?:NONSTOP_KERNEL:*:*) 1266 NEO-?:NONSTOP_KERNEL:*:*)
1241 echo neo-tandem-nsk${UNAME_RELEASE} 1267 echo neo-tandem-nsk${UNAME_RELEASE}
1242 exit ;; 1268 exit ;;
1243 NSE-?:NONSTOP_KERNEL:*:*) 1269 NSE-*:NONSTOP_KERNEL:*:*)
1244 echo nse-tandem-nsk${UNAME_RELEASE} 1270 echo nse-tandem-nsk${UNAME_RELEASE}
1245 exit ;; 1271 exit ;;
1246 NSR-?:NONSTOP_KERNEL:*:*) 1272 NSR-?:NONSTOP_KERNEL:*:*)
@@ -1285,13 +1311,13 @@ EOF
1285 echo pdp10-unknown-its 1311 echo pdp10-unknown-its
1286 exit ;; 1312 exit ;;
1287 SEI:*:*:SEIUX) 1313 SEI:*:*:SEIUX)
1288 echo mips-sei-seiux${UNAME_RELEASE} 1314 echo mips-sei-seiux${UNAME_RELEASE}
1289 exit ;; 1315 exit ;;
1290 *:DragonFly:*:*) 1316 *:DragonFly:*:*)
1291 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` 1317 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1292 exit ;; 1318 exit ;;
1293 *:*VMS:*:*) 1319 *:*VMS:*:*)
1294 UNAME_MACHINE=`(uname -p) 2>/dev/null` 1320 UNAME_MACHINE=`(uname -p) 2>/dev/null`
1295 case "${UNAME_MACHINE}" in 1321 case "${UNAME_MACHINE}" in
1296 A*) echo alpha-dec-vms ; exit ;; 1322 A*) echo alpha-dec-vms ; exit ;;
1297 I*) echo ia64-dec-vms ; exit ;; 1323 I*) echo ia64-dec-vms ; exit ;;
@@ -1309,11 +1335,11 @@ EOF
1309 i*86:AROS:*:*) 1335 i*86:AROS:*:*)
1310 echo ${UNAME_MACHINE}-pc-aros 1336 echo ${UNAME_MACHINE}-pc-aros
1311 exit ;; 1337 exit ;;
1338 x86_64:VMkernel:*:*)
1339 echo ${UNAME_MACHINE}-unknown-esx
1340 exit ;;
1312esac 1341esac
1313 1342
1314#echo '(No uname command or uname output not recognized.)' 1>&2
1315#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
1316
1317eval $set_cc_for_build 1343eval $set_cc_for_build
1318cat >$dummy.c <<EOF 1344cat >$dummy.c <<EOF
1319#ifdef _SEQUENT_ 1345#ifdef _SEQUENT_
@@ -1331,11 +1357,11 @@ main ()
1331#include <sys/param.h> 1357#include <sys/param.h>
1332 printf ("m68k-sony-newsos%s\n", 1358 printf ("m68k-sony-newsos%s\n",
1333#ifdef NEWSOS4 1359#ifdef NEWSOS4
1334 "4" 1360 "4"
1335#else 1361#else
1336 "" 1362 ""
1337#endif 1363#endif
1338 ); exit (0); 1364 ); exit (0);
1339#endif 1365#endif
1340#endif 1366#endif
1341 1367
diff --git a/config.sub b/config.sub
index 2d8169626..eee8dccb0 100755
--- a/config.sub
+++ b/config.sub
@@ -2,9 +2,9 @@
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, 2009, 2010, 4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5# 2011 Free Software Foundation, Inc. 5# 2011, 2012, 2013 Free Software Foundation, Inc.
6 6
7timestamp='2011-01-01' 7timestamp='2012-12-23'
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
@@ -21,9 +21,7 @@ timestamp='2011-01-01'
21# GNU General Public License for more details. 21# GNU General Public License for more details.
22# 22#
23# You should have received a copy of the GNU General Public License 23# You should have received a copy of the GNU General Public License
24# along with this program; if not, write to the Free Software 24# along with this program; if not, see <http://www.gnu.org/licenses/>.
25# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
26# 02110-1301, USA.
27# 25#
28# As a special exception to the GNU General Public License, if you 26# As a special exception to the GNU General Public License, if you
29# distribute this file as part of a program that contains a 27# distribute this file as part of a program that contains a
@@ -76,8 +74,8 @@ version="\
76GNU config.sub ($timestamp) 74GNU config.sub ($timestamp)
77 75
78Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 76Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
792001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free 772001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
80Software Foundation, Inc. 782012, 2013 Free Software Foundation, Inc.
81 79
82This is free software; see the source for copying conditions. There is NO 80This is free software; see the source for copying conditions. There is NO
83warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 81warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -125,13 +123,17 @@ esac
125maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` 123maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
126case $maybe_os in 124case $maybe_os in
127 nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ 125 nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
128 linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ 126 linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
129 knetbsd*-gnu* | netbsd*-gnu* | \ 127 knetbsd*-gnu* | netbsd*-gnu* | \
130 kopensolaris*-gnu* | \ 128 kopensolaris*-gnu* | \
131 storm-chaos* | os2-emx* | rtmk-nova*) 129 storm-chaos* | os2-emx* | rtmk-nova*)
132 os=-$maybe_os 130 os=-$maybe_os
133 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` 131 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
134 ;; 132 ;;
133 android-linux)
134 os=-linux-android
135 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
136 ;;
135 *) 137 *)
136 basic_machine=`echo $1 | sed 's/-[^-]*$//'` 138 basic_machine=`echo $1 | sed 's/-[^-]*$//'`
137 if [ $basic_machine != $1 ] 139 if [ $basic_machine != $1 ]
@@ -154,12 +156,12 @@ case $os in
154 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ 156 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
155 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ 157 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
156 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ 158 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
157 -apple | -axis | -knuth | -cray | -microblaze) 159 -apple | -axis | -knuth | -cray | -microblaze*)
158 os= 160 os=
159 basic_machine=$1 161 basic_machine=$1
160 ;; 162 ;;
161 -bluegene*) 163 -bluegene*)
162 os=-cnk 164 os=-cnk
163 ;; 165 ;;
164 -sim | -cisco | -oki | -wec | -winbond) 166 -sim | -cisco | -oki | -wec | -winbond)
165 os= 167 os=
@@ -175,10 +177,10 @@ case $os in
175 os=-chorusos 177 os=-chorusos
176 basic_machine=$1 178 basic_machine=$1
177 ;; 179 ;;
178 -chorusrdb) 180 -chorusrdb)
179 os=-chorusrdb 181 os=-chorusrdb
180 basic_machine=$1 182 basic_machine=$1
181 ;; 183 ;;
182 -hiux*) 184 -hiux*)
183 os=-hiuxwe2 185 os=-hiuxwe2
184 ;; 186 ;;
@@ -223,6 +225,12 @@ case $os in
223 -isc*) 225 -isc*)
224 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 226 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
225 ;; 227 ;;
228 -lynx*178)
229 os=-lynxos178
230 ;;
231 -lynx*5)
232 os=-lynxos5
233 ;;
226 -lynx*) 234 -lynx*)
227 os=-lynxos 235 os=-lynxos
228 ;; 236 ;;
@@ -247,20 +255,27 @@ case $basic_machine in
247 # Some are omitted here because they have special meanings below. 255 # Some are omitted here because they have special meanings below.
248 1750a | 580 \ 256 1750a | 580 \
249 | a29k \ 257 | a29k \
258 | aarch64 | aarch64_be \
250 | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ 259 | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
251 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ 260 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
252 | am33_2.0 \ 261 | am33_2.0 \
253 | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ 262 | arc \
263 | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
264 | avr | avr32 \
265 | be32 | be64 \
254 | bfin \ 266 | bfin \
255 | c4x | clipper \ 267 | c4x | clipper \
256 | d10v | d30v | dlx | dsp16xx \ 268 | d10v | d30v | dlx | dsp16xx \
269 | epiphany \
257 | fido | fr30 | frv \ 270 | fido | fr30 | frv \
258 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ 271 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
272 | hexagon \
259 | i370 | i860 | i960 | ia64 \ 273 | i370 | i860 | i960 | ia64 \
260 | ip2k | iq2000 \ 274 | ip2k | iq2000 \
275 | le32 | le64 \
261 | lm32 \ 276 | lm32 \
262 | m32c | m32r | m32rle | m68000 | m68k | m88k \ 277 | m32c | m32r | m32rle | m68000 | m68k | m88k \
263 | maxq | mb | microblaze | mcore | mep | metag \ 278 | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
264 | mips | mipsbe | mipseb | mipsel | mipsle \ 279 | mips | mipsbe | mipseb | mipsel | mipsle \
265 | mips16 \ 280 | mips16 \
266 | mips64 | mips64el \ 281 | mips64 | mips64el \
@@ -286,22 +301,23 @@ case $basic_machine in
286 | nds32 | nds32le | nds32be \ 301 | nds32 | nds32le | nds32be \
287 | nios | nios2 \ 302 | nios | nios2 \
288 | ns16k | ns32k \ 303 | ns16k | ns32k \
304 | open8 \
289 | or32 \ 305 | or32 \
290 | pdp10 | pdp11 | pj | pjl \ 306 | pdp10 | pdp11 | pj | pjl \
291 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ 307 | powerpc | powerpc64 | powerpc64le | powerpcle \
292 | pyramid \ 308 | pyramid \
293 | rx \ 309 | rl78 | rx \
294 | score \ 310 | score \
295 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ 311 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
296 | sh64 | sh64le \ 312 | sh64 | sh64le \
297 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ 313 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
298 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ 314 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
299 | spu | strongarm \ 315 | spu \
300 | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ 316 | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
301 | ubicom32 \ 317 | ubicom32 \
302 | v850 | v850e \ 318 | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
303 | we32k \ 319 | we32k \
304 | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ 320 | x86 | xc16x | xstormy16 | xtensa \
305 | z8k | z80) 321 | z8k | z80)
306 basic_machine=$basic_machine-unknown 322 basic_machine=$basic_machine-unknown
307 ;; 323 ;;
@@ -314,8 +330,7 @@ case $basic_machine in
314 c6x) 330 c6x)
315 basic_machine=tic6x-unknown 331 basic_machine=tic6x-unknown
316 ;; 332 ;;
317 m6811 | m68hc11 | m6812 | m68hc12 | picochip) 333 m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
318 # Motorola 68HC11/12.
319 basic_machine=$basic_machine-unknown 334 basic_machine=$basic_machine-unknown
320 os=-none 335 os=-none
321 ;; 336 ;;
@@ -325,6 +340,21 @@ case $basic_machine in
325 basic_machine=mt-unknown 340 basic_machine=mt-unknown
326 ;; 341 ;;
327 342
343 strongarm | thumb | xscale)
344 basic_machine=arm-unknown
345 ;;
346 xgate)
347 basic_machine=$basic_machine-unknown
348 os=-none
349 ;;
350 xscaleeb)
351 basic_machine=armeb-unknown
352 ;;
353
354 xscaleel)
355 basic_machine=armel-unknown
356 ;;
357
328 # We use `pc' rather than `unknown' 358 # We use `pc' rather than `unknown'
329 # because (1) that's what they normally are, and 359 # because (1) that's what they normally are, and
330 # (2) the word "unknown" tends to confuse beginning users. 360 # (2) the word "unknown" tends to confuse beginning users.
@@ -339,11 +369,13 @@ case $basic_machine in
339 # Recognize the basic CPU types with company name. 369 # Recognize the basic CPU types with company name.
340 580-* \ 370 580-* \
341 | a29k-* \ 371 | a29k-* \
372 | aarch64-* | aarch64_be-* \
342 | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ 373 | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
343 | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ 374 | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
344 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ 375 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
345 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ 376 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
346 | avr-* | avr32-* \ 377 | avr-* | avr32-* \
378 | be32-* | be64-* \
347 | bfin-* | bs2000-* \ 379 | bfin-* | bs2000-* \
348 | c[123]* | c30-* | [cjt]90-* | c4x-* \ 380 | c[123]* | c30-* | [cjt]90-* | c4x-* \
349 | clipper-* | craynv-* | cydra-* \ 381 | clipper-* | craynv-* | cydra-* \
@@ -352,12 +384,15 @@ case $basic_machine in
352 | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ 384 | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
353 | h8300-* | h8500-* \ 385 | h8300-* | h8500-* \
354 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ 386 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
387 | hexagon-* \
355 | i*86-* | i860-* | i960-* | ia64-* \ 388 | i*86-* | i860-* | i960-* | ia64-* \
356 | ip2k-* | iq2000-* \ 389 | ip2k-* | iq2000-* \
390 | le32-* | le64-* \
357 | lm32-* \ 391 | lm32-* \
358 | m32c-* | m32r-* | m32rle-* \ 392 | m32c-* | m32r-* | m32rle-* \
359 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ 393 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
360 | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ 394 | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
395 | microblaze-* | microblazeel-* \
361 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ 396 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
362 | mips16-* \ 397 | mips16-* \
363 | mips64-* | mips64el-* \ 398 | mips64-* | mips64el-* \
@@ -382,24 +417,26 @@ case $basic_machine in
382 | nds32-* | nds32le-* | nds32be-* \ 417 | nds32-* | nds32le-* | nds32be-* \
383 | nios-* | nios2-* \ 418 | nios-* | nios2-* \
384 | none-* | np1-* | ns16k-* | ns32k-* \ 419 | none-* | np1-* | ns16k-* | ns32k-* \
420 | open8-* \
385 | orion-* \ 421 | orion-* \
386 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ 422 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
387 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ 423 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
388 | pyramid-* \ 424 | pyramid-* \
389 | romp-* | rs6000-* | rx-* \ 425 | rl78-* | romp-* | rs6000-* | rx-* \
390 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ 426 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
391 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ 427 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
392 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ 428 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
393 | sparclite-* \ 429 | sparclite-* \
394 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ 430 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
395 | tahoe-* | thumb-* \ 431 | tahoe-* \
396 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ 432 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
397 | tile-* | tilegx-* \ 433 | tile*-* \
398 | tron-* \ 434 | tron-* \
399 | ubicom32-* \ 435 | ubicom32-* \
400 | v850-* | v850e-* | vax-* \ 436 | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
437 | vax-* \
401 | we32k-* \ 438 | we32k-* \
402 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ 439 | x86-* | x86_64-* | xc16x-* | xps100-* \
403 | xstormy16-* | xtensa*-* \ 440 | xstormy16-* | xtensa*-* \
404 | ymp-* \ 441 | ymp-* \
405 | z8k-* | z80-*) 442 | z8k-* | z80-*)
@@ -424,7 +461,7 @@ case $basic_machine in
424 basic_machine=a29k-amd 461 basic_machine=a29k-amd
425 os=-udi 462 os=-udi
426 ;; 463 ;;
427 abacus) 464 abacus)
428 basic_machine=abacus-unknown 465 basic_machine=abacus-unknown
429 ;; 466 ;;
430 adobe68k) 467 adobe68k)
@@ -507,7 +544,7 @@ case $basic_machine in
507 basic_machine=c90-cray 544 basic_machine=c90-cray
508 os=-unicos 545 os=-unicos
509 ;; 546 ;;
510 cegcc) 547 cegcc)
511 basic_machine=arm-unknown 548 basic_machine=arm-unknown
512 os=-cegcc 549 os=-cegcc
513 ;; 550 ;;
@@ -697,7 +734,6 @@ case $basic_machine in
697 i370-ibm* | ibm*) 734 i370-ibm* | ibm*)
698 basic_machine=i370-ibm 735 basic_machine=i370-ibm
699 ;; 736 ;;
700# I'm not sure what "Sysv32" means. Should this be sysv3.2?
701 i*86v32) 737 i*86v32)
702 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` 738 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
703 os=-sysv32 739 os=-sysv32
@@ -755,9 +791,13 @@ case $basic_machine in
755 basic_machine=ns32k-utek 791 basic_machine=ns32k-utek
756 os=-sysv 792 os=-sysv
757 ;; 793 ;;
758 microblaze) 794 microblaze*)
759 basic_machine=microblaze-xilinx 795 basic_machine=microblaze-xilinx
760 ;; 796 ;;
797 mingw64)
798 basic_machine=x86_64-pc
799 os=-mingw64
800 ;;
761 mingw32) 801 mingw32)
762 basic_machine=i386-pc 802 basic_machine=i386-pc
763 os=-mingw32 803 os=-mingw32
@@ -794,10 +834,18 @@ case $basic_machine in
794 ms1-*) 834 ms1-*)
795 basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` 835 basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
796 ;; 836 ;;
837 msys)
838 basic_machine=i386-pc
839 os=-msys
840 ;;
797 mvs) 841 mvs)
798 basic_machine=i370-ibm 842 basic_machine=i370-ibm
799 os=-mvs 843 os=-mvs
800 ;; 844 ;;
845 nacl)
846 basic_machine=le32-unknown
847 os=-nacl
848 ;;
801 ncr3000) 849 ncr3000)
802 basic_machine=i486-ncr 850 basic_machine=i486-ncr
803 os=-sysv4 851 os=-sysv4
@@ -862,10 +910,10 @@ case $basic_machine in
862 np1) 910 np1)
863 basic_machine=np1-gould 911 basic_machine=np1-gould
864 ;; 912 ;;
865 neo-tandem) 913 neo-tandem)
866 basic_machine=neo-tandem 914 basic_machine=neo-tandem
867 ;; 915 ;;
868 nse-tandem) 916 nse-tandem)
869 basic_machine=nse-tandem 917 basic_machine=nse-tandem
870 ;; 918 ;;
871 nsr-tandem) 919 nsr-tandem)
@@ -950,9 +998,10 @@ case $basic_machine in
950 ;; 998 ;;
951 power) basic_machine=power-ibm 999 power) basic_machine=power-ibm
952 ;; 1000 ;;
953 ppc) basic_machine=powerpc-unknown 1001 ppc | ppcbe) basic_machine=powerpc-unknown
954 ;; 1002 ;;
955 ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` 1003 ppc-* | ppcbe-*)
1004 basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
956 ;; 1005 ;;
957 ppcle | powerpclittle | ppc-le | powerpc-little) 1006 ppcle | powerpclittle | ppc-le | powerpc-little)
958 basic_machine=powerpcle-unknown 1007 basic_machine=powerpcle-unknown
@@ -977,7 +1026,11 @@ case $basic_machine in
977 basic_machine=i586-unknown 1026 basic_machine=i586-unknown
978 os=-pw32 1027 os=-pw32
979 ;; 1028 ;;
980 rdos) 1029 rdos | rdos64)
1030 basic_machine=x86_64-pc
1031 os=-rdos
1032 ;;
1033 rdos32)
981 basic_machine=i386-pc 1034 basic_machine=i386-pc
982 os=-rdos 1035 os=-rdos
983 ;; 1036 ;;
@@ -1046,6 +1099,9 @@ case $basic_machine in
1046 basic_machine=i860-stratus 1099 basic_machine=i860-stratus
1047 os=-sysv4 1100 os=-sysv4
1048 ;; 1101 ;;
1102 strongarm-* | thumb-*)
1103 basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
1104 ;;
1049 sun2) 1105 sun2)
1050 basic_machine=m68000-sun 1106 basic_machine=m68000-sun
1051 ;; 1107 ;;
@@ -1102,13 +1158,8 @@ case $basic_machine in
1102 basic_machine=t90-cray 1158 basic_machine=t90-cray
1103 os=-unicos 1159 os=-unicos
1104 ;; 1160 ;;
1105 # This must be matched before tile*.
1106 tilegx*)
1107 basic_machine=tilegx-unknown
1108 os=-linux-gnu
1109 ;;
1110 tile*) 1161 tile*)
1111 basic_machine=tile-unknown 1162 basic_machine=$basic_machine-unknown
1112 os=-linux-gnu 1163 os=-linux-gnu
1113 ;; 1164 ;;
1114 tx39) 1165 tx39)
@@ -1178,6 +1229,9 @@ case $basic_machine in
1178 xps | xps100) 1229 xps | xps100)
1179 basic_machine=xps100-honeywell 1230 basic_machine=xps100-honeywell
1180 ;; 1231 ;;
1232 xscale-* | xscalee[bl]-*)
1233 basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
1234 ;;
1181 ymp) 1235 ymp)
1182 basic_machine=ymp-cray 1236 basic_machine=ymp-cray
1183 os=-unicos 1237 os=-unicos
@@ -1275,11 +1329,11 @@ esac
1275if [ x"$os" != x"" ] 1329if [ x"$os" != x"" ]
1276then 1330then
1277case $os in 1331case $os in
1278 # First match some system type aliases 1332 # First match some system type aliases
1279 # that might get confused with valid system types. 1333 # that might get confused with valid system types.
1280 # -solaris* is a basic system type, with this one exception. 1334 # -solaris* is a basic system type, with this one exception.
1281 -auroraux) 1335 -auroraux)
1282 os=-auroraux 1336 os=-auroraux
1283 ;; 1337 ;;
1284 -solaris1 | -solaris1.*) 1338 -solaris1 | -solaris1.*)
1285 os=`echo $os | sed -e 's|solaris1|sunos4|'` 1339 os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1309,15 +1363,15 @@ case $os in
1309 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ 1363 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1310 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ 1364 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1311 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ 1365 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1312 | -openbsd* | -solidbsd* \ 1366 | -bitrig* | -openbsd* | -solidbsd* \
1313 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ 1367 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1314 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ 1368 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1315 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ 1369 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1316 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ 1370 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1317 | -chorusos* | -chorusrdb* | -cegcc* \ 1371 | -chorusos* | -chorusrdb* | -cegcc* \
1318 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ 1372 | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1319 | -mingw32* | -linux-gnu* | -linux-android* \ 1373 | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
1320 | -linux-newlib* | -linux-uclibc* \ 1374 | -linux-newlib* | -linux-musl* | -linux-uclibc* \
1321 | -uxpv* | -beos* | -mpeix* | -udk* \ 1375 | -uxpv* | -beos* | -mpeix* | -udk* \
1322 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ 1376 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1323 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ 1377 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1364,7 +1418,7 @@ case $os in
1364 -opened*) 1418 -opened*)
1365 os=-openedition 1419 os=-openedition
1366 ;; 1420 ;;
1367 -os400*) 1421 -os400*)
1368 os=-os400 1422 os=-os400
1369 ;; 1423 ;;
1370 -wince*) 1424 -wince*)
@@ -1413,7 +1467,7 @@ case $os in
1413 -sinix*) 1467 -sinix*)
1414 os=-sysv4 1468 os=-sysv4
1415 ;; 1469 ;;
1416 -tpf*) 1470 -tpf*)
1417 os=-tpf 1471 os=-tpf
1418 ;; 1472 ;;
1419 -triton*) 1473 -triton*)
@@ -1458,8 +1512,8 @@ case $os in
1458 -dicos*) 1512 -dicos*)
1459 os=-dicos 1513 os=-dicos
1460 ;; 1514 ;;
1461 -nacl*) 1515 -nacl*)
1462 ;; 1516 ;;
1463 -none) 1517 -none)
1464 ;; 1518 ;;
1465 *) 1519 *)
@@ -1482,10 +1536,10 @@ else
1482# system, and we'll never get to this point. 1536# system, and we'll never get to this point.
1483 1537
1484case $basic_machine in 1538case $basic_machine in
1485 score-*) 1539 score-*)
1486 os=-elf 1540 os=-elf
1487 ;; 1541 ;;
1488 spu-*) 1542 spu-*)
1489 os=-elf 1543 os=-elf
1490 ;; 1544 ;;
1491 *-acorn) 1545 *-acorn)
@@ -1497,8 +1551,11 @@ case $basic_machine in
1497 arm*-semi) 1551 arm*-semi)
1498 os=-aout 1552 os=-aout
1499 ;; 1553 ;;
1500 c4x-* | tic4x-*) 1554 c4x-* | tic4x-*)
1501 os=-coff 1555 os=-coff
1556 ;;
1557 hexagon-*)
1558 os=-elf
1502 ;; 1559 ;;
1503 tic54x-*) 1560 tic54x-*)
1504 os=-coff 1561 os=-coff
@@ -1527,14 +1584,11 @@ case $basic_machine in
1527 ;; 1584 ;;
1528 m68000-sun) 1585 m68000-sun)
1529 os=-sunos3 1586 os=-sunos3
1530 # This also exists in the configure program, but was not the
1531 # default.
1532 # os=-sunos4
1533 ;; 1587 ;;
1534 m68*-cisco) 1588 m68*-cisco)
1535 os=-aout 1589 os=-aout
1536 ;; 1590 ;;
1537 mep-*) 1591 mep-*)
1538 os=-elf 1592 os=-elf
1539 ;; 1593 ;;
1540 mips*-cisco) 1594 mips*-cisco)
@@ -1561,7 +1615,7 @@ case $basic_machine in
1561 *-ibm) 1615 *-ibm)
1562 os=-aix 1616 os=-aix
1563 ;; 1617 ;;
1564 *-knuth) 1618 *-knuth)
1565 os=-mmixware 1619 os=-mmixware
1566 ;; 1620 ;;
1567 *-wec) 1621 *-wec)