From d1c8b8694a5dc3250e7e45970964adf090d60cd5 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 3 Oct 1994 16:41:46 +0000 Subject: * config.sub: Remove extraneous differences between config.sub and gcc/config.sub. --- config.sub | 242 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 118 insertions(+), 124 deletions(-) (limited to 'config.sub') diff --git a/config.sub b/config.sub index 7a0ead0..b64ec52 100755 --- a/config.sub +++ b/config.sub @@ -38,7 +38,7 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM # It is wrong to echo any other type of specification. -if [ x$1 = x ] +if [ x$1 = x ] # CYGNUS LOCAL then echo Configuration name missing. 1>&2 echo "Usage: $0 CPU-MFR-OPSYS" 1>&2 @@ -120,14 +120,11 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'` ;; - -lynx*) + -lynx*) # CYGNUS LOCAL: lynx os=-lynxos ;; - -os9k) - os=-os9k - ;; - -os9) - os=-os9 + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` ;; esac @@ -135,15 +132,13 @@ esac case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. - tahoe | i[34]86 | i860 | m68k | m68000 | m88k | ns32k | arm | pyramid \ - | tron | a29k | 580 | i960 | hppa1.0 | hppa1.1 \ - | alpha | we32k | ns16k | clipper | sparclite | i370 \ - | powerpc \ - | h8300 | h8300h | sh \ + tahoe | i[345]86 | i860 | m68k | m68000 | m88k | ns32k | arm | pyramid \ + | tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \ + | alpha | we32k | ns16k | clipper | sparclite | i370 | sh \ + | powerpc | sparc64 | 1750a | dsp16xx | mips64 | mipsel \ + | mips64el | mips64orion | mips64orionel \ | m88110 | sparc | m680[01234]0 | m683?2 | z8k | v70 \ - | v810 \ - | h8500 | mips64 | mipsel | mips64el \ - | mips64orion | mips64orionel ) # CYGNUS LOCAL + | h8500 | h8300h) # CYGNUS LOCAL basic_machine=$basic_machine-unknown ;; # Object if more than one company name word. @@ -152,17 +147,16 @@ case $basic_machine in exit 1 ;; # Recognize the basic CPU types with company name. - vax-* | tahoe-* | i[34]86-* | i860-* | m68k-* | m68000-* | m88k-* \ + vax-* | tahoe-* | i[345]86-* | i860-* | m68k-* | m68000-* | m88k-* \ | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \ | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ - | none-* | 580-* | cray2-* | i960-* | xmp-* | ymp-* \ + | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \ | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \ | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \ - | powerpc-* \ - | h8300-* | h8300h-* | sh-* \ - | m88110-* | m680[01234]0-* | m683?2-* | z8k-* | h8500-* \ - | mips64-* | mipsel-* | mips64el-* \ - | mips64orion-* | mips64orionel-* ) # CYGNUS LOCAL + | sh-* | powerpc-* | sparc64-* | mips64-* | mipsel-* \ + | mips64el-* | mips64orion-* | mips64orionel-* \ + | m88110-* | m680[01234]0-* | m683?2-* | z8k-* \ + | h8500-* | h8300h-* ) # CYGNUS LOCAL ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -198,7 +192,7 @@ case $basic_machine in basic_machine=580-amdahl os=-sysv ;; - amiga) + amiga | amiga-*) basic_machine=m68k-cbm ;; amigados) @@ -221,10 +215,6 @@ case $basic_machine in basic_machine=ns32k-sequent os=-dynix ;; - m68k-ccur) - basic_machine=m68k-ccur - os=-rtu - ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -256,7 +246,10 @@ case $basic_machine in crds | unos) basic_machine=m68k-crds ;; - decstation | decstation-3100 | pmax | pmin | dec3100 | decstatn) + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; delta | 3300 | motorola-3300 | motorola-delta \ @@ -300,10 +293,6 @@ case $basic_machine in basic_machine=tron-gmicro os=-sysv ;; - go32 | i386-go32) # CYGNUS LOCAL - basic_machine=i386-unknown - os=-go32 - ;; h3050r* | hiux*) basic_machine=hppa1.1-hitachi os=-hiuxwe2 @@ -328,8 +317,8 @@ case $basic_machine in basic_machine=m88k-harris os=-sysv3 ;; - h3050r* | hppahitachi) - basic_machine=hppa1.1-hitachi + hp300-*) + basic_machine=m68k-hp ;; hp300bsd) basic_machine=m68k-hp @@ -339,6 +328,22 @@ case $basic_machine in basic_machine=m68k-hp os=-hpux ;; + w89k-*) # CYGNUS LOCAL + basic_machine=hppa1.1-winbond + os=-proelf + ;; + op50n-*) # CYGNUS LOCAL + basic_machine=hppa1.1-oki + os=-proelf + ;; + op60c-*) # CYGNUS LOCAL + basic_machine=hppa1.1-oki + os=-proelf + ;; + hppro) # CYGNUS LOCAL + basic_machine=hppa1.1-hp + os=-proelf + ;; hp9k2[0-9][0-9] | hp9k31[0-9]) basic_machine=m68000-hp ;; @@ -355,47 +360,39 @@ case $basic_machine in basic_machine=hppa1.1-hp os=-osf ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-pro - ;; - op50n-*) - basic_machine=hppa1.1-oki - os=-pro - ;; - op60c-*) - basic_machine=hppa1.1-oki - os=-pro - ;; - hppro) - basic_machine=hppa1.1-hp - os=-pro - ;; i370-ibm* | ibm*) basic_machine=i370-ibm os=-mvs ;; - i386mach) # CYGNUS LOCAL - basic_machine=i386-mach - os=-mach - ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? - i[34]86v32) + i[345]86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'` os=-sysv32 ;; - i[34]86v4*) + i[345]86v4*) basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'` os=-sysv4 ;; - i[34]86v) + i[345]86v) basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'` os=-sysv ;; - i[34]86sol2) + i[345]86sol2) basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'` os=-solaris2 ;; + i386mach) # CYGNUS LOCAL + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) # CYGNUS LOCAL + basic_machine=i386-unknown + os=-vsta + ;; + i386-go32 | go32) # CYGNUS LOCAL + basic_machine=i386-unknown + os=-go32 + ;; i386-linux* | linux) # CYGNUS LOCAL basic_machine=i386-unknown os=-linux @@ -423,10 +420,6 @@ case $basic_machine in basic_machine=m68k-isi os=-sysv ;; - m6*bug) # CYGNUS LOCAL - basic_machine=m68k-bug - os=-coff - ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -439,18 +432,18 @@ case $basic_machine in os=-sysv ;; miniframe) - basic_machine=m68010-convergent + basic_machine=m68000-convergent ;; - mips3-*) # CYGNUS LOCAL + mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; - mips3) # CYGNUS LOCAL - basic_machine=mips64-unknown + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - monitor) # CYGNUS LOCAL - basic_machine=m68k-rom68k + monitor) # CYGNUS LOCAL + basic_machine=m68k-rom68k os=-coff - ;; + ;; msdos) # CYGNUS LOCAL basic_machine=i386-unknown os=-msdos @@ -459,10 +452,6 @@ case $basic_machine in basic_machine=i486-ncr os=-sysv4 ;; - necv70) # CYGNUS LOCAL - basic_machine=v70-nec - os=-sysv - ;; netbsd386) basic_machine=i386-unknown # CYGNUS LOCAL os=-netbsd @@ -479,10 +468,17 @@ case $basic_machine in basic_machine=mips-sony os=-newsos ;; - next) + necv70) # CYGNUS LOCAL + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next ) basic_machine=m68k-next case $os in - -ns2* | -nextstep2*) + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 ;; *) os=-nextstep3 @@ -504,14 +500,14 @@ case $basic_machine in np1) basic_machine=np1-gould ;; - os68k) # CYGNUS LOCAL - basic_machine=m68k-none - os=-os68k - ;; OSE68000 | ose68000) # CYGNUS LOCAL basic_machine=m68000-ericsson os=-ose ;; + os68k) # CYGNUS LOCAL + basic_machine=m68k-none + os=-os68k + ;; pa-hitachi) basic_machine=hppa1.1-hitachi os=-hiuxwe2 @@ -526,19 +522,24 @@ case $basic_machine in pbb) basic_machine=m68k-tti ;; - pc532) + pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pentium-*) + # We will change tis to say i586 once there has been + # time for various packages to start to recognize that. + basic_machine=i486-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould ;; ps2) basic_machine=i386-ibm ;; - rom68k) # CYGNUS LOCAL - basic_machine=m68k-rom68k + rom68k) # CYGNUS LOCAL + basic_machine=m68k-rom68k os=-coff - ;; + ;; rtpc | rtpc-*) basic_machine=romp-ibm ;; @@ -546,17 +547,13 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; - sh*) # CYGNUS LOCAL + sequent) + basic_machine=i386-sequent + ;; + sh) basic_machine=sh-hitachi os=-hms ;; - sparc64) # CYGNUS LOCAL - basic_machine=sparc64-sun - os=-elf - ;; - sparc64-*) # CYGNUS LOCAL - ;; - sparclite-wrs) # CYGNUS LOCAL basic_machine=sparclite-wrs os=-vxworks @@ -620,7 +617,7 @@ case $basic_machine in basic_machine=sparc-sun os=-solaris2 ;; - sun3) + sun3 | sun3-*) basic_machine=m68k-sun ;; sun4) @@ -668,10 +665,6 @@ case $basic_machine in basic_machine=m68k-wrs os=-vxworks ;; - vsta | i386-vsta) # CYGNUS LOCAL - basic_machine=i386-unknown - os=-vsta - ;; xmp) basic_machine=xmp-cray os=-unicos @@ -680,7 +673,7 @@ case $basic_machine in basic_machine=xps100-honeywell ;; z8ksim) # CYGNUS LOCAL - basic_machine=z8k-zilog + basic_machine=z8k-unknown os=-sim ;; none) @@ -690,13 +683,13 @@ 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. - w89k) # CYGNUS LOCAL + w89k) # CYGNUS LOCAL basic_machine=hppa1.1-winbond ;; - op50n) # CYGNUS LOCAL + op50n) # CYGNUS LOCAL basic_machine=hppa1.1-oki ;; - op60c) # CYGNUS LOCAL + op60c) # CYGNUS LOCAL basic_machine=hppa1.1-oki ;; mips) @@ -769,18 +762,19 @@ case $os in # Each alternative must end in a *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]* | -hpux* \ - | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[345]* \ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \ | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \ | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -freebsd* | -nextstep* \ - | -riscix* | -lynxos* | -go32 | -vsta | -pro | -proelf \ - | -sim | -es1800* | -udi | -hms* | -xray | -hds* \ - | -os68k* | -none* | -v88r* | -aout* | -coff | -elf* | -bosx* \ - | -abug | -ecoff* | -netware* | -os9* ) + | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* \ + | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \ + | -ptx* \ + | -go32 | -vsta | -sim | -es1800* | -udi | -hms* | -xray | -hds* \ + | -os68k* | -none* | -v88r* | -coff \ + | -abug | -ecoff* | -netware* | -proelf | -os9* ) # The last three lines above are CYGNUS LOCAL - ;; + ;; -sunos5*) os=`echo $os | sed -e 's|sunos5|solaris2|'` ;; @@ -817,7 +811,7 @@ case $os in -svr4) os=-sysv4 ;; - -unixware) + -unixware) # CYGNUS LOCAL os=-sysv4 ;; -svr3) @@ -835,9 +829,6 @@ case $os in -es1800*) # CYGNUS LOCAL os=-ose ;; - -cxux7*) - os=-cxux7 - ;; -xenix) os=-xenix ;; @@ -845,7 +836,7 @@ case $os in ;; *) # Get rid of the `-' at the beginning of $os. - os=`echo $1 | sed 's/[^-]*-//'` + os=`echo $os | sed 's/[^-]*-//'` echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 exit 1 ;; @@ -893,17 +884,17 @@ case $basic_machine in *-ibm) os=-aix ;; - *-hp) - os=-hpux - ;; *-wec) # CYGNUS LOCAL - os=-pro + os=-proelf ;; *-winbond) # CYGNUS LOCAL - os=-pro + os=-proelf ;; *-oki) # CYGNUS LOCAL - os=-pro + os=-proelf + ;; + *-hp) + os=-hpux ;; *-hitachi) os=-hiux @@ -920,11 +911,14 @@ case $basic_machine in *-dolphin) os=-sysv3 ;; + m68k-ccur) + os=-rtu + ;; m88k-omron*) os=-luna ;; *-sequent) - os=-bsd + os=-ptx ;; *-crds) os=-unos @@ -936,10 +930,7 @@ case $basic_machine in os=-mvs ;; *-next) - os=-nextstep - ;; - i[34]86-*) - os=-sco3.2v2 + os=-nextstep3 ;; *-gould) os=-sysv @@ -1015,6 +1006,9 @@ case $basic_machine in -mvs*) vendor=ibm ;; + -ptx*) + vendor=sequent + ;; -vxworks*) vendor=wrs # CYGNUS LOCAL ;; -- cgit v1.1