cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a3085a7bff
openbsd-ports/devel/dejagnu/patches/patch-ab
niklas bf80fa790b Dejagnu 1.3
1998-01-30 00:42:57 +00:00

570 lines
13 KiB
Plaintext
Raw Blame History

--- config.sub.orig Mon Feb 12 23:18:57 1996
+++ config.sub Fri Jan 30 00:47:32 1998
@@ -1,6 +1,6 @@
#! /bin/sh
# Configuration validation subroutine script, version 1.1.
-# Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1992, 1993, 1994, 1995 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.
@@ -85,27 +85,9 @@
os=
basic_machine=$1
;;
- -sim | -cisco | -oki | -wec | -winbond ) # CYGNUS LOCAL
- os=
- basic_machine=$1
- ;;
- -apple*) # CYGNUS LOCAL
- os=
- basic_machine=$1
- ;;
- -scout) # CYGNUS LOCAL
- ;;
- -wrs) # CYGNUS LOCAL
- os=vxworks
- basic_machine=$1
- ;;
-hiux*)
os=-hiuxwe2
;;
- -sco5)
- os=sco3.2v5
- basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
- ;;
-sco4)
os=-sco3.2v4
basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
@@ -147,7 +129,7 @@
case $basic_machine in
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
- tahoe | i[3456]86 | i860 | m68k | m68000 | m88k | ns32k | arm \
+ tahoe | i[345]86 | i860 | m68k | m68000 | m88k | ns32k | arm \
| arme[lb] | pyramid \
| tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \
| alpha | we32k | ns16k | clipper | sparclite | i370 | sh \
@@ -156,23 +138,14 @@
| sparc)
basic_machine=$basic_machine-unknown
;;
- m88110 | m680[01234]0 | m683?2 | m68360 | z8k | v70 | h8500 | w65) # CYGNUS LOCAL
- basic_machine=$basic_machine-unknown
- ;;
- mips64vr4300 | mips64vr4300el) # CYGNUS LOCAL jsmith/vr4300
- basic_machine=$basic_machine-unknown
- ;;
- mips64vr4100 | mips64vr4100el) # CYGNUS LOCAL jsmith/vr4100
- basic_machine=$basic_machine-unknown
- ;;
# Object if more than one company name word.
*-*-*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
exit 1
;;
# Recognize the basic CPU types with company name.
- vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
- | sparc-* | ns32k-* | fx80-* | arm-* | arme[lb]-* | c[123]* \
+ vax-* | tahoe-* | i[345]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-* \
| hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
@@ -180,32 +153,14 @@
| pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
| mips64el-* | mips64orion-* | mips64orionel-*)
;;
- m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | h8500-*) # CYGNUS LOCAL
- ;;
- mips64vr4300-* | mips64vr4300el-*) # CYGNUS LOCAL jsmith/vr4300
- ;;
- mips64vr4100-* | mips64vr4100el-*) # CYGNUS LOCAL jsmith/vr4100
- ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
- 386bsd) # CYGNUS LOCAL
- basic_machine=i386-unknown
- os=-bsd
- ;;
3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
basic_machine=m68000-att
;;
3b*)
basic_machine=we32k-att
;;
- a29khif) # CYGNUS LOCAL
- basic_machine=a29k-amd
- os=-udi
- ;;
- adobe68k) # CYGNUS LOCAL
- basic_machine=m68010-adobe
- os=-scout
- ;;
alliant | fx80)
basic_machine=fx80-alliant
;;
@@ -235,18 +190,6 @@
basic_machine=m68k-apollo
os=-sysv
;;
- apollo68bsd) # CYGNUS LOCAL
- basic_machine=m68k-apollo
- os=-bsd
- ;;
- arm | armel | armeb)
- basic_machine=arm-arm
- os=-aout
- ;;
- aux)
- basic_machine=m68k-apple
- os=-aux
- ;;
balance)
basic_machine=ns32k-sequent
os=-dynix
@@ -315,10 +258,6 @@
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
;;
@@ -337,14 +276,6 @@
basic_machine=h8300-hitachi
os=-hms
;;
- h8300xray) # CYGNUS LOCAL
- basic_machine=h8300-hitachi
- os=-xray
- ;;
- h8500hms) # CYGNUS LOCAL
- basic_machine=h8500-hitachi
- os=-hms
- ;;
harris)
basic_machine=m88k-harris
os=-sysv3
@@ -360,22 +291,6 @@
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
;;
@@ -388,43 +303,27 @@
hp9k8[0-9][0-9] | hp8[0-9][0-9])
basic_machine=hppa1.0-hp
;;
- hppaosf) # CYGNUS LOCAL
- basic_machine=hppa1.1-hp
- os=-osf
- ;;
i370-ibm* | ibm*)
basic_machine=i370-ibm
os=-mvs
;;
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
- i[3456]86v32)
+ i[345]86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
os=-sysv32
;;
- i[3456]86v4*)
+ i[345]86v4*)
basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
os=-sysv4
;;
- i[3456]86v)
+ i[345]86v)
basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
os=-sysv
;;
- i[3456]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
- ;;
iris | iris4d)
basic_machine=mips-sgi
case $os in
@@ -459,22 +358,10 @@
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
- monitor) # CYGNUS LOCAL
- basic_machine=m68k-rom68k
- os=-coff
- ;;
- msdos) # CYGNUS LOCAL
- basic_machine=i386-unknown
- os=-msdos
- ;;
ncr3000)
basic_machine=i486-ncr
os=-sysv4
;;
- netbsd386)
- basic_machine=i386-unknown # CYGNUS LOCAL
- os=-netbsd
- ;;
news | news700 | news800 | news900)
basic_machine=m68k-sony
os=-newsos
@@ -487,10 +374,6 @@
basic_machine=mips-sony
os=-newsos
;;
- necv70) # CYGNUS LOCAL
- basic_machine=v70-nec
- os=-sysv
- ;;
next | m*-next )
basic_machine=m68k-next
case $os in
@@ -519,14 +402,6 @@
np1)
basic_machine=np1-gould
;;
- 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
@@ -544,18 +419,14 @@
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
- pentium | p5)
+ pentium | p5 | p6)
+ # We don't have specific support for the Intel Pentium (p6) followon yet, so just call it a Pentium
basic_machine=i586-intel
;;
- pentiumpro | p6)
- basic_machine=i686-intel
- ;;
- pentium-* | p5-*)
+ pentium-* | p5-* | p6-*)
+ # We don't have specific support for the Intel Pentium (p6) followon yet, so just call it a Pentium
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- pentiumpro-* | p6-*)
- 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
@@ -564,6 +435,9 @@
# We don't have specific support for Nexgen yet, so just call it a Pentium
basic_machine=i586-nexgen
;;
+ mips-arc-*)
+ basic_machine=mips-r4kle
+ ;;
pn)
basic_machine=pn-gould
;;
@@ -582,20 +456,12 @@
ps2)
basic_machine=i386-ibm
;;
- rom68k) # CYGNUS LOCAL
- basic_machine=m68k-rom68k
- os=-coff
- ;;
rm[46]00)
basic_machine=mips-siemens
;;
rtpc | rtpc-*)
basic_machine=romp-ibm
;;
- sa29200) # CYGNUS LOCAL
- basic_machine=a29k-amd
- os=-udi
- ;;
sequent)
basic_machine=i386-sequent
;;
@@ -603,24 +469,6 @@
basic_machine=sh-hitachi
os=-hms
;;
- 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
@@ -628,13 +476,6 @@
spur)
basic_machine=spur-unknown
;;
- st2000) # CYGNUS LOCAL
- basic_machine=m68k-tandem
- ;;
- stratus) # CYGNUS LOCAL
- basic_machine=i860-stratus
- os=-sysv4
- ;;
sun2)
basic_machine=m68000-sun
;;
@@ -690,10 +531,6 @@
basic_machine=a29k-nyu
os=-sym1
;;
- v810 | necv810) # CYGNUS LOCAL
- basic_machine=v810-nec
- os=-none
- ;;
vaxv)
basic_machine=vax-dec
os=-sysv
@@ -714,10 +551,6 @@
basic_machine=a29k-wrs
os=-vxworks
;;
- w65*) # CYGNUS LOCAL
- basic_machine=w65-wdc
- os=-none
- ;;
xmp)
basic_machine=xmp-cray
os=-unicos
@@ -725,10 +558,6 @@
xps | xps100)
basic_machine=xps100-honeywell
;;
- z8k-*-coff) # CYGNUS LOCAL
- basic_machine=z8k-unknown
- os=-sim
- ;;
none)
basic_machine=none-none
os=-none
@@ -736,15 +565,6 @@
# 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
- basic_machine=hppa1.1-winbond
- ;;
- op50n) # CYGNUS LOCAL
- basic_machine=hppa1.1-oki
- ;;
- op60c) # CYGNUS LOCAL
- basic_machine=hppa1.1-oki
- ;;
mips)
basic_machine=mips-mips
;;
@@ -775,12 +595,6 @@
orion105)
basic_machine=clipper-highlevel
;;
- mac | mpw | mac-mpw) # CYGNUS LOCAL
- basic_machine=m68k-apple
- ;;
- pmac | pmac-mpw) # CYGNUS LOCAL
- basic_machine=powerpc-apple
- ;;
*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
exit 1
@@ -822,27 +636,18 @@
# 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[3456]* \
+ | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[345]* \
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -amigados* | -msdos* | -moss* | -newsos* | -unicos* | -aos* \
+ | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
| -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
| -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* \
+ | -hiux* | -386bsd* | -netbsd* | -freebsd* | -openbsd* \
+ | -riscix* \
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -pe* | -cygwin32*)
+ | -udi* | -eabi* | -lites* )
# Remember, each alternative MUST END IN *, to match a version number.
;;
- # CYGNUS LOCAL
- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -proelf | -os9* \
- | -macos* | -mpw* | -magic*)
- ;;
- -mac*)
- os=`echo $os | sed -e 's|mac|macos|'`
- ;;
- # END CYGNUS LOCAL
-sunos5*)
os=`echo $os | sed -e 's|sunos5|solaris2|'`
;;
@@ -864,15 +669,9 @@
-acis*)
os=-aos
;;
- -386bsd) # CYGNUS LOCAL
- os=-bsd
- ;;
-ctix* | -uts*)
os=-sysv
;;
- -ns2 )
- os=-nextstep2
- ;;
# Preserve the version number of sinix5.
-sinix5.*)
os=`echo $os | sed -e 's|sinix|sysv|'`
@@ -898,12 +697,6 @@
# This must come after -sysvr4.
-sysv*)
;;
- -ose*) # CYGNUS LOCAL
- os=-ose
- ;;
- -es1800*) # CYGNUS LOCAL
- os=-ose
- ;;
-xenix)
os=-xenix
;;
@@ -953,12 +746,6 @@
# default.
# os=-sunos4
;;
- m68*-cisco) # CYGNUS LOCAL
- os=-aout
- ;;
- mips*-cisco) # CYGNUS LOCAL
- os=-elf
- ;;
*-tti) # must be before sparc entry or we get the wrong os.
os=-sysv3
;;
@@ -968,15 +755,6 @@
*-ibm)
os=-aix
;;
- *-wec) # CYGNUS LOCAL
- os=-proelf
- ;;
- *-winbond) # CYGNUS LOCAL
- os=-proelf
- ;;
- *-oki) # CYGNUS LOCAL
- os=-proelf
- ;;
*-hp)
os=-hpux
;;
@@ -1001,9 +779,6 @@
m88k-omron*)
os=-luna
;;
- *-next )
- os=-nextstep
- ;;
*-sequent)
os=-ptx
;;
@@ -1037,15 +812,6 @@
*-masscomp)
os=-rtu
;;
- *-rom68k) # CYGNUS LOCAL
- os=-coff
- ;;
- *-*bug) # CYGNUS LOCAL
- os=-coff
- ;;
- *-apple) # CYGNUS LOCAL
- os=-macos
- ;;
*)
os=-none
;;
@@ -1064,9 +830,6 @@
-sunos*)
vendor=sun
;;
- -bosx*) # CYGNUS LOCAL
- vendor=bull
- ;;
-lynxos*)
vendor=lynx
;;
@@ -1099,15 +862,6 @@
;;
-vxworks*)
vendor=wrs
- ;;
- -aux*)
- vendor=apple
- ;;
- -hms*) # CYGNUS LOCAL
- vendor=hitachi
- ;;
- -mpw* | -macos*) # CYGNUS LOCAL
- vendor=apple
;;
esac
basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
Reference in New Issue View Git Blame Copy Permalink