Check-in [11f339bd59]
Overview
SHA1:11f339bd5950a97ab97abb7684a68308622587bb
Date: 2012-05-13 18:50:08
User: rkeene
Comment:Updated to latest config.guess/config.sub from autoconf
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2012-05-13
18:50
[aa00b0ada2] Updated to use standard cross-compile script for Linux/MIPS target

Updated to include "mips" support in fake uname

Updated to not use fake uname for "mips" (user: rkeene, tags: trunk)

18:50
[11f339bd59] Updated to latest config.guess/config.sub from autoconf (user: rkeene, tags: trunk)
01:56
[a1316c25a9] Renamed Linux/mipsel build script for consistency (user: rkeene, tags: trunk)
Changes

Modified kitsh/buildsrc/kitsh-0.0/config.guess from [62de42768f] to [94cc57e2a3].

     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, 2010
     5         -#   Free Software Foundation, Inc.
            4  +#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
            5  +#   2011, 2012 Free Software Foundation, Inc.
     6      6   
     7         -timestamp='2010-08-21'
            7  +timestamp='2012-02-10'
     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
    11     11   # the Free Software Foundation; either version 2 of the License, or
    12     12   # (at your option) any later version.
    13     13   #
    14     14   # This program is distributed in the hope that it will be useful, but
    15     15   # WITHOUT ANY WARRANTY; without even the implied warranty of
    16     16   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    17     17   # General Public License for more details.
    18     18   #
    19     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
    21         -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    22         -# 02110-1301, USA.
           20  +# along with this program; if not, see <http://www.gnu.org/licenses/>.
    23     21   #
    24     22   # As a special exception to the GNU General Public License, if you
    25     23   # distribute this file as part of a program that contains a
    26     24   # configuration script generated by Autoconf, you may include it under
    27     25   # the same distribution terms that you use for the rest of that program.
    28     26   
    29     27   
................................................................................
    53     51   Report bugs and patches to <config-patches@gnu.org>."
    54     52   
    55     53   version="\
    56     54   GNU config.guess ($timestamp)
    57     55   
    58     56   Originally written by Per Bothner.
    59     57   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
    60         -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
    61         -Software Foundation, Inc.
           58  +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
           59  +Free Software Foundation, Inc.
    62     60   
    63     61   This is free software; see the source for copying conditions.  There is NO
    64     62   warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
    65     63   
    66     64   help="
    67     65   Try \`$me --help' for more information."
    68     66   
................................................................................
    88     86   done
    89     87   
    90     88   if test $# != 0; then
    91     89     echo "$me: too many arguments$help" >&2
    92     90     exit 1
    93     91   fi
    94     92   
    95         -trap 'exit 1' HUP INT TERM
           93  +trap 'exit 1' 1 2 15
    96     94   
    97     95   # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
    98     96   # compiler to aid in system detection is discouraged as it requires
    99     97   # temporary files to be created and, as you can see below, it is a
   100     98   # headache to deal with in a portable fashion.
   101     99   
   102    100   # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
   103    101   # use `HOST_CC' if defined, but it is deprecated.
   104    102   
   105    103   # Portable tmp directory creation inspired by the Autoconf team.
   106    104   
   107    105   set_cc_for_build='
   108    106   trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
   109         -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
          107  +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
   110    108   : ${TMPDIR=/tmp} ;
   111    109    { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
   112    110    { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
   113    111    { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
   114    112    { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
   115    113   dummy=$tmp/dummy ;
   116    114   tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
................................................................................
   141    139   UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
   142    140   
   143    141   # Note: order is significant - the case branches are not exclusive.
   144    142   
   145    143   case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
   146    144       *:NetBSD:*:*)
   147    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    147   	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
   150    148   	# switched to ELF, *-*-netbsd* would select the old
   151    149   	# object file format.  This provides both forward
   152    150   	# compatibility and a consistent mechanism for selecting the
   153    151   	# object file format.
   154    152   	#
   155    153   	# Note: NetBSD doesn't particularly care about the vendor
................................................................................
   177    175   		    # Return netbsd for either.  FIX?
   178    176   		    os=netbsd
   179    177   		else
   180    178   		    os=netbsdelf
   181    179   		fi
   182    180   		;;
   183    181   	    *)
   184         -	        os=netbsd
          182  +		os=netbsd
   185    183   		;;
   186    184   	esac
   187    185   	# The OS release
   188    186   	# Debian GNU/NetBSD machines have a different userland, and
   189    187   	# thus, need a distinct triplet. However, they do not need
   190    188   	# kernel version information, so it can be replaced with a
   191    189   	# suitable tag, in the style of linux-gnu.
................................................................................
   220    218   	exit ;;
   221    219       alpha:OSF1:*:*)
   222    220   	case $UNAME_RELEASE in
   223    221   	*4.0)
   224    222   		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
   225    223   		;;
   226    224   	*5.*)
   227         -	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
          225  +		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
   228    226   		;;
   229    227   	esac
   230    228   	# According to Compaq, /usr/sbin/psrinfo has been available on
   231    229   	# OSF/1 and Tru64 systems produced since 1995.  I hope that
   232    230   	# covers most systems running today.  This code pipes the CPU
   233    231   	# types through head -n 1, so we only detect the type of CPU 0.
   234    232   	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
................................................................................
   266    264   	esac
   267    265   	# A Pn.n version is a patched version.
   268    266   	# A Vn.n version is a released version.
   269    267   	# A Tn.n version is a released field test version.
   270    268   	# A Xn.n version is an unreleased experimental baselevel.
   271    269   	# 1.2 uses "1.2" for uname -r.
   272    270   	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
   273         -	exit ;;
          271  +	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
          272  +	exitcode=$?
          273  +	trap '' 0
          274  +	exit $exitcode ;;
   274    275       Alpha\ *:Windows_NT*:*)
   275    276   	# How do we know it's Interix rather than the generic POSIX subsystem?
   276    277   	# Should we change UNAME_MACHINE based on the output of uname instead
   277    278   	# of the specific Alpha model?
   278    279   	echo alpha-pc-interix
   279    280   	exit ;;
   280    281       21064:Windows_NT:50:3)
................................................................................
   292    293       *:OS/390:*:*)
   293    294   	echo i370-ibm-openedition
   294    295   	exit ;;
   295    296       *:z/VM:*:*)
   296    297   	echo s390-ibm-zvmoe
   297    298   	exit ;;
   298    299       *:OS400:*:*)
   299         -        echo powerpc-ibm-os400
          300  +	echo powerpc-ibm-os400
   300    301   	exit ;;
   301    302       arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
   302    303   	echo arm-acorn-riscix${UNAME_RELEASE}
   303    304   	exit ;;
   304    305       arm:riscos:*:*|arm:RISCOS:*:*)
   305    306   	echo arm-unknown-riscos
   306    307   	exit ;;
................................................................................
   391    392       # "atarist" or "atariste" at least should have a processor
   392    393       # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
   393    394       # to the lowercase version "mint" (or "freemint").  Finally
   394    395       # the system name "TOS" denotes a system which is actually not
   395    396       # MiNT.  But MiNT is downward compatible to TOS, so this should
   396    397       # be no problem.
   397    398       atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
   398         -        echo m68k-atari-mint${UNAME_RELEASE}
          399  +	echo m68k-atari-mint${UNAME_RELEASE}
   399    400   	exit ;;
   400    401       atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
   401    402   	echo m68k-atari-mint${UNAME_RELEASE}
   402         -        exit ;;
          403  +	exit ;;
   403    404       *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
   404         -        echo m68k-atari-mint${UNAME_RELEASE}
          405  +	echo m68k-atari-mint${UNAME_RELEASE}
   405    406   	exit ;;
   406    407       milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
   407         -        echo m68k-milan-mint${UNAME_RELEASE}
   408         -        exit ;;
          408  +	echo m68k-milan-mint${UNAME_RELEASE}
          409  +	exit ;;
   409    410       hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
   410         -        echo m68k-hades-mint${UNAME_RELEASE}
   411         -        exit ;;
          411  +	echo m68k-hades-mint${UNAME_RELEASE}
          412  +	exit ;;
   412    413       *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
   413         -        echo m68k-unknown-mint${UNAME_RELEASE}
   414         -        exit ;;
          414  +	echo m68k-unknown-mint${UNAME_RELEASE}
          415  +	exit ;;
   415    416       m68k:machten:*:*)
   416    417   	echo m68k-apple-machten${UNAME_RELEASE}
   417    418   	exit ;;
   418    419       powerpc:machten:*:*)
   419    420   	echo powerpc-apple-machten${UNAME_RELEASE}
   420    421   	exit ;;
   421    422       RISC*:Mach:*:*)
................................................................................
   477    478       m88k:*:4*:R4*)
   478    479   	echo m88k-motorola-sysv4
   479    480   	exit ;;
   480    481       m88k:*:3*:R3*)
   481    482   	echo m88k-motorola-sysv3
   482    483   	exit ;;
   483    484       AViiON:dgux:*:*)
   484         -        # DG/UX returns AViiON for all architectures
   485         -        UNAME_PROCESSOR=`/usr/bin/uname -p`
          485  +	# DG/UX returns AViiON for all architectures
          486  +	UNAME_PROCESSOR=`/usr/bin/uname -p`
   486    487   	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
   487    488   	then
   488    489   	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
   489    490   	       [ ${TARGET_BINARY_INTERFACE}x = x ]
   490    491   	    then
   491    492   		echo m88k-dg-dgux${UNAME_RELEASE}
   492    493   	    else
   493    494   		echo m88k-dg-dguxbcs${UNAME_RELEASE}
   494    495   	    fi
   495    496   	else
   496    497   	    echo i586-dg-dgux${UNAME_RELEASE}
   497    498   	fi
   498         - 	exit ;;
          499  +	exit ;;
   499    500       M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
   500    501   	echo m88k-dolphin-sysv3
   501    502   	exit ;;
   502    503       M88*:*:R3*:*)
   503    504   	# Delta 88k system running SVR3
   504    505   	echo m88k-motorola-sysv3
   505    506   	exit ;;
................................................................................
   591    592   	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
   592    593   	case "${UNAME_MACHINE}" in
   593    594   	    9000/31? )            HP_ARCH=m68000 ;;
   594    595   	    9000/[34]?? )         HP_ARCH=m68k ;;
   595    596   	    9000/[678][0-9][0-9])
   596    597   		if [ -x /usr/bin/getconf ]; then
   597    598   		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
   598         -                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
   599         -                    case "${sc_cpu_version}" in
   600         -                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
   601         -                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
   602         -                      532)                      # CPU_PA_RISC2_0
   603         -                        case "${sc_kernel_bits}" in
   604         -                          32) HP_ARCH="hppa2.0n" ;;
   605         -                          64) HP_ARCH="hppa2.0w" ;;
          599  +		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
          600  +		    case "${sc_cpu_version}" in
          601  +		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
          602  +		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
          603  +		      532)                      # CPU_PA_RISC2_0
          604  +			case "${sc_kernel_bits}" in
          605  +			  32) HP_ARCH="hppa2.0n" ;;
          606  +			  64) HP_ARCH="hppa2.0w" ;;
   606    607   			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
   607         -                        esac ;;
   608         -                    esac
          608  +			esac ;;
          609  +		    esac
   609    610   		fi
   610    611   		if [ "${HP_ARCH}" = "" ]; then
   611    612   		    eval $set_cc_for_build
   612         -		    sed 's/^              //' << EOF >$dummy.c
   613         -
   614         -              #define _HPUX_SOURCE
   615         -              #include <stdlib.h>
   616         -              #include <unistd.h>
   617         -
   618         -              int main ()
   619         -              {
   620         -              #if defined(_SC_KERNEL_BITS)
   621         -                  long bits = sysconf(_SC_KERNEL_BITS);
   622         -              #endif
   623         -                  long cpu  = sysconf (_SC_CPU_VERSION);
   624         -
   625         -                  switch (cpu)
   626         -              	{
   627         -              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
   628         -              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
   629         -              	case CPU_PA_RISC2_0:
   630         -              #if defined(_SC_KERNEL_BITS)
   631         -              	    switch (bits)
   632         -              		{
   633         -              		case 64: puts ("hppa2.0w"); break;
   634         -              		case 32: puts ("hppa2.0n"); break;
   635         -              		default: puts ("hppa2.0"); break;
   636         -              		} break;
   637         -              #else  /* !defined(_SC_KERNEL_BITS) */
   638         -              	    puts ("hppa2.0"); break;
   639         -              #endif
   640         -              	default: puts ("hppa1.0"); break;
   641         -              	}
   642         -                  exit (0);
   643         -              }
          613  +		    sed 's/^		//' << EOF >$dummy.c
          614  +
          615  +		#define _HPUX_SOURCE
          616  +		#include <stdlib.h>
          617  +		#include <unistd.h>
          618  +
          619  +		int main ()
          620  +		{
          621  +		#if defined(_SC_KERNEL_BITS)
          622  +		    long bits = sysconf(_SC_KERNEL_BITS);
          623  +		#endif
          624  +		    long cpu  = sysconf (_SC_CPU_VERSION);
          625  +
          626  +		    switch (cpu)
          627  +			{
          628  +			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
          629  +			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
          630  +			case CPU_PA_RISC2_0:
          631  +		#if defined(_SC_KERNEL_BITS)
          632  +			    switch (bits)
          633  +				{
          634  +				case 64: puts ("hppa2.0w"); break;
          635  +				case 32: puts ("hppa2.0n"); break;
          636  +				default: puts ("hppa2.0"); break;
          637  +				} break;
          638  +		#else  /* !defined(_SC_KERNEL_BITS) */
          639  +			    puts ("hppa2.0"); break;
          640  +		#endif
          641  +			default: puts ("hppa1.0"); break;
          642  +			}
          643  +		    exit (0);
          644  +		}
   644    645   EOF
   645    646   		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
   646    647   		    test -z "$HP_ARCH" && HP_ARCH=hppa
   647    648   		fi ;;
   648    649   	esac
   649    650   	if [ ${HP_ARCH} = "hppa2.0w" ]
   650    651   	then
................................................................................
   727    728   	fi
   728    729   	exit ;;
   729    730       parisc*:Lites*:*:*)
   730    731   	echo hppa1.1-hp-lites
   731    732   	exit ;;
   732    733       C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
   733    734   	echo c1-convex-bsd
   734         -        exit ;;
          735  +	exit ;;
   735    736       C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
   736    737   	if getsysinfo -f scalar_acc
   737    738   	then echo c32-convex-bsd
   738    739   	else echo c2-convex-bsd
   739    740   	fi
   740         -        exit ;;
          741  +	exit ;;
   741    742       C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
   742    743   	echo c34-convex-bsd
   743         -        exit ;;
          744  +	exit ;;
   744    745       C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
   745    746   	echo c38-convex-bsd
   746         -        exit ;;
          747  +	exit ;;
   747    748       C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
   748    749   	echo c4-convex-bsd
   749         -        exit ;;
          750  +	exit ;;
   750    751       CRAY*Y-MP:*:*:*)
   751    752   	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   752    753   	exit ;;
   753    754       CRAY*[A-Z]90:*:*:*)
   754    755   	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
   755    756   	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
   756    757   	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
................................................................................
   766    767   	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   767    768   	exit ;;
   768    769       *:UNICOS/mp:*:*)
   769    770   	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   770    771   	exit ;;
   771    772       F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
   772    773   	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
   773         -        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
   774         -        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
   775         -        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   776         -        exit ;;
          774  +	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
          775  +	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
          776  +	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
          777  +	exit ;;
   777    778       5000:UNIX_System_V:4.*:*)
   778         -        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
   779         -        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
   780         -        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
          779  +	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
          780  +	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
          781  +	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   781    782   	exit ;;
   782    783       i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
   783    784   	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
   784    785   	exit ;;
   785    786       sparc*:BSD/OS:*:*)
   786    787   	echo sparc-unknown-bsdi${UNAME_RELEASE}
   787    788   	exit ;;
   788    789       *:BSD/OS:*:*)
   789    790   	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
   790    791   	exit ;;
   791    792       *:FreeBSD:*:*)
   792         -	case ${UNAME_MACHINE} in
   793         -	    pc98)
   794         -		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
          793  +	UNAME_PROCESSOR=`/usr/bin/uname -p`
          794  +	case ${UNAME_PROCESSOR} in
   795    795   	    amd64)
   796    796   		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
   797    797   	    *)
   798         -		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
          798  +		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
   799    799   	esac
   800    800   	exit ;;
   801    801       i*:CYGWIN*:*)
   802    802   	echo ${UNAME_MACHINE}-pc-cygwin
   803    803   	exit ;;
   804    804       *:MINGW*:*)
   805    805   	echo ${UNAME_MACHINE}-pc-mingw32
   806    806   	exit ;;
          807  +    i*:MSYS*:*)
          808  +	echo ${UNAME_MACHINE}-pc-msys
          809  +	exit ;;
   807    810       i*:windows32*:*)
   808         -    	# uname -m includes "-pc" on this system.
   809         -    	echo ${UNAME_MACHINE}-mingw32
          811  +	# uname -m includes "-pc" on this system.
          812  +	echo ${UNAME_MACHINE}-mingw32
   810    813   	exit ;;
   811    814       i*:PW*:*)
   812    815   	echo ${UNAME_MACHINE}-pc-pw32
   813    816   	exit ;;
   814    817       *:Interix*:*)
   815         -    	case ${UNAME_MACHINE} in
          818  +	case ${UNAME_MACHINE} in
   816    819   	    x86)
   817    820   		echo i586-pc-interix${UNAME_RELEASE}
   818    821   		exit ;;
   819    822   	    authenticamd | genuineintel | EM64T)
   820    823   		echo x86_64-unknown-interix${UNAME_RELEASE}
   821    824   		exit ;;
   822    825   	    IA64)
................................................................................
   854    857       *:GNU/*:*:*)
   855    858   	# other systems with GNU libc and userland
   856    859   	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
   857    860   	exit ;;
   858    861       i*86:Minix:*:*)
   859    862   	echo ${UNAME_MACHINE}-pc-minix
   860    863   	exit ;;
          864  +    aarch64:Linux:*:*)
          865  +	echo ${UNAME_MACHINE}-unknown-linux-gnu
          866  +	exit ;;
          867  +    aarch64_be:Linux:*:*)
          868  +	UNAME_MACHINE=aarch64_be
          869  +	echo ${UNAME_MACHINE}-unknown-linux-gnu
          870  +	exit ;;
   861    871       alpha:Linux:*:*)
   862    872   	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
   863    873   	  EV5)   UNAME_MACHINE=alphaev5 ;;
   864    874   	  EV56)  UNAME_MACHINE=alphaev56 ;;
   865    875   	  PCA56) UNAME_MACHINE=alphapca56 ;;
   866    876   	  PCA57) UNAME_MACHINE=alphapca56 ;;
   867    877   	  EV6)   UNAME_MACHINE=alphaev6 ;;
   868    878   	  EV67)  UNAME_MACHINE=alphaev67 ;;
   869    879   	  EV68*) UNAME_MACHINE=alphaev68 ;;
   870         -        esac
          880  +	esac
   871    881   	objdump --private-headers /bin/sh | grep -q ld.so.1
   872    882   	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
   873    883   	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
   874    884   	exit ;;
   875    885       arm*:Linux:*:*)
   876    886   	eval $set_cc_for_build
   877    887   	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
   878    888   	    | grep -q __ARM_EABI__
   879    889   	then
   880    890   	    echo ${UNAME_MACHINE}-unknown-linux-gnu
   881    891   	else
   882         -	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
          892  +	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
          893  +		| grep -q __ARM_PCS_VFP
          894  +	    then
          895  +		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
          896  +	    else
          897  +		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
          898  +	    fi
   883    899   	fi
   884    900   	exit ;;
   885    901       avr32*:Linux:*:*)
   886    902   	echo ${UNAME_MACHINE}-unknown-linux-gnu
   887    903   	exit ;;
   888    904       cris:Linux:*:*)
   889         -	echo cris-axis-linux-gnu
          905  +	echo ${UNAME_MACHINE}-axis-linux-gnu
   890    906   	exit ;;
   891    907       crisv32:Linux:*:*)
   892         -	echo crisv32-axis-linux-gnu
          908  +	echo ${UNAME_MACHINE}-axis-linux-gnu
   893    909   	exit ;;
   894    910       frv:Linux:*:*)
   895         -    	echo frv-unknown-linux-gnu
          911  +	echo ${UNAME_MACHINE}-unknown-linux-gnu
          912  +	exit ;;
          913  +    hexagon:Linux:*:*)
          914  +	echo ${UNAME_MACHINE}-unknown-linux-gnu
   896    915   	exit ;;
   897    916       i*86:Linux:*:*)
   898    917   	LIBC=gnu
   899    918   	eval $set_cc_for_build
   900    919   	sed 's/^	//' << EOF >$dummy.c
   901    920   	#ifdef __dietlibc__
   902    921   	LIBC=dietlibc
................................................................................
   930    949   	#endif
   931    950   	#endif
   932    951   EOF
   933    952   	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
   934    953   	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
   935    954   	;;
   936    955       or32:Linux:*:*)
   937         -	echo or32-unknown-linux-gnu
          956  +	echo ${UNAME_MACHINE}-unknown-linux-gnu
   938    957   	exit ;;
   939    958       padre:Linux:*:*)
   940    959   	echo sparc-unknown-linux-gnu
   941    960   	exit ;;
   942    961       parisc64:Linux:*:* | hppa64:Linux:*:*)
   943    962   	echo hppa64-unknown-linux-gnu
   944    963   	exit ;;
................................................................................
   956    975       ppc:Linux:*:*)
   957    976   	echo powerpc-unknown-linux-gnu
   958    977   	exit ;;
   959    978       s390:Linux:*:* | s390x:Linux:*:*)
   960    979   	echo ${UNAME_MACHINE}-ibm-linux
   961    980   	exit ;;
   962    981       sh64*:Linux:*:*)
   963         -    	echo ${UNAME_MACHINE}-unknown-linux-gnu
          982  +	echo ${UNAME_MACHINE}-unknown-linux-gnu
   964    983   	exit ;;
   965    984       sh*:Linux:*:*)
   966    985   	echo ${UNAME_MACHINE}-unknown-linux-gnu
   967    986   	exit ;;
   968    987       sparc:Linux:*:* | sparc64:Linux:*:*)
   969    988   	echo ${UNAME_MACHINE}-unknown-linux-gnu
   970    989   	exit ;;
   971    990       tile*:Linux:*:*)
   972         -	echo ${UNAME_MACHINE}-tilera-linux-gnu
          991  +	echo ${UNAME_MACHINE}-unknown-linux-gnu
   973    992   	exit ;;
   974    993       vax:Linux:*:*)
   975    994   	echo ${UNAME_MACHINE}-dec-linux-gnu
   976    995   	exit ;;
   977    996       x86_64:Linux:*:*)
   978         -	echo x86_64-unknown-linux-gnu
          997  +	echo ${UNAME_MACHINE}-unknown-linux-gnu
   979    998   	exit ;;
   980    999       xtensa*:Linux:*:*)
   981         -    	echo ${UNAME_MACHINE}-unknown-linux-gnu
         1000  +	echo ${UNAME_MACHINE}-unknown-linux-gnu
   982   1001   	exit ;;
   983   1002       i*86:DYNIX/ptx:4*:*)
   984   1003   	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
   985   1004   	# earlier versions are messed up and put the nodename in both
   986   1005   	# sysname and nodename.
   987   1006   	echo i386-sequent-sysv4
   988   1007   	exit ;;
   989   1008       i*86:UNIX_SV:4.2MP:2.*)
   990         -        # Unixware is an offshoot of SVR4, but it has its own version
   991         -        # number series starting with 2...
   992         -        # I am not positive that other SVR4 systems won't match this,
         1009  +	# Unixware is an offshoot of SVR4, but it has its own version
         1010  +	# number series starting with 2...
         1011  +	# I am not positive that other SVR4 systems won't match this,
   993   1012   	# I just have to hope.  -- rms.
   994         -        # Use sysv4.2uw... so that sysv4* matches it.
         1013  +	# Use sysv4.2uw... so that sysv4* matches it.
   995   1014   	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
   996   1015   	exit ;;
   997   1016       i*86:OS/2:*:*)
   998   1017   	# If we were able to find `uname', then EMX Unix compatibility
   999   1018   	# is probably installed.
  1000   1019   	echo ${UNAME_MACHINE}-pc-os2-emx
  1001   1020   	exit ;;
................................................................................
  1019   1038   	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
  1020   1039   		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
  1021   1040   	else
  1022   1041   		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
  1023   1042   	fi
  1024   1043   	exit ;;
  1025   1044       i*86:*:5:[678]*)
  1026         -    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
         1045  +	# UnixWare 7.x, OpenUNIX and OpenServer 6.
  1027   1046   	case `/bin/uname -X | grep "^Machine"` in
  1028   1047   	    *486*)	     UNAME_MACHINE=i486 ;;
  1029   1048   	    *Pentium)	     UNAME_MACHINE=i586 ;;
  1030   1049   	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
  1031   1050   	esac
  1032   1051   	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
  1033   1052   	exit ;;
................................................................................
  1047   1066   		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
  1048   1067   	else
  1049   1068   		echo ${UNAME_MACHINE}-pc-sysv32
  1050   1069   	fi
  1051   1070   	exit ;;
  1052   1071       pc:*:*:*)
  1053   1072   	# Left here for compatibility:
  1054         -        # uname -m prints for DJGPP always 'pc', but it prints nothing about
  1055         -        # the processor, so we play safe by assuming i586.
         1073  +	# uname -m prints for DJGPP always 'pc', but it prints nothing about
         1074  +	# the processor, so we play safe by assuming i586.
  1056   1075   	# Note: whatever this is, it MUST be the same as what config.sub
  1057   1076   	# prints for the "djgpp" host, or else GDB configury will decide that
  1058   1077   	# this is a cross-build.
  1059   1078   	echo i586-pc-msdosdjgpp
  1060         -        exit ;;
         1079  +	exit ;;
  1061   1080       Intel:Mach:3*:*)
  1062   1081   	echo i386-pc-mach3
  1063   1082   	exit ;;
  1064   1083       paragon:*:*:*)
  1065   1084   	echo i860-intel-osf1
  1066   1085   	exit ;;
  1067   1086       i860:*:4.*:*) # i860-SVR4
................................................................................
  1088   1107   	test -r /etc/.relid \
  1089   1108   	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
  1090   1109   	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
  1091   1110   	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
  1092   1111   	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
  1093   1112   	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
  1094   1113       3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
  1095         -        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
  1096         -          && { echo i486-ncr-sysv4; exit; } ;;
         1114  +	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
         1115  +	  && { echo i486-ncr-sysv4; exit; } ;;
  1097   1116       NCR*:*:4.2:* | MPRAS*:*:4.2:*)
  1098   1117   	OS_REL='.3'
  1099   1118   	test -r /etc/.relid \
  1100   1119   	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
  1101   1120   	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
  1102   1121   	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
  1103   1122   	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
................................................................................
  1132   1151   	if uname -p 2>/dev/null >/dev/null ; then
  1133   1152   		UNAME_MACHINE=`(uname -p) 2>/dev/null`
  1134   1153   		echo ${UNAME_MACHINE}-sni-sysv4
  1135   1154   	else
  1136   1155   		echo ns32k-sni-sysv
  1137   1156   	fi
  1138   1157   	exit ;;
  1139         -    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
  1140         -                      # says <Richard.M.Bartel@ccMail.Census.GOV>
  1141         -        echo i586-unisys-sysv4
  1142         -        exit ;;
         1158  +    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
         1159  +			# says <Richard.M.Bartel@ccMail.Census.GOV>
         1160  +	echo i586-unisys-sysv4
         1161  +	exit ;;
  1143   1162       *:UNIX_System_V:4*:FTX*)
  1144   1163   	# From Gerald Hewes <hewes@openmarket.com>.
  1145   1164   	# How about differentiating between stratus architectures? -djm
  1146   1165   	echo hppa1.1-stratus-sysv4
  1147   1166   	exit ;;
  1148   1167       *:*:*:FTX*)
  1149   1168   	# From seanf@swdc.stratus.com.
................................................................................
  1161   1180   	echo m68k-apple-aux${UNAME_RELEASE}
  1162   1181   	exit ;;
  1163   1182       news*:NEWS-OS:6*:*)
  1164   1183   	echo mips-sony-newsos6
  1165   1184   	exit ;;
  1166   1185       R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
  1167   1186   	if [ -d /usr/nec ]; then
  1168         -	        echo mips-nec-sysv${UNAME_RELEASE}
         1187  +		echo mips-nec-sysv${UNAME_RELEASE}
  1169   1188   	else
  1170         -	        echo mips-unknown-sysv${UNAME_RELEASE}
         1189  +		echo mips-unknown-sysv${UNAME_RELEASE}
  1171   1190   	fi
  1172         -        exit ;;
         1191  +	exit ;;
  1173   1192       BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
  1174   1193   	echo powerpc-be-beos
  1175   1194   	exit ;;
  1176   1195       BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
  1177   1196   	echo powerpc-apple-beos
  1178   1197   	exit ;;
  1179   1198       BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
................................................................................
  1230   1249   		UNAME_MACHINE=pc
  1231   1250   	fi
  1232   1251   	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
  1233   1252   	exit ;;
  1234   1253       *:QNX:*:4*)
  1235   1254   	echo i386-pc-qnx
  1236   1255   	exit ;;
         1256  +    NEO-?:NONSTOP_KERNEL:*:*)
         1257  +	echo neo-tandem-nsk${UNAME_RELEASE}
         1258  +	exit ;;
  1237   1259       NSE-?:NONSTOP_KERNEL:*:*)
  1238   1260   	echo nse-tandem-nsk${UNAME_RELEASE}
  1239   1261   	exit ;;
  1240   1262       NSR-?:NONSTOP_KERNEL:*:*)
  1241   1263   	echo nsr-tandem-nsk${UNAME_RELEASE}
  1242   1264   	exit ;;
  1243   1265       *:NonStop-UX:*:*)
................................................................................
  1275   1297       *:TOPS-20:*:*)
  1276   1298   	echo pdp10-unknown-tops20
  1277   1299   	exit ;;
  1278   1300       *:ITS:*:*)
  1279   1301   	echo pdp10-unknown-its
  1280   1302   	exit ;;
  1281   1303       SEI:*:*:SEIUX)
  1282         -        echo mips-sei-seiux${UNAME_RELEASE}
         1304  +	echo mips-sei-seiux${UNAME_RELEASE}
  1283   1305   	exit ;;
  1284   1306       *:DragonFly:*:*)
  1285   1307   	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
  1286   1308   	exit ;;
  1287   1309       *:*VMS:*:*)
  1288         -    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
         1310  +	UNAME_MACHINE=`(uname -p) 2>/dev/null`
  1289   1311   	case "${UNAME_MACHINE}" in
  1290   1312   	    A*) echo alpha-dec-vms ; exit ;;
  1291   1313   	    I*) echo ia64-dec-vms ; exit ;;
  1292   1314   	    V*) echo vax-dec-vms ; exit ;;
  1293   1315   	esac ;;
  1294   1316       *:XENIX:*:SysV)
  1295   1317   	echo i386-pc-xenix
................................................................................
  1299   1321   	exit ;;
  1300   1322       i*86:rdos:*:*)
  1301   1323   	echo ${UNAME_MACHINE}-pc-rdos
  1302   1324   	exit ;;
  1303   1325       i*86:AROS:*:*)
  1304   1326   	echo ${UNAME_MACHINE}-pc-aros
  1305   1327   	exit ;;
         1328  +    x86_64:VMkernel:*:*)
         1329  +	echo ${UNAME_MACHINE}-unknown-esx
         1330  +	exit ;;
  1306   1331   esac
  1307   1332   
  1308   1333   #echo '(No uname command or uname output not recognized.)' 1>&2
  1309   1334   #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
  1310   1335   
  1311   1336   eval $set_cc_for_build
  1312   1337   cat >$dummy.c <<EOF
................................................................................
  1321   1346     /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
  1322   1347        I don't know....  */
  1323   1348     printf ("mips-sony-bsd\n"); exit (0);
  1324   1349   #else
  1325   1350   #include <sys/param.h>
  1326   1351     printf ("m68k-sony-newsos%s\n",
  1327   1352   #ifdef NEWSOS4
  1328         -          "4"
         1353  +	"4"
  1329   1354   #else
  1330         -	  ""
         1355  +	""
  1331   1356   #endif
  1332         -         ); exit (0);
         1357  +	); exit (0);
  1333   1358   #endif
  1334   1359   #endif
  1335   1360   
  1336   1361   #if defined (__arm) && defined (__acorn) && defined (__unix)
  1337   1362     printf ("arm-acorn-riscix\n"); exit (0);
  1338   1363   #endif
  1339   1364   

Modified kitsh/buildsrc/kitsh-0.0/config.sub from [32f90ac76a] to [8fedd9524f].

     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, 2010
     5         -#   Free Software Foundation, Inc.
            4  +#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
            5  +#   2011, 2012 Free Software Foundation, Inc.
     6      6   
     7         -timestamp='2010-09-11'
            7  +timestamp='2012-04-18'
     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
    11     11   # can handle that machine.  It does not imply ALL GNU software can.
    12     12   #
    13     13   # This file is free software; you can redistribute it and/or modify
    14     14   # it under the terms of the GNU General Public License as published by
................................................................................
    17     17   #
    18     18   # This program is distributed in the hope that it will be useful,
    19     19   # but WITHOUT ANY WARRANTY; without even the implied warranty of
    20     20   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    21     21   # GNU General Public License for more details.
    22     22   #
    23     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
    25         -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    26         -# 02110-1301, USA.
           24  +# along with this program; if not, see <http://www.gnu.org/licenses/>.
    27     25   #
    28     26   # As a special exception to the GNU General Public License, if you
    29     27   # distribute this file as part of a program that contains a
    30     28   # configuration script generated by Autoconf, you may include it under
    31     29   # the same distribution terms that you use for the rest of that program.
    32     30   
    33     31   
................................................................................
    72     70   
    73     71   Report bugs and patches to <config-patches@gnu.org>."
    74     72   
    75     73   version="\
    76     74   GNU config.sub ($timestamp)
    77     75   
    78     76   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
    79         -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
    80         -Software Foundation, Inc.
           77  +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
           78  +Free Software Foundation, Inc.
    81     79   
    82     80   This is free software; see the source for copying conditions.  There is NO
    83     81   warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
    84     82   
    85     83   help="
    86     84   Try \`$me --help' for more information."
    87     85   
................................................................................
   128    126     linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   129    127     knetbsd*-gnu* | netbsd*-gnu* | \
   130    128     kopensolaris*-gnu* | \
   131    129     storm-chaos* | os2-emx* | rtmk-nova*)
   132    130       os=-$maybe_os
   133    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    138       basic_machine=`echo $1 | sed 's/-[^-]*$//'`
   137    139       if [ $basic_machine != $1 ]
   138    140       then os=`echo $1 | sed 's/.*-/-/'`
   139    141       else os=; fi
   140    142       ;;
   141    143   esac
................................................................................
   154    156   	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
   155    157   	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
   156    158   	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
   157    159   	-apple | -axis | -knuth | -cray | -microblaze)
   158    160   		os=
   159    161   		basic_machine=$1
   160    162   		;;
   161         -        -bluegene*)
   162         -	        os=-cnk
          163  +	-bluegene*)
          164  +		os=-cnk
   163    165   		;;
   164    166   	-sim | -cisco | -oki | -wec | -winbond)
   165    167   		os=
   166    168   		basic_machine=$1
   167    169   		;;
   168    170   	-scout)
   169    171   		;;
................................................................................
   171    173   		os=-vxworks
   172    174   		basic_machine=$1
   173    175   		;;
   174    176   	-chorusos*)
   175    177   		os=-chorusos
   176    178   		basic_machine=$1
   177    179   		;;
   178         - 	-chorusrdb)
   179         - 		os=-chorusrdb
          180  +	-chorusrdb)
          181  +		os=-chorusrdb
   180    182   		basic_machine=$1
   181         - 		;;
          183  +		;;
   182    184   	-hiux*)
   183    185   		os=-hiuxwe2
   184    186   		;;
   185    187   	-sco6)
   186    188   		os=-sco5v6
   187    189   		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   188    190   		;;
................................................................................
   219    221   		;;
   220    222   	-clix*)
   221    223   		basic_machine=clipper-intergraph
   222    224   		;;
   223    225   	-isc*)
   224    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    234   	-lynx*)
   227    235   		os=-lynxos
   228    236   		;;
   229    237   	-ptx*)
   230    238   		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
   231    239   		;;
   232    240   	-windowsnt*)
................................................................................
   243    251   
   244    252   # Decode aliases for certain CPU-COMPANY combinations.
   245    253   case $basic_machine in
   246    254   	# Recognize the basic CPU types without company name.
   247    255   	# Some are omitted here because they have special meanings below.
   248    256   	1750a | 580 \
   249    257   	| a29k \
          258  +	| aarch64 | aarch64_be \
   250    259   	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
   251    260   	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
   252    261   	| am33_2.0 \
   253    262   	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
          263  +        | be32 | be64 \
   254    264   	| bfin \
   255    265   	| c4x | clipper \
   256    266   	| d10v | d30v | dlx | dsp16xx \
          267  +	| epiphany \
   257    268   	| fido | fr30 | frv \
   258    269   	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
          270  +	| hexagon \
   259    271   	| i370 | i860 | i960 | ia64 \
   260    272   	| ip2k | iq2000 \
          273  +	| le32 | le64 \
   261    274   	| lm32 \
   262    275   	| m32c | m32r | m32rle | m68000 | m68k | m88k \
   263    276   	| maxq | mb | microblaze | mcore | mep | metag \
   264    277   	| mips | mipsbe | mipseb | mipsel | mipsle \
   265    278   	| mips16 \
   266    279   	| mips64 | mips64el \
   267    280   	| mips64octeon | mips64octeonel \
................................................................................
   282    295   	| mn10200 | mn10300 \
   283    296   	| moxie \
   284    297   	| mt \
   285    298   	| msp430 \
   286    299   	| nds32 | nds32le | nds32be \
   287    300   	| nios | nios2 \
   288    301   	| ns16k | ns32k \
          302  +	| open8 \
   289    303   	| or32 \
   290    304   	| pdp10 | pdp11 | pj | pjl \
   291         -	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
          305  +	| powerpc | powerpc64 | powerpc64le | powerpcle \
   292    306   	| pyramid \
   293         -	| rx \
          307  +	| rl78 | rx \
   294    308   	| score \
   295    309   	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
   296    310   	| sh64 | sh64le \
   297    311   	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
   298    312   	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
   299         -	| spu | strongarm \
   300         -	| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
          313  +	| spu \
          314  +	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
   301    315   	| ubicom32 \
   302         -	| v850 | v850e \
          316  +	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
   303    317   	| we32k \
   304         -	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
          318  +	| x86 | xc16x | xstormy16 | xtensa \
   305    319   	| z8k | z80)
   306    320   		basic_machine=$basic_machine-unknown
   307    321   		;;
   308    322   	c54x)
   309    323   		basic_machine=tic54x-unknown
   310    324   		;;
   311    325   	c55x)
   312    326   		basic_machine=tic55x-unknown
   313    327   		;;
   314    328   	c6x)
   315    329   		basic_machine=tic6x-unknown
   316    330   		;;
   317         -	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
   318         -		# Motorola 68HC11/12.
          331  +	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
   319    332   		basic_machine=$basic_machine-unknown
   320    333   		os=-none
   321    334   		;;
   322    335   	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
   323    336   		;;
   324    337   	ms1)
   325    338   		basic_machine=mt-unknown
   326    339   		;;
          340  +
          341  +	strongarm | thumb | xscale)
          342  +		basic_machine=arm-unknown
          343  +		;;
          344  +	xgate)
          345  +		basic_machine=$basic_machine-unknown
          346  +		os=-none
          347  +		;;
          348  +	xscaleeb)
          349  +		basic_machine=armeb-unknown
          350  +		;;
          351  +
          352  +	xscaleel)
          353  +		basic_machine=armel-unknown
          354  +		;;
   327    355   
   328    356   	# We use `pc' rather than `unknown'
   329    357   	# because (1) that's what they normally are, and
   330    358   	# (2) the word "unknown" tends to confuse beginning users.
   331    359   	i*86 | x86_64)
   332    360   	  basic_machine=$basic_machine-pc
   333    361   	  ;;
................................................................................
   335    363   	*-*-*)
   336    364   		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
   337    365   		exit 1
   338    366   		;;
   339    367   	# Recognize the basic CPU types with company name.
   340    368   	580-* \
   341    369   	| a29k-* \
          370  +	| aarch64-* | aarch64_be-* \
   342    371   	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
   343    372   	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
   344    373   	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
   345    374   	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
   346    375   	| avr-* | avr32-* \
          376  +	| be32-* | be64-* \
   347    377   	| bfin-* | bs2000-* \
   348    378   	| c[123]* | c30-* | [cjt]90-* | c4x-* \
   349    379   	| clipper-* | craynv-* | cydra-* \
   350    380   	| d10v-* | d30v-* | dlx-* \
   351    381   	| elxsi-* \
   352    382   	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
   353    383   	| h8300-* | h8500-* \
   354    384   	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
          385  +	| hexagon-* \
   355    386   	| i*86-* | i860-* | i960-* | ia64-* \
   356    387   	| ip2k-* | iq2000-* \
          388  +	| le32-* | le64-* \
   357    389   	| lm32-* \
   358    390   	| m32c-* | m32r-* | m32rle-* \
   359    391   	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
   360    392   	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
   361    393   	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
   362    394   	| mips16-* \
   363    395   	| mips64-* | mips64el-* \
................................................................................
   378    410   	| mipstx39-* | mipstx39el-* \
   379    411   	| mmix-* \
   380    412   	| mt-* \
   381    413   	| msp430-* \
   382    414   	| nds32-* | nds32le-* | nds32be-* \
   383    415   	| nios-* | nios2-* \
   384    416   	| none-* | np1-* | ns16k-* | ns32k-* \
          417  +	| open8-* \
   385    418   	| orion-* \
   386    419   	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
   387         -	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
          420  +	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
   388    421   	| pyramid-* \
   389         -	| romp-* | rs6000-* | rx-* \
          422  +	| rl78-* | romp-* | rs6000-* | rx-* \
   390    423   	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
   391    424   	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
   392    425   	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
   393    426   	| sparclite-* \
   394         -	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
   395         -	| tahoe-* | thumb-* \
          427  +	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
          428  +	| tahoe-* \
   396    429   	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
   397         -	| tile-* | tilegx-* \
          430  +	| tile*-* \
   398    431   	| tron-* \
   399    432   	| ubicom32-* \
   400         -	| v850-* | v850e-* | vax-* \
          433  +	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
          434  +	| vax-* \
   401    435   	| we32k-* \
   402         -	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
          436  +	| x86-* | x86_64-* | xc16x-* | xps100-* \
   403    437   	| xstormy16-* | xtensa*-* \
   404    438   	| ymp-* \
   405    439   	| z8k-* | z80-*)
   406    440   		;;
   407    441   	# Recognize the basic CPU types without company name, with glob match.
   408    442   	xtensa*)
   409    443   		basic_machine=$basic_machine-unknown
................................................................................
   420    454   	3b*)
   421    455   		basic_machine=we32k-att
   422    456   		;;
   423    457   	a29khif)
   424    458   		basic_machine=a29k-amd
   425    459   		os=-udi
   426    460   		;;
   427         -    	abacus)
          461  +	abacus)
   428    462   		basic_machine=abacus-unknown
   429    463   		;;
   430    464   	adobe68k)
   431    465   		basic_machine=m68010-adobe
   432    466   		os=-scout
   433    467   		;;
   434    468   	alliant | fx80)
................................................................................
   503    537   	c6x-*)
   504    538   		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
   505    539   		;;
   506    540   	c90)
   507    541   		basic_machine=c90-cray
   508    542   		os=-unicos
   509    543   		;;
   510         -        cegcc)
          544  +	cegcc)
   511    545   		basic_machine=arm-unknown
   512    546   		os=-cegcc
   513    547   		;;
   514    548   	convex-c1)
   515    549   		basic_machine=c1-convex
   516    550   		os=-bsd
   517    551   		;;
................................................................................
   535    569   		basic_machine=j90-cray
   536    570   		os=-unicos
   537    571   		;;
   538    572   	craynv)
   539    573   		basic_machine=craynv-cray
   540    574   		os=-unicosmp
   541    575   		;;
   542         -	cr16)
          576  +	cr16 | cr16-*)
   543    577   		basic_machine=cr16-unknown
   544    578   		os=-elf
   545    579   		;;
   546    580   	crds | unos)
   547    581   		basic_machine=m68k-crds
   548    582   		;;
   549    583   	crisv32 | crisv32-* | etraxfs*)
................................................................................
   693    727   	hppro)
   694    728   		basic_machine=hppa1.1-hp
   695    729   		os=-proelf
   696    730   		;;
   697    731   	i370-ibm* | ibm*)
   698    732   		basic_machine=i370-ibm
   699    733   		;;
   700         -# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
   701    734   	i*86v32)
   702    735   		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   703    736   		os=-sysv32
   704    737   		;;
   705    738   	i*86v4*)
   706    739   		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   707    740   		os=-sysv4
................................................................................
   751    784   		basic_machine=mips-mips
   752    785   		os=-sysv
   753    786   		;;
   754    787   	merlin)
   755    788   		basic_machine=ns32k-utek
   756    789   		os=-sysv
   757    790   		;;
   758         -        microblaze)
          791  +	microblaze)
   759    792   		basic_machine=microblaze-xilinx
   760    793   		;;
   761    794   	mingw32)
   762    795   		basic_machine=i386-pc
   763    796   		os=-mingw32
   764    797   		;;
   765    798   	mingw32ce)
................................................................................
   790    823   	msdos)
   791    824   		basic_machine=i386-pc
   792    825   		os=-msdos
   793    826   		;;
   794    827   	ms1-*)
   795    828   		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
   796    829   		;;
          830  +	msys)
          831  +		basic_machine=i386-pc
          832  +		os=-msys
          833  +		;;
   797    834   	mvs)
   798    835   		basic_machine=i370-ibm
   799    836   		os=-mvs
   800    837   		;;
          838  +	nacl)
          839  +		basic_machine=le32-unknown
          840  +		os=-nacl
          841  +		;;
   801    842   	ncr3000)
   802    843   		basic_machine=i486-ncr
   803    844   		os=-sysv4
   804    845   		;;
   805    846   	netbsd386)
   806    847   		basic_machine=i386-unknown
   807    848   		os=-netbsd
................................................................................
   858    899   	nonstopux)
   859    900   		basic_machine=mips-compaq
   860    901   		os=-nonstopux
   861    902   		;;
   862    903   	np1)
   863    904   		basic_machine=np1-gould
   864    905   		;;
   865         -        neo-tandem)
          906  +	neo-tandem)
   866    907   		basic_machine=neo-tandem
   867    908   		;;
   868         -        nse-tandem)
          909  +	nse-tandem)
   869    910   		basic_machine=nse-tandem
   870    911   		;;
   871    912   	nsr-tandem)
   872    913   		basic_machine=nsr-tandem
   873    914   		;;
   874    915   	op50n-* | op60c-*)
   875    916   		basic_machine=hppa1.1-oki
................................................................................
   946    987   		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
   947    988   		;;
   948    989   	pn)
   949    990   		basic_machine=pn-gould
   950    991   		;;
   951    992   	power)	basic_machine=power-ibm
   952    993   		;;
   953         -	ppc)	basic_machine=powerpc-unknown
          994  +	ppc | ppcbe)	basic_machine=powerpc-unknown
   954    995   		;;
   955         -	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
          996  +	ppc-* | ppcbe-*)
          997  +		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
   956    998   		;;
   957    999   	ppcle | powerpclittle | ppc-le | powerpc-little)
   958   1000   		basic_machine=powerpcle-unknown
   959   1001   		;;
   960   1002   	ppcle-* | powerpclittle-*)
   961   1003   		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
   962   1004   		;;
................................................................................
  1042   1084   	st2000)
  1043   1085   		basic_machine=m68k-tandem
  1044   1086   		;;
  1045   1087   	stratus)
  1046   1088   		basic_machine=i860-stratus
  1047   1089   		os=-sysv4
  1048   1090   		;;
         1091  +	strongarm-* | thumb-*)
         1092  +		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
         1093  +		;;
  1049   1094   	sun2)
  1050   1095   		basic_machine=m68000-sun
  1051   1096   		;;
  1052   1097   	sun2os3)
  1053   1098   		basic_machine=m68000-sun
  1054   1099   		os=-sunos3
  1055   1100   		;;
................................................................................
  1098   1143   		basic_machine=alphaev5-cray
  1099   1144   		os=-unicos
  1100   1145   		;;
  1101   1146   	t90)
  1102   1147   		basic_machine=t90-cray
  1103   1148   		os=-unicos
  1104   1149   		;;
  1105         -        # This must be matched before tile*.
  1106         -        tilegx*)
  1107         -		basic_machine=tilegx-unknown
  1108         -		os=-linux-gnu
  1109         -		;;
  1110   1150   	tile*)
  1111         -		basic_machine=tile-unknown
         1151  +		basic_machine=$basic_machine-unknown
  1112   1152   		os=-linux-gnu
  1113   1153   		;;
  1114   1154   	tx39)
  1115   1155   		basic_machine=mipstx39-unknown
  1116   1156   		;;
  1117   1157   	tx39el)
  1118   1158   		basic_machine=mipstx39el-unknown
................................................................................
  1174   1214   	xbox)
  1175   1215   		basic_machine=i686-pc
  1176   1216   		os=-mingw32
  1177   1217   		;;
  1178   1218   	xps | xps100)
  1179   1219   		basic_machine=xps100-honeywell
  1180   1220   		;;
         1221  +	xscale-* | xscalee[bl]-*)
         1222  +		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
         1223  +		;;
  1181   1224   	ymp)
  1182   1225   		basic_machine=ymp-cray
  1183   1226   		os=-unicos
  1184   1227   		;;
  1185   1228   	z8k-*-coff)
  1186   1229   		basic_machine=z8k-unknown
  1187   1230   		os=-sim
................................................................................
  1271   1314   esac
  1272   1315   
  1273   1316   # Decode manufacturer-specific aliases for certain operating systems.
  1274   1317   
  1275   1318   if [ x"$os" != x"" ]
  1276   1319   then
  1277   1320   case $os in
  1278         -        # First match some system type aliases
  1279         -        # that might get confused with valid system types.
         1321  +	# First match some system type aliases
         1322  +	# that might get confused with valid system types.
  1280   1323   	# -solaris* is a basic system type, with this one exception.
  1281         -        -auroraux)
  1282         -	        os=-auroraux
         1324  +	-auroraux)
         1325  +		os=-auroraux
  1283   1326   		;;
  1284   1327   	-solaris1 | -solaris1.*)
  1285   1328   		os=`echo $os | sed -e 's|solaris1|sunos4|'`
  1286   1329   		;;
  1287   1330   	-solaris)
  1288   1331   		os=-solaris2
  1289   1332   		;;
................................................................................
  1311   1354   	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
  1312   1355   	      | -openbsd* | -solidbsd* \
  1313   1356   	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
  1314   1357   	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  1315   1358   	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  1316   1359   	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  1317   1360   	      | -chorusos* | -chorusrdb* | -cegcc* \
  1318         -	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
         1361  +	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  1319   1362   	      | -mingw32* | -linux-gnu* | -linux-android* \
  1320   1363   	      | -linux-newlib* | -linux-uclibc* \
  1321   1364   	      | -uxpv* | -beos* | -mpeix* | -udk* \
  1322   1365   	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
  1323   1366   	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
  1324   1367   	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
  1325   1368   	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
................................................................................
  1360   1403   		;;
  1361   1404   	-sunos6*)
  1362   1405   		os=`echo $os | sed -e 's|sunos6|solaris3|'`
  1363   1406   		;;
  1364   1407   	-opened*)
  1365   1408   		os=-openedition
  1366   1409   		;;
  1367         -        -os400*)
         1410  +	-os400*)
  1368   1411   		os=-os400
  1369   1412   		;;
  1370   1413   	-wince*)
  1371   1414   		os=-wince
  1372   1415   		;;
  1373   1416   	-osfrose*)
  1374   1417   		os=-osfrose
................................................................................
  1409   1452   	# Preserve the version number of sinix5.
  1410   1453   	-sinix5.*)
  1411   1454   		os=`echo $os | sed -e 's|sinix|sysv|'`
  1412   1455   		;;
  1413   1456   	-sinix*)
  1414   1457   		os=-sysv4
  1415   1458   		;;
  1416         -        -tpf*)
         1459  +	-tpf*)
  1417   1460   		os=-tpf
  1418   1461   		;;
  1419   1462   	-triton*)
  1420   1463   		os=-sysv3
  1421   1464   		;;
  1422   1465   	-oss*)
  1423   1466   		os=-sysv3
................................................................................
  1454   1497   		;;
  1455   1498   	-zvmoe)
  1456   1499   		os=-zvmoe
  1457   1500   		;;
  1458   1501   	-dicos*)
  1459   1502   		os=-dicos
  1460   1503   		;;
  1461         -        -nacl*)
  1462         -	        ;;
         1504  +	-nacl*)
         1505  +		;;
  1463   1506   	-none)
  1464   1507   		;;
  1465   1508   	*)
  1466   1509   		# Get rid of the `-' at the beginning of $os.
  1467   1510   		os=`echo $os | sed 's/[^-]*-//'`
  1468   1511   		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
  1469   1512   		exit 1
................................................................................
  1478   1521   # Note that if you're going to try to match "-MANUFACTURER" here (say,
  1479   1522   # "-sun"), then you have to tell the case statement up towards the top
  1480   1523   # that MANUFACTURER isn't an operating system.  Otherwise, code above
  1481   1524   # will signal an error saying that MANUFACTURER isn't an operating
  1482   1525   # system, and we'll never get to this point.
  1483   1526   
  1484   1527   case $basic_machine in
  1485         -        score-*)
         1528  +	score-*)
  1486   1529   		os=-elf
  1487   1530   		;;
  1488         -        spu-*)
         1531  +	spu-*)
  1489   1532   		os=-elf
  1490   1533   		;;
  1491   1534   	*-acorn)
  1492   1535   		os=-riscix1.2
  1493   1536   		;;
  1494   1537   	arm*-rebel)
  1495   1538   		os=-linux
  1496   1539   		;;
  1497   1540   	arm*-semi)
  1498   1541   		os=-aout
  1499   1542   		;;
  1500         -        c4x-* | tic4x-*)
  1501         -        	os=-coff
         1543  +	c4x-* | tic4x-*)
         1544  +		os=-coff
  1502   1545   		;;
  1503   1546   	tic54x-*)
  1504   1547   		os=-coff
  1505   1548   		;;
  1506   1549   	tic55x-*)
  1507   1550   		os=-coff
  1508   1551   		;;
................................................................................
  1523   1566   		os=-domain
  1524   1567   		;;
  1525   1568   	i386-sun)
  1526   1569   		os=-sunos4.0.2
  1527   1570   		;;
  1528   1571   	m68000-sun)
  1529   1572   		os=-sunos3
  1530         -		# This also exists in the configure program, but was not the
  1531         -		# default.
  1532         -		# os=-sunos4
  1533   1573   		;;
  1534   1574   	m68*-cisco)
  1535   1575   		os=-aout
  1536   1576   		;;
  1537         -        mep-*)
         1577  +	mep-*)
  1538   1578   		os=-elf
  1539   1579   		;;
  1540   1580   	mips*-cisco)
  1541   1581   		os=-elf
  1542   1582   		;;
  1543   1583   	mips*-*)
  1544   1584   		os=-elf
................................................................................
  1557   1597   		;;
  1558   1598   	*-haiku)
  1559   1599   		os=-haiku
  1560   1600   		;;
  1561   1601   	*-ibm)
  1562   1602   		os=-aix
  1563   1603   		;;
  1564         -    	*-knuth)
         1604  +	*-knuth)
  1565   1605   		os=-mmixware
  1566   1606   		;;
  1567   1607   	*-wec)
  1568   1608   		os=-proelf
  1569   1609   		;;
  1570   1610   	*-winbond)
  1571   1611   		os=-proelf