forgotten method declaration

[wxWidgets.git] / config.sub

diff --git a/config.sub b/config.sub
index 0432524944d2fe8d27d215bc19ba633c57f1c48a..ac1c2b518725465d06f62c961327fecedc6a7e87 100755 (executable)
--- a/config.sub
+++ b/config.sub
@@ -1,6 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.

-#   Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+#   Free Software Foundation, Inc.
+
+version='2000-11-04'
+

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.


@@ -25,6 +29,8 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 

+# Please send patches to <config-patches@gnu.org>.
+#

 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.


@@ -45,30 +51,61 @@
 #      CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
 #      CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 

-if [ x$1 = x ]
-then
-       echo Configuration name missing. 1>&2
-       echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
-       echo "or     $0 ALIAS" 1>&2
-       echo where ALIAS is a recognized configuration type. 1>&2
-       exit 1
-fi
+me=`echo "$0" | sed -e 's,.*/,,'`

 
 

-# First pass through any local machine types.
-case $1 in
-       *local*)
-               echo $1
-               exit 0
-               ;;
-       *)
-       ;;
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help               print this help, then exit
+  -V, --version            print version number, then exit"
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case "$1" in
+    --version | --vers* | -V )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )        # Use stdin as input.
+       break ;;
+    -* )
+       exec >&2
+       echo "$me: invalid option $1"
+       echo "$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit 0;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;

 esac
 
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
 esac
 
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in

-  linux-gnu*)
+  nto-qnx* | linux-gnu* | storm-chaos*)

     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;


@@ -94,15 +131,25 @@ case $os in
        -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
        -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \

-       -apple)
+       -apple | -axis)
+               os=
+               basic_machine=$1
+               ;;
+       -sim | -cisco | -oki | -wec | -winbond)

                os=
                basic_machine=$1
                ;;
                os=
                basic_machine=$1
                ;;

+       -scout)
+               ;;
+       -wrs)
+               os=-vxworks
+               basic_machine=$1
+               ;;

        -hiux*)
                os=-hiuxwe2
                ;;
        -sco5)
        -hiux*)
                os=-hiuxwe2
                ;;
        -sco5)

-               os=sco3.2v5
+               os=-sco3.2v5

                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                ;;
        -sco4)
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                ;;
        -sco4)


@@ -121,6 +168,9 @@ case $os in
                os=-sco3.2v2
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                ;;
                os=-sco3.2v2
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                ;;

+       -udk*)
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;

        -isc)
                os=-isc2.2
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
        -isc)
                os=-isc2.2
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`


@@ -143,25 +193,46 @@ case $os in
        -psos*)
                os=-psos
                ;;
        -psos*)
                os=-psos
                ;;

+       -mint | -mint[0-9]*)
+               basic_machine=m68k-atari
+               os=-mint
+               ;;

 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
        # Recognize the basic CPU types without company name.
        # Some are omitted here because they have special meanings below.
 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
        # Recognize the basic CPU types without company name.
        # Some are omitted here because they have special meanings below.

-       tahoe | i860 | m68k | m68000 | m88k | ns32k | arm \
-               | arme[lb] | pyramid \
-               | tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
-               | alpha | we32k | ns16k | clipper | i370 | sh \
-               | powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \
-               | pdp11 | mips64el | mips64orion | mips64orionel \
-               | sparc | sparclet | sparclite | sparc64)
+       tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+               | arme[lb] | armv[2345] | armv[345][lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+               | 580 | i960 | h8300 \
+               | x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
+               | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+               | hppa64 \
+               | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+               | alphaev6[78] \
+               | we32k | ns16k | clipper | i370 | sh | sh[34] \
+               | powerpc | powerpcle \
+               | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+               | mips64orion | mips64orionel | mipstx39 | mipstx39el \
+               | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+               | mips64vr5000 | miprs64vr5000el | mcore \
+               | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+               | thumb | d10v | d30v | fr30 | avr)
+               basic_machine=$basic_machine-unknown
+               ;;
+       m6811 | m68hc11 | m6812 | m68hc12)
+               # Motorola 68HC11/12.

                basic_machine=$basic_machine-unknown
                basic_machine=$basic_machine-unknown

+               os=-none
+               ;;
+       m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)

                ;;
                ;;

+

        # We use `pc' rather than `unknown'
        # because (1) that's what they normally are, and
        # (2) the word "unknown" tends to confuse beginning users.
        # We use `pc' rather than `unknown'
        # because (1) that's what they normally are, and
        # (2) the word "unknown" tends to confuse beginning users.

-       i[3456]86)
+       i[234567]86 | x86_64)

          basic_machine=$basic_machine-pc
          ;;
        # Object if more than one company name word.
          basic_machine=$basic_machine-pc
          ;;
        # Object if more than one company name word.


@@ -170,23 +241,49 @@ case $basic_machine in
                exit 1
                ;;
        # Recognize the basic CPU types with company name.
                exit 1
                ;;
        # Recognize the basic CPU types with company name.

-       vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
-             | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
-             | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
-             | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
-             | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
-             | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
-             | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
-             | mips64el-* | mips64orion-* | mips64orionel-* | f301-*)
+       # FIXME: clean up the formatting here.
+       vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+             | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+             | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+             | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+             | xmp-* | ymp-* \
+             | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
+             | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
+             | hppa2.0n-* | hppa64-* \
+             | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
+             | alphaev6[78]-* \
+             | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+             | clipper-* | orion-* \
+             | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+             | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+             | mips64el-* | mips64orion-* | mips64orionel-* \
+             | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+             | mipstx39-* | mipstx39el-* | mcore-* \
+             | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
+             | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+             | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
+             | bs2000-* | tic54x-* | c54x-* | x86_64-*)

                ;;
        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.
                ;;
        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.

+       386bsd)
+               basic_machine=i386-unknown
+               os=-bsd
+               ;;

        3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
                basic_machine=m68000-att
                ;;
        3b*)
                basic_machine=we32k-att
                ;;
        3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
                basic_machine=m68000-att
                ;;
        3b*)
                basic_machine=we32k-att
                ;;

+       a29khif)
+               basic_machine=a29k-amd
+               os=-udi
+               ;;
+       adobe68k)
+               basic_machine=m68010-adobe
+               os=-scout
+               ;;

        alliant | fx80)
                basic_machine=fx80-alliant
                ;;
        alliant | fx80)
                basic_machine=fx80-alliant
                ;;


@@ -202,20 +299,24 @@ case $basic_machine in
                os=-sysv
                ;;
        amiga | amiga-*)
                os=-sysv
                ;;
        amiga | amiga-*)

-               basic_machine=m68k-cbm
+               basic_machine=m68k-unknown

                ;;
                ;;

-       amigados)
-               basic_machine=m68k-cbm
-               os=-amigados
+       amigaos | amigados)
+               basic_machine=m68k-unknown
+               os=-amigaos

                ;;
        amigaunix | amix)
                ;;
        amigaunix | amix)

-               basic_machine=m68k-cbm
+               basic_machine=m68k-unknown

                os=-sysv4
                ;;
        apollo68)
                basic_machine=m68k-apollo
                os=-sysv
                ;;
                os=-sysv4
                ;;
        apollo68)
                basic_machine=m68k-apollo
                os=-sysv
                ;;

+       apollo68bsd)
+               basic_machine=m68k-apollo
+               os=-bsd
+               ;;

        aux)
                basic_machine=m68k-apple
                os=-aux
        aux)
                basic_machine=m68k-apple
                os=-aux


@@ -259,6 +360,9 @@ case $basic_machine in
        crds | unos)
                basic_machine=m68k-crds
                ;;
        crds | unos)
                basic_machine=m68k-crds
                ;;

+       cris | cris-* | etrax*)
+               basic_machine=cris-axis
+               ;;

        da30 | da30-*)
                basic_machine=m68k-da30
                ;;
        da30 | da30-*)
                basic_machine=m68k-da30
                ;;


@@ -292,6 +396,10 @@ case $basic_machine in
        encore | umax | mmax)
                basic_machine=ns32k-encore
                ;;
        encore | umax | mmax)
                basic_machine=ns32k-encore
                ;;

+       es1800 | OSE68k | ose68k | ose | OSE)
+               basic_machine=m68k-ericsson
+               os=-ose
+               ;;

        fx2800)
                basic_machine=i860-alliant
                ;;
        fx2800)
                basic_machine=i860-alliant
                ;;


@@ -310,6 +418,14 @@ case $basic_machine in
                basic_machine=h8300-hitachi
                os=-hms
                ;;
                basic_machine=h8300-hitachi
                os=-hms
                ;;

+       h8300xray)
+               basic_machine=h8300-hitachi
+               os=-xray
+               ;;
+       h8500hms)
+               basic_machine=h8500-hitachi
+               os=-hms
+               ;;

        harris)
                basic_machine=m88k-harris
                os=-sysv3
        harris)
                basic_machine=m88k-harris
                os=-sysv3


@@ -325,13 +441,30 @@ case $basic_machine in
                basic_machine=m68k-hp
                os=-hpux
                ;;
                basic_machine=m68k-hp
                os=-hpux
                ;;

+       hp3k9[0-9][0-9] | hp9[0-9][0-9])
+               basic_machine=hppa1.0-hp
+               ;;

        hp9k2[0-9][0-9] | hp9k31[0-9])
                basic_machine=m68000-hp
                ;;
        hp9k3[2-9][0-9])
                basic_machine=m68k-hp
                ;;
        hp9k2[0-9][0-9] | hp9k31[0-9])
                basic_machine=m68000-hp
                ;;
        hp9k3[2-9][0-9])
                basic_machine=m68k-hp
                ;;

-       hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
+       hp9k6[0-9][0-9] | hp6[0-9][0-9])
+               basic_machine=hppa1.0-hp
+               ;;
+       hp9k7[0-79][0-9] | hp7[0-79][0-9])
+               basic_machine=hppa1.1-hp
+               ;;
+       hp9k78[0-9] | hp78[0-9])
+               # FIXME: really hppa2.0-hp
+               basic_machine=hppa1.1-hp
+               ;;
+       hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+               # FIXME: really hppa2.0-hp
+               basic_machine=hppa1.1-hp
+               ;;
+       hp9k8[0-9][13679] | hp8[0-9][13679])

                basic_machine=hppa1.1-hp
                ;;
        hp9k8[0-9][0-9] | hp8[0-9][0-9])
                basic_machine=hppa1.1-hp
                ;;
        hp9k8[0-9][0-9] | hp8[0-9][0-9])


@@ -340,27 +473,54 @@ case $basic_machine in
        hppa-next)
                os=-nextstep3
                ;;
        hppa-next)
                os=-nextstep3
                ;;

+       hppaosf)
+               basic_machine=hppa1.1-hp
+               os=-osf
+               ;;
+       hppro)
+               basic_machine=hppa1.1-hp
+               os=-proelf
+               ;;

        i370-ibm* | ibm*)
                basic_machine=i370-ibm
        i370-ibm* | ibm*)
                basic_machine=i370-ibm

-               os=-mvs

                ;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
                ;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?

-       i[3456]86v32)
+       i[34567]86v32)

                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                os=-sysv32
                ;;
                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                os=-sysv32
                ;;

-       i[3456]86v4*)
+       i[34567]86v4*)

                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                os=-sysv4
                ;;
                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                os=-sysv4
                ;;

-       i[3456]86v)
+       i[34567]86v)

                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                os=-sysv
                ;;
                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                os=-sysv
                ;;

-       i[3456]86sol2)
+       i[34567]86sol2)

                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                os=-solaris2
                ;;
                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                os=-solaris2
                ;;

+       i386mach)
+               basic_machine=i386-mach
+               os=-mach
+               ;;
+       i386-vsta | vsta)
+               basic_machine=i386-unknown
+               os=-vsta
+               ;;
+       i386-go32 | go32)
+               basic_machine=i386-unknown
+               os=-go32
+               ;;
+       i386-mingw32 | mingw32)
+               basic_machine=i386-unknown
+               os=-mingw32
+               ;;
+       i[34567]86-pw32 | pw32)
+               basic_machine=i586-unknown
+               os=-pw32
+               ;;

        iris | iris4d)
                basic_machine=mips-sgi
                case $os in
        iris | iris4d)
                basic_machine=mips-sgi
                case $os in


@@ -389,16 +549,52 @@ case $basic_machine in
        miniframe)
                basic_machine=m68000-convergent
                ;;
        miniframe)
                basic_machine=m68000-convergent
                ;;

+       *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+               basic_machine=m68k-atari
+               os=-mint
+               ;;
+       mipsel*-linux*)
+               basic_machine=mipsel-unknown
+               os=-linux-gnu
+               ;;
+       mips*-linux*)
+               basic_machine=mips-unknown
+               os=-linux-gnu
+               ;;

        mips3*-*)
                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
                ;;
        mips3*)
                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
                ;;
        mips3*-*)
                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
                ;;
        mips3*)
                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
                ;;

+       mmix*)
+               basic_machine=mmix-knuth
+               os=-mmixware
+               ;;
+       monitor)
+               basic_machine=m68k-rom68k
+               os=-coff
+               ;;
+       msdos)
+               basic_machine=i386-unknown
+               os=-msdos
+               ;;
+       mvs)
+               basic_machine=i370-ibm
+               os=-mvs
+               ;;

        ncr3000)
                basic_machine=i486-ncr
                os=-sysv4
                ;;
        ncr3000)
                basic_machine=i486-ncr
                os=-sysv4
                ;;

+       netbsd386)
+               basic_machine=i386-unknown
+               os=-netbsd
+               ;;
+       netwinder)
+               basic_machine=armv4l-rebel
+               os=-linux
+               ;;

        news | news700 | news800 | news900)
                basic_machine=m68k-sony
                os=-newsos
        news | news700 | news800 | news900)
                basic_machine=m68k-sony
                os=-newsos


@@ -411,6 +607,10 @@ case $basic_machine in
                basic_machine=mips-sony
                os=-newsos
                ;;
                basic_machine=mips-sony
                os=-newsos
                ;;

+       necv70)
+               basic_machine=v70-nec
+               os=-sysv
+               ;;

        next | m*-next )
                basic_machine=m68k-next
                case $os in
        next | m*-next )
                basic_machine=m68k-next
                case $os in


@@ -436,9 +636,32 @@ case $basic_machine in
                basic_machine=i960-intel
                os=-nindy
                ;;
                basic_machine=i960-intel
                os=-nindy
                ;;

+       mon960)
+               basic_machine=i960-intel
+               os=-mon960
+               ;;
+       nonstopux)
+               basic_machine=mips-compaq
+               os=-nonstopux
+               ;;

        np1)
                basic_machine=np1-gould
                ;;
        np1)
                basic_machine=np1-gould
                ;;

+       nsr-tandem)
+               basic_machine=nsr-tandem
+               ;;
+       op50n-* | op60c-*)
+               basic_machine=hppa1.1-oki
+               os=-proelf
+               ;;
+       OSE68000 | ose68000)
+               basic_machine=m68000-ericsson
+               os=-ose
+               ;;
+       os68k)
+               basic_machine=m68k-none
+               os=-os68k
+               ;;

        pa-hitachi)
                basic_machine=hppa1.1-hitachi
                os=-hiuxwe2
        pa-hitachi)
                basic_machine=hppa1.1-hitachi
                os=-hiuxwe2


@@ -456,25 +679,23 @@ case $basic_machine in
         pc532 | pc532-*)
                basic_machine=ns32k-pc532
                ;;
         pc532 | pc532-*)
                basic_machine=ns32k-pc532
                ;;

-       pentium | p5)
-               basic_machine=i586-intel
+       pentium | p5 | k5 | k6 | nexgen)
+               basic_machine=i586-pc
+               ;;
+       pentiumpro | p6 | 6x86 | athlon)
+               basic_machine=i686-pc

                ;;
                ;;

-       pentiumpro | p6)
-               basic_machine=i686-intel
+       pentiumii | pentium2)
+               basic_machine=i786-pc

                ;;
                ;;

-       pentium-* | p5-*)
+       pentium-* | p5-* | k5-* | k6-* | nexgen-*)

                basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
                basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;

-       pentiumpro-* | p6-*)
+       pentiumpro-* | p6-* | 6x86-* | athlon-*)

                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;

-       k5)
-               # We don't have specific support for AMD's K5 yet, so just call it a Pentium
-               basic_machine=i586-amd
-               ;;
-       nexen)
-               # We don't have specific support for Nexgen yet, so just call it a Pentium
-               basic_machine=i586-nexgen
+       pentiumii-* | pentium2-*)
+               basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`

                ;;
        pn)
                basic_machine=pn-gould
                ;;
        pn)
                basic_machine=pn-gould


@@ -494,12 +715,20 @@ case $basic_machine in
        ps2)
                basic_machine=i386-ibm
                ;;
        ps2)
                basic_machine=i386-ibm
                ;;

+       rom68k)
+               basic_machine=m68k-rom68k
+               os=-coff
+               ;;

        rm[46]00)
                basic_machine=mips-siemens
                ;;
        rtpc | rtpc-*)
                basic_machine=romp-ibm
                ;;
        rm[46]00)
                basic_machine=mips-siemens
                ;;
        rtpc | rtpc-*)
                basic_machine=romp-ibm
                ;;

+       sa29200)
+               basic_machine=a29k-amd
+               os=-udi
+               ;;

        sequent)
                basic_machine=i386-sequent
                ;;
        sequent)
                basic_machine=i386-sequent
                ;;


@@ -507,6 +736,10 @@ case $basic_machine in
                basic_machine=sh-hitachi
                os=-hms
                ;;
                basic_machine=sh-hitachi
                os=-hms
                ;;

+       sparclite-wrs)
+               basic_machine=sparclite-wrs
+               os=-vxworks
+               ;;

        sps7)
                basic_machine=m68k-bull
                os=-sysv2
        sps7)
                basic_machine=m68k-bull
                os=-sysv2


@@ -514,6 +747,13 @@ case $basic_machine in
        spur)
                basic_machine=spur-unknown
                ;;
        spur)
                basic_machine=spur-unknown
                ;;

+       st2000)
+               basic_machine=m68k-tandem
+               ;;
+       stratus)
+               basic_machine=i860-stratus
+               os=-sysv4
+               ;;

        sun2)
                basic_machine=m68000-sun
                ;;
        sun2)
                basic_machine=m68000-sun
                ;;


@@ -554,10 +794,28 @@ case $basic_machine in
        sun386 | sun386i | roadrunner)
                basic_machine=i386-sun
                ;;
        sun386 | sun386i | roadrunner)
                basic_machine=i386-sun
                ;;

+       sv1)
+               basic_machine=sv1-cray
+               os=-unicos
+               ;;

        symmetry)
                basic_machine=i386-sequent
                os=-dynix
                ;;
        symmetry)
                basic_machine=i386-sequent
                os=-dynix
                ;;

+       t3e)
+               basic_machine=t3e-cray
+               os=-unicos
+               ;;
+       tic54x | c54x*)
+               basic_machine=tic54x-unknown
+               os=-coff
+               ;;
+       tx39)
+               basic_machine=mipstx39-unknown
+               ;;
+       tx39el)
+               basic_machine=mipstx39el-unknown
+               ;;

        tower | tower-32)
                basic_machine=m68k-ncr
                ;;
        tower | tower-32)
                basic_machine=m68k-ncr
                ;;


@@ -569,6 +827,10 @@ case $basic_machine in
                basic_machine=a29k-nyu
                os=-sym1
                ;;
                basic_machine=a29k-nyu
                os=-sym1
                ;;

+       v810 | necv810)
+               basic_machine=v810-nec
+               os=-none
+               ;;

        vaxv)
                basic_machine=vax-dec
                os=-sysv
        vaxv)
                basic_machine=vax-dec
                os=-sysv


@@ -577,7 +839,7 @@ case $basic_machine in
                basic_machine=vax-dec
                os=-vms
                ;;
                basic_machine=vax-dec
                os=-vms
                ;;

-       vpp*|vx|vx-*)
+       vpp*|vx|vx-*)

                basic_machine=f301-fujitsu
                ;;
        vxworks960)
                basic_machine=f301-fujitsu
                ;;
        vxworks960)


@@ -592,6 +854,14 @@ case $basic_machine in
                basic_machine=a29k-wrs
                os=-vxworks
                ;;
                basic_machine=a29k-wrs
                os=-vxworks
                ;;

+       w65*)
+               basic_machine=w65-wdc
+               os=-none
+               ;;
+       w89k-*)
+               basic_machine=hppa1.1-winbond
+               os=-proelf
+               ;;

        xmp)
                basic_machine=xmp-cray
                os=-unicos
        xmp)
                basic_machine=xmp-cray
                os=-unicos


@@ -599,6 +869,10 @@ case $basic_machine in
         xps | xps100)
                basic_machine=xps100-honeywell
                ;;
         xps | xps100)
                basic_machine=xps100-honeywell
                ;;

+       z8k-*-coff)
+               basic_machine=z8k-unknown
+               os=-sim
+               ;;

        none)
                basic_machine=none-none
                os=-none
        none)
                basic_machine=none-none
                os=-none


@@ -606,8 +880,21 @@ case $basic_machine in
 
 # Here we handle the default manufacturer of certain CPU types.  It is in
 # some cases the only manufacturer, in others, it is the most popular.
 
 # Here we handle the default manufacturer of certain CPU types.  It is in
 # some cases the only manufacturer, in others, it is the most popular.

+       w89k)
+               basic_machine=hppa1.1-winbond
+               ;;
+       op50n)
+               basic_machine=hppa1.1-oki
+               ;;
+       op60c)
+               basic_machine=hppa1.1-oki
+               ;;

        mips)
        mips)

-               basic_machine=mips-mips
+               if [ x$os = x-linux-gnu ]; then
+                       basic_machine=mips-unknown
+               else
+                       basic_machine=mips-mips
+               fi

                ;;
        romp)
                basic_machine=romp-ibm
                ;;
        romp)
                basic_machine=romp-ibm


@@ -624,7 +911,10 @@ case $basic_machine in
        we32k)
                basic_machine=we32k-att
                ;;
        we32k)
                basic_machine=we32k-att
                ;;

-       sparc)
+       sh3 | sh4)
+               basic_machine=sh-unknown
+               ;;
+       sparc | sparcv9)

                basic_machine=sparc-sun
                ;;
         cydra)
                basic_machine=sparc-sun
                ;;
         cydra)


@@ -636,6 +926,16 @@ case $basic_machine in
        orion105)
                basic_machine=clipper-highlevel
                ;;
        orion105)
                basic_machine=clipper-highlevel
                ;;

+       mac | mpw | mac-mpw)
+               basic_machine=m68k-apple
+               ;;
+       pmac | pmac-mpw)
+               basic_machine=powerpc-apple
+               ;;
+       c4x*)
+               basic_machine=c4x-none
+               os=-coff
+               ;;

        *)
                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
                exit 1
        *)
                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
                exit 1


@@ -668,9 +968,12 @@ case $os in
        -solaris)
                os=-solaris2
                ;;
        -solaris)
                os=-solaris2
                ;;

-       -unixware* | svr4*)
+       -svr4*)

                os=-sysv4
                ;;
                os=-sysv4
                ;;

+       -unixware*)
+               os=-sysv4.2uw
+               ;;

        -gnu/linux*)
                os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
                ;;
        -gnu/linux*)
                os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
                ;;


@@ -681,17 +984,39 @@ case $os in
        -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
              | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
        -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
              | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \

-             | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
+             | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+             | -aos* \

              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
              | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
              | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \

-             | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
+             | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \

              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \

-             | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-             | -linux-gnu* | -uxpv*)
+             | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+             | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+             | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+             | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* | -storm-chaos*)

        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;

+       -qnx*)
+               case $basic_machine in
+                   x86-* | i[34567]86-*)
+                       ;;
+                   *)
+                       os=-nto$os
+                       ;;
+               esac
+               ;;
+       -nto*)
+               os=-nto-qnx
+               ;;
+       -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+             | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+             | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+               ;;
+       -mac*)
+               os=`echo $os | sed -e 's|mac|macos|'`
+               ;;

        -linux*)
                os=`echo $os | sed -e 's|linux|linux-gnu|'`
                ;;
        -linux*)
                os=`echo $os | sed -e 's|linux|linux-gnu|'`
                ;;


@@ -701,6 +1026,12 @@ case $os in
        -sunos6*)
                os=`echo $os | sed -e 's|sunos6|solaris3|'`
                ;;
        -sunos6*)
                os=`echo $os | sed -e 's|sunos6|solaris3|'`
                ;;

+       -opened*)
+               os=-openedition
+               ;;
+       -wince*)
+               os=-wince
+               ;;

        -osfrose*)
                os=-osfrose
                ;;
        -osfrose*)
                os=-osfrose
                ;;


@@ -716,12 +1047,18 @@ case $os in
        -acis*)
                os=-aos
                ;;
        -acis*)
                os=-aos
                ;;

+       -386bsd)
+               os=-bsd
+               ;;

        -ctix* | -uts*)
                os=-sysv
                ;;
        -ns2 )
                os=-nextstep2
                ;;
        -ctix* | -uts*)
                os=-sysv
                ;;
        -ns2 )
                os=-nextstep2
                ;;

+       -nsk*)
+               os=-nsk
+               ;;

        # Preserve the version number of sinix5.
        -sinix5.*)
                os=`echo $os | sed -e 's|sinix|sysv|'`
        # Preserve the version number of sinix5.
        -sinix5.*)
                os=`echo $os | sed -e 's|sinix|sysv|'`


@@ -747,9 +1084,18 @@ case $os in
        # This must come after -sysvr4.
        -sysv*)
                ;;
        # This must come after -sysvr4.
        -sysv*)
                ;;

+       -ose*)
+               os=-ose
+               ;;
+       -es1800*)
+               os=-ose
+               ;;

        -xenix)
                os=-xenix
                ;;
        -xenix)
                os=-xenix
                ;;

+        -*mint | -*MiNT)
+               os=-mint
+               ;;

        -none)
                ;;
        *)
        -none)
                ;;
        *)


@@ -775,6 +1121,9 @@ case $basic_machine in
        *-acorn)
                os=-riscix1.2
                ;;
        *-acorn)
                os=-riscix1.2
                ;;

+       arm*-rebel)
+               os=-linux
+               ;;

        arm*-semi)
                os=-aout
                ;;
        arm*-semi)
                os=-aout
                ;;


@@ -796,15 +1145,36 @@ case $basic_machine in
                # default.
                # os=-sunos4
                ;;
                # default.
                # os=-sunos4
                ;;

+       m68*-cisco)
+               os=-aout
+               ;;
+       mips*-cisco)
+               os=-elf
+               ;;
+       mips*-*)
+               os=-elf
+               ;;

        *-tti)  # must be before sparc entry or we get the wrong os.
                os=-sysv3
                ;;
        sparc-* | *-sun)
                os=-sunos4.1.1
                ;;
        *-tti)  # must be before sparc entry or we get the wrong os.
                os=-sysv3
                ;;
        sparc-* | *-sun)
                os=-sunos4.1.1
                ;;

+       *-be)
+               os=-beos
+               ;;

        *-ibm)
                os=-aix
                ;;
        *-ibm)
                os=-aix
                ;;

+       *-wec)
+               os=-proelf
+               ;;
+       *-winbond)
+               os=-proelf
+               ;;
+       *-oki)
+               os=-proelf
+               ;;

        *-hp)
                os=-hpux
                ;;
        *-hp)
                os=-hpux
                ;;


@@ -815,7 +1185,7 @@ case $basic_machine in
                os=-sysv
                ;;
        *-cbm)
                os=-sysv
                ;;
        *-cbm)

-               os=-amigados
+               os=-amigaos

                ;;
        *-dg)
                os=-dgux
                ;;
        *-dg)
                os=-dgux


@@ -868,6 +1238,18 @@ case $basic_machine in
        f301-fujitsu)
                os=-uxpv
                ;;
        f301-fujitsu)
                os=-uxpv
                ;;

+       *-rom68k)
+               os=-coff
+               ;;
+       *-*bug)
+               os=-coff
+               ;;
+       *-apple)
+               os=-macos
+               ;;
+       *-atari*)
+               os=-mint
+               ;;

        *)
                os=-none
                ;;
        *)
                os=-none
                ;;


@@ -889,9 +1271,15 @@ case $basic_machine in
                        -aix*)
                                vendor=ibm
                                ;;
                        -aix*)
                                vendor=ibm
                                ;;

+                       -beos*)
+                               vendor=be
+                               ;;

                        -hpux*)
                                vendor=hp
                                ;;
                        -hpux*)
                                vendor=hp
                                ;;

+                       -mpeix*)
+                               vendor=hp
+                               ;;

                        -hiux*)
                                vendor=hitachi
                                ;;
                        -hiux*)
                                vendor=hitachi
                                ;;


@@ -907,7 +1295,7 @@ case $basic_machine in
                        -genix*)
                                vendor=ns
                                ;;
                        -genix*)
                                vendor=ns
                                ;;

-                       -mvs*)
+                       -mvs* | -opened*)

                                vendor=ibm
                                ;;
                        -ptx*)
                                vendor=ibm
                                ;;
                        -ptx*)


@@ -919,9 +1307,26 @@ case $basic_machine in
                        -aux*)
                                vendor=apple
                                ;;
                        -aux*)
                                vendor=apple
                                ;;

+                       -hms*)
+                               vendor=hitachi
+                               ;;
+                       -mpw* | -macos*)
+                               vendor=apple
+                               ;;
+                       -*mint | -*MiNT)
+                               vendor=atari
+                               ;;

                esac
                basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
                ;;
 esac
 
 echo $basic_machine$os
                esac
                basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
                ;;
 esac
 
 echo $basic_machine$os

+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "version='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End: