From 842ca181f2a6f608cc65d3f350d38d6ee56a6c4c Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Thu, 21 Jul 1994 21:11:57 +0000 Subject: [PATCH] * config.sub (case $basic_machine): Re-order the cases, to match the order in the FSF version (which is mostly alphabethical). Merge in some additions and changes from the FSF. --- ChangeLog | 12 + config.sub | 676 ++++++++++++++++++++++++++++------------------------- 2 files changed, 366 insertions(+), 322 deletions(-) diff --git a/ChangeLog b/ChangeLog index 248e0b0db67..db0fca24494 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Thu Jul 21 14:10:52 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * config.sub (case $basic_machine): Re-order the cases, to match + the order in the FSF version (which is mostly alphabethical). + Merge in some additions and changes from the FSF. + +Sat Jul 16 12:03:08 1994 Stan Shebs (shebs@andros.cygnus.com) + + * config.guess: Recognize m68k-atari-sysv4 and m88k-harris-csux7. + * config.sub: Recognize cxux7. + * configure.in: Use mh-cxux for m88k-harris-cxux*. + Mon Jul 11 14:37:39 1994 Per Bothner (bothner@kalessin.cygnus.com) * config.sub: Fix typo powerpc -> powerpc-*. diff --git a/config.sub b/config.sub index 97e1a3b554a..3275aa4bc42 100755 --- a/config.sub +++ b/config.sub @@ -1,6 +1,6 @@ #!/bin/sh # Configuration validation subroutine script, version 1.1. -# Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc. +# Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc. # 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. @@ -164,96 +164,64 @@ case $basic_machine in ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. - sparc64) # CYGNUS LOCAL - basic_machine=sparc64-sun - os=-elf + 386bsd) # CYGNUS LOCAL + basic_machine=i386-unknown + os=-bsd ;; - sparc64-*) # CYGNUS LOCAL + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att ;; - - mips3-*) # CYGNUS LOCAL - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + 3b*) + basic_machine=we32k-att ;; - mips3) # CYGNUS LOCAL - basic_machine=mips64-unknown + a29khif) # CYGNUS LOCAL + basic_machine=a29k-amd + os=-udi ;; - dpx20 | dpx20-*) # CYGNUS LOCAL - basic_machine=rs6000-bull - os=-bosx + adobe68k) # CYGNUS LOCAL + basic_machine=m68010-adobe + os=-scout ;; - unixware) # CYGNUS LOCAL - os=-sysv4 - basic_machine=i386-unknown + alliant | fx80) + basic_machine=fx80-alliant ;; - vaxv) - basic_machine=vax-dec - os=-sysv + altos | altos3068) + basic_machine=m68k-altos ;; - vms) - basic_machine=vax-dec - os=-vms + am29k) + basic_machine=a29k-none + os=-bsd ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - os=-mvs + amdahl) + basic_machine=580-amdahl + os=-sysv ;; - i386mach) # CYGNUS LOCAL - basic_machine=i386-mach - os=-mach + amiga) + basic_machine=m68k-cbm ;; - i[34]86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'` - os=-sysv32 + amigados) + basic_machine=m68k-cbm + os=-amigados ;; - i[34]86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'` + amigaunix | amix) + basic_machine=m68k-cbm os=-sysv4 ;; - i[34]86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'` + apollo68) + basic_machine=m68k-apollo os=-sysv ;; - i[34]86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'` - os=-solaris2 - ;; - vsta | i386-vsta) # CYGNUS LOCAL - basic_machine=i386-unknown - os=-vsta - ;; - go32 | i386-go32) # CYGNUS LOCAL - basic_machine=i386-unknown - os=-go32 - ;; - i386-linux* | linux) # CYGNUS LOCAL - basic_machine=i386-unknown - os=-linux - ;; - i386-linux*coff | linuxcoff) # CYGNUS LOCAL - basic_machine=i386-unknown - os=-linuxcoff - ;; - i386-linux*elf | linuxelf) # CYGNUS LOCAL - basic_machine=i386-unknown - os=-linuxelf - ;; - 386bsd) # CYGNUS LOCAL - basic_machine=i386-unknown + apollo68bsd) # CYGNUS LOCAL + basic_machine=m68k-apollo os=-bsd ;; - netbsd386) - basic_machine=i386-unknown # CYGNUS LOCAL - os=-netbsd - ;; - spur) - basic_machine=spur-unknown - ;; - paragon) - basic_machine=i860-intel - os=-osf + balance) + basic_machine=ns32k-sequent + os=-dynix ;; - alliant | fx80) - basic_machine=fx80-alliant + m68k-ccur) + basic_machine=m68k-ccur + os=-rtu ;; convex-c1) basic_machine=c1-convex @@ -275,16 +243,40 @@ case $basic_machine in basic_machine=c38-convex os=-bsd ;; - m88k-omron*) - basic_machine=m88k-omron + cray | ymp) + basic_machine=ymp-cray + os=-unicos ;; - merlin) - basic_machine=ns32k-utek - os=-sysv + cray2) + basic_machine=cray2-cray + os=-unicos ;; crds | unos) basic_machine=m68k-crds ;; + decstation | decstation-3100 | pmax | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; elxsi) basic_machine=elxsi-elxsi os=-bsd @@ -292,303 +284,363 @@ case $basic_machine in encore | umax | mmax) basic_machine=ns32k-encore ;; + es1800 | OSE68k | ose68k | ose | OSE) # CYGNUS LOCAL + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; genix) basic_machine=ns32k-ns ;; - iris | iris4d | \ - iris3 | iris4) # CYGNUS LOCAL - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac + gmicro) + basic_machine=tron-gmicro + os=-sysv ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos + go32 | i386-go32) # CYGNUS LOCAL + basic_machine=i386-unknown + os=-go32 ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 ;; - 3b*) - basic_machine=we32k-att + h8300hds) + basic_machine=h8300-hitachi + os=-hds ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola + h8300hms) # CYGNUS LOCAL + basic_machine=h8300-hitachi + os=-hms ;; - balance) - basic_machine=ns32k-sequent - os=-dynix + h8300xray) # CYGNUS LOCAL + basic_machine=h8300-hitachi + os=-xray ;; - pc532) - basic_machine=ns32k-pc532 + h8500hms) # CYGNUS LOCAL + basic_machine=h8500-hitachi + os=-hms ;; - symmetry) - basic_machine=i386-sequent - os=-dynix + harris) + basic_machine=m88k-harris + os=-sysv3 ;; - sun2) - basic_machine=m68000-sun + h3050r* | hppahitachi) + basic_machine=hppa1.1-hitachi ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 + hp300bsd) + basic_machine=m68k-hp + os=-bsd ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 + hp300hpux) + basic_machine=m68k-hp + os=-hpux ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 + hp9k3[2-9][0-9]) + basic_machine=m68k-hp ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 + hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7) + basic_machine=hppa1.1-hp ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp ;; - sun4sol2) # CYGNUS LOCAL - basic_machine=sparc-sun + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + 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) + basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'` + os=-sysv32 + ;; + i[34]86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'` + os=-sysv4 + ;; + i[34]86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'` + os=-sysv + ;; + i[34]86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'` os=-solaris2 ;; - z8ksim) # CYGNUS LOCAL - basic_machine=z8k-zilog - os=-sim + i386-linux* | linux) # CYGNUS LOCAL + basic_machine=i386-unknown + os=-linux ;; - sun3) - basic_machine=m68k-sun + i386-linux*coff | linuxcoff) # CYGNUS LOCAL + basic_machine=i386-unknown + os=-linuxcoff ;; - sun4) - basic_machine=sparc-sun + i386-linux*elf | linuxelf) # CYGNUS LOCAL + basic_machine=i386-unknown + os=-linuxelf ;; + iris | iris4d | \ + iris3 | iris4) # CYGNUS LOCAL + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + m6*bug) # CYGNUS LOCAL + basic_machine=m68k-bug + os=-coff + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + miniframe) + basic_machine=m68010-convergent + ;; + mips3-*) # CYGNUS LOCAL + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3) # CYGNUS LOCAL + basic_machine=mips64-unknown + ;; + monitor) # CYGNUS LOCAL + basic_machine=m68k-rom68k + os=-coff + ;; msdos) # CYGNUS LOCAL basic_machine=i386-unknown os=-msdos ;; - pbd) - basic_machine=sparc-tti + ncr3000) + basic_machine=i486-ncr + os=-sysv4 ;; - pbb) - basic_machine=m68k-tti + necv70) # CYGNUS LOCAL + basic_machine=v70-nec + os=-sysv ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun + netbsd386) + basic_machine=i386-unknown # CYGNUS LOCAL + os=-netbsd ;; - ps2) - basic_machine=i386-ibm + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos ;; - fx2800) - basic_machine=i860-alliant + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos ;; next) basic_machine=m68k-next - os=-bsd + case $os in + -ns2*) + ;; + *) + os=-ns3 + ;; + esac ;; - amiga) - basic_machine=m68k-cbm + nh3000) + basic_machine=m68k-harris + os=-cxux ;; - amigados) - basic_machine=m68k-cbm - os=-amigados - ;; - amigaunix | amix) - basic_machine=m68k-cbm - os=-sysv4 + nh[45]000) + basic_machine=m88k-harris + os=-cxux ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp + nindy960) + basic_machine=i960-intel + os=-nindy ;; - hp9k31[0-9] | hp9k2[0-9][0-9]) - basic_machine=m68000-hp + np1) + basic_machine=np1-gould ;; - hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7) - basic_machine=hppa1.1-hp + os68k) # CYGNUS LOCAL + basic_machine=m68k-none + os=-os68k ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp + OSE68000 | ose68000) # CYGNUS LOCAL + basic_machine=m68000-ericsson + os=-ose ;; - h3050r* | hppahitachi) + pa-hitachi) basic_machine=hppa1.1-hitachi + os=-hiuxwe2 ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) # CYGNUS LOCAL - basic_machine=m68k-apollo - os=-bsd - ;; - altos | altos3068) - basic_machine=m68k-altos + paragon) + basic_machine=i860-intel + os=-osf ;; - miniframe) - basic_machine=m68010-convergent + pbd) + basic_machine=sparc-tti ;; - tower | tower-32) - basic_machine=m68k-ncr + pbb) + basic_machine=m68k-tti ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos + pc532) + basic_machine=ns32k-pc532 ;; - st2000) # CYGNUS LOCAL - basic_machine=m68k-tandem + pn) + basic_machine=pn-gould + ;; + ps2) + basic_machine=i386-ibm ;; - m6*bug) # CYGNUS LOCAL - basic_machine=m68k-bug - os=-coff - ;; rom68k) # CYGNUS LOCAL basic_machine=m68k-rom68k os=-coff ;; - monitor) # CYGNUS LOCAL - basic_machine=m68k-rom68k - os=-coff - ;; - decstation | decstation-3100 | pmax | pmin | dec3100 | decstatn) - basic_machine=mips-dec + rtpc | rtpc-*) + basic_machine=romp-ibm ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv + sa29200) # CYGNUS LOCAL + basic_machine=a29k-amd + os=-udi ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv + sh*) # CYGNUS LOCAL + basic_machine=sh-hitachi + os=-hms ;; - rtpc | rtpc-*) - basic_machine=romp-ibm + sparc64) # CYGNUS LOCAL + basic_machine=sparc64-sun + os=-elf ;; - am29k) - basic_machine=a29k-none - os=-bsd + sparc64-*) # CYGNUS LOCAL ;; - amdahl) - basic_machine=580-amdahl - os=-sysv + + sparclite-wrs) # CYGNUS LOCAL + basic_machine=sparclite-wrs + os=-vxworks + ;; + sparcfrw) # CYGNUS LOCAL + basic_machine=sparcfrw-sun + os=-sunos4 + ;; + sparcfrwcompat) # CYGNUS LOCAL + basic_machine=sparcfrwcompat-sun + os=-sunos4 + ;; + sparclitefrw) # CYGNUS LOCAL + basic_machine=sparclitefrw-fujitsu + ;; + sparclitefrwcompat) # CYGNUS LOCAL + basic_machine=sparclitefrwcompat-fujitsu + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) # CYGNUS LOCAL + basic_machine=m68k-tandem ;; stratus) # CYGNUS LOCAL basic_machine=i860-stratus os=-sysv4 ;; - cray | ymp) - basic_machine=ymp-cray - os=-unicos + sun2) + basic_machine=m68000-sun ;; - cray2) - basic_machine=cray2-cray - os=-unicos + sun2os3) + basic_machine=m68000-sun + os=-sunos3 ;; - xmp) - basic_machine=xmp-cray - os=-unicos + sun2os4) + basic_machine=m68000-sun + os=-sunos4 ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 + sun3os3) + basic_machine=m68k-sun + os=-sunos3 ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 + sun3os4) + basic_machine=m68k-sun + os=-sunos4 ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon + sun4os3) + basic_machine=sparc-sun + os=-sunos3 ;; - h8300hms) # CYGNUS LOCAL - basic_machine=h8300-hitachi - os=-hms + sun4os4) + basic_machine=sparc-sun + os=-sunos4 ;; - sh*) # CYGNUS LOCAL - basic_machine=sh-hitachi - os=-hms + sun4sol2) # CYGNUS LOCAL + basic_machine=sparc-sun + os=-solaris2 ;; - - h8500hms) # CYGNUS LOCAL - basic_machine=h8500-hitachi - os=-hms + sun3) + basic_machine=m68k-sun ;; - h8300xray) # CYGNUS LOCAL - basic_machine=h8300-hitachi - os=-xray + sun4) + basic_machine=sparc-sun ;; - h8300hds) - basic_machine=h8300-hitachi - os=-hds + sun386 | sun386i | roadrunner) + basic_machine=i386-sun ;; - udi29k) # CYGNUS LOCAL - basic_machine=a29k-amd - os=-udi + symmetry) + basic_machine=i386-sequent + os=-dynix ;; - a29khif) # CYGNUS LOCAL - basic_machine=a29k-amd - os=-udi + tower | tower-32) + basic_machine=m68k-ncr ;; - sa29200) # CYGNUS LOCAL + udi29k) # CYGNUS LOCAL basic_machine=a29k-amd os=-udi ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf + ultra3) + basic_machine=a29k-nyu + os=-sym1 ;; - ncr3000) - basic_machine=i486-ncr + unixware) # CYGNUS LOCAL os=-sysv4 - ;; - necv70) # CYGNUS LOCAL - basic_machine=v70-nec - os=-sysv + basic_machine=i386-unknown ;; v810 | necv810) basic_machine=v810-nec os=-none ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - pn) - basic_machine=pn-gould - ;; - np1) - basic_machine=np1-gould + vaxv) + basic_machine=vax-dec + os=-sysv ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 + vms) + basic_machine=vax-dec + os=-vms ;; vxworks960) basic_machine=i960-wrs @@ -598,44 +650,21 @@ case $basic_machine in basic_machine=m68k-wrs os=-vxworks ;; - es1800 | OSE68k | ose68k | ose | OSE) # CYGNUS LOCAL - basic_machine=m68k-ericsson - os=-ose - ;; - OSE68000 | ose68000) # CYGNUS LOCAL - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) # CYGNUS LOCAL - basic_machine=m68k-none - os=-os68k - ;; - sparclite-wrs) # CYGNUS LOCAL - basic_machine=sparclite-wrs - os=-vxworks - ;; - sparcfrw) # CYGNUS LOCAL - basic_machine=sparcfrw-sun - os=-sunos4 - ;; - sparcfrwcompat) # CYGNUS LOCAL - basic_machine=sparcfrwcompat-sun - os=-sunos4 - ;; - sparclitefrw) # CYGNUS LOCAL - basic_machine=sparclitefrw-fujitsu - ;; - sparclitefrwcompat) # CYGNUS LOCAL - basic_machine=sparclitefrwcompat-fujitsu + vsta | i386-vsta) # CYGNUS LOCAL + basic_machine=i386-unknown + os=-vsta ;; - adobe68k) # CYGNUS LOCAL - basic_machine=m68010-adobe - os=-scout + xmp) + basic_machine=xmp-cray + os=-unicos ;; - xps | xps100) basic_machine=xps100-honeywell ;; + z8ksim) # CYGNUS LOCAL + basic_machine=z8k-zilog + os=-sim + ;; none) basic_machine=none-none os=-none @@ -778,6 +807,9 @@ case $os in -es1800*) # CYGNUS LOCAL os=-ose ;; + -cxux7*) + os=-cxux7 + ;; -xenix) os=-xenix ;; -- 2.30.2