better error testing on perverse cases (eg, ./config.sub -sun3)

[deliverable/binutils-gdb.git] / config.sub

diff --git a/config.sub b/config.sub
index dcf95e2362e4cceeb1603f4bd588387f43d7b248..dba56e213380305dc4491337e07060c00011611b 100755 (executable)
--- a/config.sub
+++ b/config.sub
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Configuration validation subroutine script, version 1.0.
-#   Copyright (C) 1991 Free Software Foundation, Inc.
+#   Copyright (C) 1991, 1992 Free Software Foundation, Inc.
 
 #This file is free software; you can redistribute it and/or modify
 #it under the terms of the GNU General Public License as published by
@@ -46,7 +46,7 @@ case $1 in
 esac
 
 # Separate what the user gave into CPU-COMPANY and OS (if any).
-basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+basic_machine=`echo $1 | sed 's/-[^-]+$//'`
 if [ $basic_machine != $1 ]
 then os=`echo $1 | sed 's/.*-/-/'`
 else os=; fi
@@ -91,7 +91,7 @@ esac
 case $basic_machine in
        # Recognize the basic CPU types with without company name.
        tahoe | i386 | i860 | m68k | m68000 | m88k | ns32k | arm | pyramid \
-               | tron | a29k | 580 | i960 | h8300)
+               | tron | a29k | 580 | i960 | h8300 | v70)
                basic_machine=$basic_machine-unknown
                ;;
        # Recognize the basic CPU types with with company name.
@@ -139,6 +139,10 @@ case $basic_machine in
                basic_machine=vax-dec
                os=-vms
                ;;
+       i386mach)
+               basic_machine=i386-mach
+               os=-mach
+               ;;
        i386v32)
                basic_machine=i386-unknown
                os=-sysv32
@@ -147,6 +151,10 @@ case $basic_machine in
                basic_machine=i386-unknown
                os=-scosysv322
                ;;
+       go32 | i386-go32)
+               basic_machine=i386-unknown
+               os=-go32
+               ;;
        i386-isc* | isc)
                basic_machine=i386-unknown
                os=-iscsysv
@@ -202,9 +210,13 @@ case $basic_machine in
        genix)
                basic_machine=ns32k-ns
                ;;
-       iris | iris4d)
+       iris | iris3 | iris4d)
+               basic_machine=mips-sgi
+               os=-irix3
+               ;;
+       iris4)
                basic_machine=mips-sgi
-               os=-irix
+               os=-irix4
                ;;
        news | news700 | news800 | news900)
                basic_machine=m68k-sony
@@ -272,7 +284,7 @@ case $basic_machine in
                ;;
        next)
                basic_machine=m68k-next
-               os=-sysv
+               os=-bsd
                ;;
        hp9k3[2-9][0-9])
                basic_machine=m68k-hp
@@ -291,6 +303,10 @@ case $basic_machine in
                basic_machine=m68k-apollo
                os=-sysv
                ;;
+       apollo68bsd)
+               basic_machine=m68k-apollo
+               os=-bsd
+               ;;
        altos | altos3068)
                basic_machine=m68k-altos
                ;;
@@ -304,6 +320,9 @@ case $basic_machine in
                basic_machine=mips-sony
                os=-newsos
                ;;
+       st2000)
+               basic_machine=m68kmote-tandem
+               ;;
        decstation-dec | decstation | decstation-3100 | pmax | pmin | dec3100 | decstatn)
                basic_machine=mips-dec
                ;;
@@ -362,9 +381,26 @@ case $basic_machine in
                basic_machine=a29k-amd
                os=-ebmon
                ;;
-       h8300hds)
+
+       h8300hms)
                basic_machine=h8300-hitachi
-               os=-hds
+               os=-hms
+               ;;
+       udi29k)
+               basic_machine=a29k-amd
+               os=-udi
+               ;;
+       a29khif)
+               basic_machine=a29k-amd
+               os=-udi
+               ;;
+       sa29200)
+               basic_machine=a29k-amd
+               os=-udi
+               ;;
+       h8300xray)
+               basic_machine=h8300-hitachi
+               os=-xray
                ;;
        harris)
                basic_machine=m88k-harris
@@ -390,6 +426,10 @@ case $basic_machine in
                basic_machine=i386-ncr
                os=-sysv4
                ;;
+       necv70)
+               basic_machine=v70-nec
+               os=-sysv
+               ;;
        news1000)
                basic_machine=m68030-sony
                os=-newsos
@@ -422,6 +462,11 @@ case $basic_machine in
                basic_machine=m68k-none
                os=-os68k
                ;;
+       sparclite)
+               basic_machine=sparclite-fujitsu
+               os=-none
+               ;;
+
        none)
                basic_machine=none-none
                os=-none
@@ -461,19 +506,20 @@ case $os in
        # First accept the basic system types.
        # The portable systems comes first.
        # Each alternative must end in a *, to match a version number.
-       -bsd* | -sysv* | -mach* | -minix* | -genix* | -ultrix* \
+       -bsd* | -sysv* | -mach* | -minix* | -genix* | -ultrix* | -aout \
              | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos* | -hpux* \
              | -unos* | -osf* | -v88r* | -luna* | -dgux* | -solari* | -sym* \
-             | -amigados* | -msdos* | -none* | -os68k* \
-             | -nindy* | -vxworks* | -ebmon* | -hds* | -m88kbcs*)
-               ;;
+             | -newsos | -amigados* | -msdos* | -none* | -os68k* | -irix* \
+             | -nindy* | -vxworks* | -ebmon* | -udi | -hms* | -xray | -m88kbcs* | -go32)
+       ;;
 # start-sanitize-v9
        -v7 | -v9 | -hal32 | -hal64) ;;
 # end-sanitize-v9
 
-       -newsos*)
-               os=-bsd
-               ;;
+# Note that readline checks for newsos
+#      -newsos*)
+#              os=-bsd
+#              ;;
        -osfrose*)
                os=-osf
                ;;
@@ -486,7 +532,7 @@ case $os in
        -aos*)
                os=-bsd
                ;;
-       -ctix* | -irix* | -uts*)
+       -ctix* | -uts*)
                os=-sysv
                ;;
        -svr4)