Minor config polish.

This commit is contained in:
K. Richard Pixley
1991-08-23 04:50:56 +00:00
parent 0a3492951d
commit 69e87de278
6 changed files with 990 additions and 776 deletions

14
bfd/configure vendored
View File

@ -413,8 +413,8 @@ wrs)
;; ;;
sun) sun)
case "${target_cpu}" in case "${target_cpu}" in
m68k) bfd_target=sun3 ;; m68k) bfd_target=m68k-aout ;;
sparc) bfd_target=sun4 ;; sparc) bfd_target=sparc-aout ;;
esac esac
;; ;;
dec) dec)
@ -432,6 +432,11 @@ hp)
;; ;;
esac esac
;; ;;
none)
case "${target_cpu}" in
i386) bfd_target=i386-coff ;;
esac
;;
*) *)
case "${target_cpu}" in case "${target_cpu}" in
tahoe | vax) bfd_target=${target_cpu} ;; tahoe | vax) bfd_target=${target_cpu} ;;
@ -706,7 +711,10 @@ exit 0
# #
# $Log$ # $Log$
# Revision 1.22 1991/08/23 03:31:43 rich # Revision 1.23 1991/08/23 04:48:43 rich
# Minor config polish.
#
# Revision 1.22 1991/08/23 03:31:43 rich
# Minor polish & config mapping. # Minor polish & config mapping.
# #
# Revision 1.30 1991/08/22 07:15:51 rich # Revision 1.30 1991/08/22 07:15:51 rich

View File

@ -102,6 +102,11 @@ hp)
;; ;;
esac esac
;; ;;
none)
case "${target_cpu}" in
i386) bfd_target=i386-coff ;;
esac
;;
*) *)
case "${target_cpu}" in case "${target_cpu}" in
tahoe | vax) bfd_target=${target_cpu} ;; tahoe | vax) bfd_target=${target_cpu} ;;

576
config.sub vendored
View File

@ -13,264 +13,332 @@
# a failure to support a valid configuration from a meaningless # a failure to support a valid configuration from a meaningless
# configuration. # configuration.
# Separate what the user gave into CPU-company and OS (if any). # decode aliases into canonical names
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
then os=`echo $1 | sed 's/^.*-/-/'`
else os=; fi
# Decode aliases for certain machine-company combinations. case "$1" in
case $basic_machine in # cpu alone is a valid alias for cpu-none-none.
# Recognize the basic CPU types without company name. vax | tahoe | i386 | i860 | m68k | m68000 | m88k | sparc | ns32k \
vax | tahoe | i386 | i860 | m68k | m68000 | m88k | sparc | ns32k \ | alliant | arm | c1 | c2 | mips | pyramid | tron | a29k \
| alliant | arm | c1 | c2 | mips | pyramid | tron | a29k \ | rtpc | rs6000 | i960)
| rtpc | rs6000 | i960 | none) cpu=$1
;; vendor=none
# Recognize the basic CPU types with company name. os=none
vax-* | tahoe-* | i386-* | i860-* | m68k-* | m68000-* | m88k-* \ ;;
| sparc-* | ns32k-* | alliant-* | arm-* | c1-* | c2-* \ nindy960)
| mips-* | pyramid-* | tron-* | a29k-* | rtpc-* \ cpu=i960
| rs6000-* | i960-*) vendor=intel
;; os=nindy
# Recognize the machine names ;;
# which stand for a CPU time and a company. vxworks68)
nindy960) cpu=m68k
basic_machine=i960-intel vendor=wrs
os=-nindy os=vxworks
;; ;;
vxworks68) vxworks960)
basic_machine=m68k-wrs cpu=i960
os=-vxworks vendor=wrs
;; os=vxworks
vxworks960) ;;
basic_machine=i960-wrs am29k)
os=-vxworks cpu=a29k
;; vendor=none
am29k) os=bsd
basic_machine=a29k-unknown ;;
os=-bsd umax)
;; cpu=ns32k
umax) vendor=encore
basic_machine=ns32k-umax os=sysv # maybe?
os=-sysv # maybe? ;;
;; pn)
pn) cpu=pn
basic_machine=pn-gould vendor=gould
os=-sysv # maybe? os=sysv # maybe?
;; ;;
np1) np1)
basic_machine=np1-gould cpu=np1
os=-sysv # maybe? vendor=gould
;; os=sysv # maybe?
merlin) ;;
basic_machine=merlin-utek merlin)
os=-sysv # maybe? cpu=merlin
;; vendor=utek
iris | iris4d) os=sysv # maybe?
basic_machine=mips-sgi ;;
os=-sysv # maybe? iris | iris4d)
;; cpu=mips
news1000) vendor=sgi
basic_machine=m68030-sony os=sysv # maybe?
os=-sysv # maybe? ;;
;; news1000)
news | news700 | news800 | news900) cpu=m68030
basic_machine=m68k-sony vendor=sony
os=-sysv # maybe? os=sysv # maybe?
;; ;;
unixpc | safari | pc7300 | 3b1 | 7300 | 7300-att | att-7300) news | news700 | news800 | news900)
basic_machine=m68k-att cpu=m68k
os=-sysv # maybe? vendor=sony
;; os=sysv # maybe?
delta | 3300 | motorola-3300 | motorola-delta \ ;;
| 3300-motorola | delta-motorola) unixpc | safari | pc7300 | 3b1 | 7300 | 7300-att | att-7300)
basic_machine=m68k-motorola cpu=m68k
os=-sysv # maybe? vendor=att
;; os=sysv # maybe?
vax-dec) ;;
basic_machine=vax delta | 3300 | motorola-3300 | motorola-delta \
os=-ultrix # maybe? | 3300-motorola | delta-motorola)
;; cpu=m68k
balance) vendor=motorola
basic_machine=ns32k-sequent os=sysv # maybe?
os=-dynix ;;
;; vax-dec)
mmax) cpu=vax
basic_machine=ns32k-encore vendor=dec
os=-sysv # maybe? os=ultrix # maybe?
;; ;;
symmetry) balance)
basic_machine=i386-sequent cpu=ns32k
os=-dynix vendor=sequent
;; os=dynix
sun2) ;;
basic_machine=m68000-sun mmax)
os=-sunos4 cpu=ns32k
;; vendor=encore
sun2os3) os=sysv # maybe?
basic_machine=m68000-sun ;;
os=-sunos3 symmetry)
;; cpu=i386
sun2os4) vendor=sequent
basic_machine=m68000-sun os=dynix
os=-sunos4 ;;
;; sun2)
sun3) cpu=m68000
basic_machine=m68k-sun vendor=sun
os=-sunos4 os=sunos4
;; ;;
sun3os3) sun2os3)
basic_machine=m68k-sun cpu=m68000
os=-sunos3 vendor=sun
;; os=sunos3
sun3os4) ;;
basic_machine=m68k-sun sun2os4)
os=-sunos4 cpu=m68000
;; vendor=sun
sun4) os=sunos4
basic_machine=sparc-sun ;;
os=-sunos4 sun3)
;; cpu=m68k
sun4os3) vendor=sun
basic_machine=sparc-sun os=sunos4
os=-sunos3 ;;
;; sun3os3)
sun4os4) cpu=m68k
basic_machine=sparc-sun vendor=sun
os=-sunos4 os=sunos3
;; ;;
pbd) sun3os4)
basic_machine=sparc-unicom cpu=m68k
os=-sysv vendor=sun
;; os=sunos4
roadrunner | sun386 | sun386i) ;;
basic_machine=i386-sun sun4)
os=-sunos cpu=sparc
;; vendor=sun
ps2) os=sunos4
basic_machine=i386-ibm ;;
os=-sysv # maybe? sun4os3)
;; cpu=sparc
i386sco) vendor=sun
basic_machine=i386-sco os=sunos3
os=-sysv # maybe? ;;
;; sun4os4)
i386v) cpu=sparc
basic_machine=i386-unknown vendor=sun
os=-sysv os=sunos4
;; ;;
i386v32) pbd)
basic_machine=i386-unknown cpu=sparc
os=-sysv32 vendor=unicom
;; os=sysv
next) ;;
basic_machine=m68k-next roadrunner | sun386 | sun386i)
os=-sysv # maybe? cpu=i386
;; vendor=sun
hp300bsd) os=sunos
basic_machine=m68k-hp ;;
os=-bsd ps2)
;; cpu=i386
hp300hpux | hpux | hp9k3[2-9][0-9]) vendor=ibm
basic_machine=m68k-hp os=sysv # maybe?
os=-hpux ;;
;; i386sco)
hp9k31[0-9] | hp9k2[0-9][0-9]) cpu=i386
basic_machine=m68000-hp vendor=sco
os=-hpux os=sysv # maybe?
;; ;;
isi | isi68) i386v)
basic_machine=m68k-isi cpu=i386
os=-sysv # maybe? vendor=none
;; os=sysv
apollo68) ;;
basic_machine=m68k-apollo i386v32)
os=-sysv # maybe? cpu=i386
;; vendor=none
altos | altos3068) os=sysv32
basic_machine=m68k-altos ;;
os=-sysv # maybe? next)
;; cpu=m68k
altosgas) vendor=next
basic_machine=m68k-altos os=sysv # maybe?
os=-gas ;;
;; hp300bsd)
miniframe) cpu=m68k
basic_machine=m68000-convergent vendor=hp
os=-sysv # maybe? os=bsd
;; ;;
tower | tower-32) hp300hpux | hpux | hp9k3[2-9][0-9])
basic_machine=m68k-ncr cpu=m68k
os=-sysv # maybe? vendor=hp
;; os=hpux
bigmips | news-3600 | risc-news) ;;
basic_machine=mips-sony hp9k31[0-9] | hp9k2[0-9][0-9])
os=-newsos # maybe? cpu=m68000
;; vendor=hp
littlemips) os=hpux
basic_machine=mips-little ;;
os=-bsd isi | isi68)
;; cpu=m68k
dec3100 | decstatn | decstation | decstation-3100 | pmax) vendor=isi
basic_machine=mips-dec os=sysv # maybe?
os=-ultrix ;;
;; apollo68)
magnum | m3230) cpu=m68k
basic_machine=mips-mips vendor=apollo
os=-sysv # maybe? os=sysv # maybe?
;; ;;
gmicro) altos | altos3068)
basic_machine=tron cpu=m68k
os=-sysv # maybe? vendor=altos
;; os=sysv # maybe?
convex-c1) ;;
basic_machine=c1-convex altosgas)
os=-sysv # maybe? cpu=m68k
;; vendor=altos
convex-c2) os=gas
basic_machine=c2-convex ;;
os=-sysv # maybe? miniframe)
;; cpu=m68000
*) vendor=convergent
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 os=sysv # maybe?
;;
tower | tower-32)
cpu=m68k
vendor=ncr
os=sysv # maybe?
;;
bigmips | news-3600 | risc-news)
cpu=mips
vendor=sony
os=newsos # maybe?
;;
littlemips)
cpu=mips
vendor=little
os=bsd
;;
dec3100 | decstatn | decstation | decstation-3100 | pmax)
cpu=mips
vendor=dec
os=ultrix
;;
magnum | m3230)
cpu=mips
vendor=mips
os=sysv # maybe?
;;
gmicro)
cpu=tron
vendor=none
os=sysv # maybe?
;;
convex-c1)
cpu=c1
vendor=convex
os=sysv # maybe?
;;
convex-c2)
cpu=c2
vendor=convex
os=sysv # maybe?
;;
none)
cpu=none
vendor=none
os=none
;;
# not an alias. parse what we expect to be a canonical name.
*)
cpu=`echo $1 | sed 's/-.*$//'`
if [ "${cpu}" = "$1" ] ; then
# no vendor so this is an invalid name.
echo '***' No vendor: configuration \`$1\' not recognized 1>&2
exit 1 exit 1
;; else
# parse out vendor
rest=`echo $1 | sed "s/${cpu}-//"`
vendor=`echo ${rest} | sed 's/-.*$//'`
if [ "${vendor}" = "${rest}" ] ; then
# a missing os is acceptable
os=none
else
os=`echo ${rest} | sed "s/${vendor}-//"`
fi
fi
;;
esac esac
# Decode manufacturer-specific aliases for certain operating systems. # At this point we should have three parts of a canonical name in cpu,
# vendor, and os.
case $os in # verify that the cpu is known.
# First accept the basic system types.
# The portable systems comes first. case "${cpu}" in
-bsd* | -sysv* | -mach* \ vax | tahoe | i386 | i860 | m68k | m68000 | m88k | sparc | ns32k \
| -vms* | -sco* | -esix* | -isc* | -aix* | -sunos* | -hpux* \ | alliant | arm | c1 | c2 | mips | pyramid | tron | a29k \
| -unos* | -osf* | -v88r* | -aout | -coff | -bout \ | rtpc | rs6000 | i960)
| -nindy | -vxworks) ;;
;; *)
-newsos*) echo '***' Invalid cpu \`${cpu}\': configuration \`$1\' not recognized 1>&2
os=-bsd exit 1
;; ;;
-ultrix*)
os=-bsd
;;
-osfrose*)
os=-osf
;;
-osf*)
os=-bsd
;;
-dynix*)
os=-bsd
;;
-ctix*)
os=-sysv
;;
*)
# Get rid of the `-' at the beginning of $os.
os=`echo $1 | sed 's/[^-]*-//'`
echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
exit 1
;;
esac esac
echo ${basic_machine}${os} # verify that the vendor is known.
case "${vendor}" in
none | convex | mips | dec | little | sony | ncr | convergent \
| altos | apollo | isi | hp | next | sco | ibm | sun \
| unicom | sequent | encore | motorola | att | sgi \
| utek | gould | wrs | intel | aout | bout | coff) ;;
*)
echo '***' Invalid vendor \`${vendor}\': configuration \`$1\' not recognized 1>&2
exit 1
;;
esac
# verify that the os is known, if it exists.
case "${os}" in
aix* | aout | bout | bsd* | coff | ctix* | dynix* | esix* | hpux* \
| isc* | mach* | newsos* | nindy* | none | osf* | osf* | sco* \
| sunos* | sysv* | ultrix* | unos* | v88r* | vms* | vxworks*)
;;
*)
echo '***' Invalid os \`${os}\': configuration \`$1\' not recognized 1>&2
exit 1
;;
esac
echo ${cpu}-${vendor}-${os}

576
gdb/config.sub vendored
View File

@ -13,264 +13,332 @@
# a failure to support a valid configuration from a meaningless # a failure to support a valid configuration from a meaningless
# configuration. # configuration.
# Separate what the user gave into CPU-company and OS (if any). # decode aliases into canonical names
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
then os=`echo $1 | sed 's/^.*-/-/'`
else os=; fi
# Decode aliases for certain machine-company combinations. case "$1" in
case $basic_machine in # cpu alone is a valid alias for cpu-none-none.
# Recognize the basic CPU types without company name. vax | tahoe | i386 | i860 | m68k | m68000 | m88k | sparc | ns32k \
vax | tahoe | i386 | i860 | m68k | m68000 | m88k | sparc | ns32k \ | alliant | arm | c1 | c2 | mips | pyramid | tron | a29k \
| alliant | arm | c1 | c2 | mips | pyramid | tron | a29k \ | rtpc | rs6000 | i960)
| rtpc | rs6000 | i960 | none) cpu=$1
;; vendor=none
# Recognize the basic CPU types with company name. os=none
vax-* | tahoe-* | i386-* | i860-* | m68k-* | m68000-* | m88k-* \ ;;
| sparc-* | ns32k-* | alliant-* | arm-* | c1-* | c2-* \ nindy960)
| mips-* | pyramid-* | tron-* | a29k-* | rtpc-* \ cpu=i960
| rs6000-* | i960-*) vendor=intel
;; os=nindy
# Recognize the machine names ;;
# which stand for a CPU time and a company. vxworks68)
nindy960) cpu=m68k
basic_machine=i960-intel vendor=wrs
os=-nindy os=vxworks
;; ;;
vxworks68) vxworks960)
basic_machine=m68k-wrs cpu=i960
os=-vxworks vendor=wrs
;; os=vxworks
vxworks960) ;;
basic_machine=i960-wrs am29k)
os=-vxworks cpu=a29k
;; vendor=none
am29k) os=bsd
basic_machine=a29k-unknown ;;
os=-bsd umax)
;; cpu=ns32k
umax) vendor=encore
basic_machine=ns32k-umax os=sysv # maybe?
os=-sysv # maybe? ;;
;; pn)
pn) cpu=pn
basic_machine=pn-gould vendor=gould
os=-sysv # maybe? os=sysv # maybe?
;; ;;
np1) np1)
basic_machine=np1-gould cpu=np1
os=-sysv # maybe? vendor=gould
;; os=sysv # maybe?
merlin) ;;
basic_machine=merlin-utek merlin)
os=-sysv # maybe? cpu=merlin
;; vendor=utek
iris | iris4d) os=sysv # maybe?
basic_machine=mips-sgi ;;
os=-sysv # maybe? iris | iris4d)
;; cpu=mips
news1000) vendor=sgi
basic_machine=m68030-sony os=sysv # maybe?
os=-sysv # maybe? ;;
;; news1000)
news | news700 | news800 | news900) cpu=m68030
basic_machine=m68k-sony vendor=sony
os=-sysv # maybe? os=sysv # maybe?
;; ;;
unixpc | safari | pc7300 | 3b1 | 7300 | 7300-att | att-7300) news | news700 | news800 | news900)
basic_machine=m68k-att cpu=m68k
os=-sysv # maybe? vendor=sony
;; os=sysv # maybe?
delta | 3300 | motorola-3300 | motorola-delta \ ;;
| 3300-motorola | delta-motorola) unixpc | safari | pc7300 | 3b1 | 7300 | 7300-att | att-7300)
basic_machine=m68k-motorola cpu=m68k
os=-sysv # maybe? vendor=att
;; os=sysv # maybe?
vax-dec) ;;
basic_machine=vax delta | 3300 | motorola-3300 | motorola-delta \
os=-ultrix # maybe? | 3300-motorola | delta-motorola)
;; cpu=m68k
balance) vendor=motorola
basic_machine=ns32k-sequent os=sysv # maybe?
os=-dynix ;;
;; vax-dec)
mmax) cpu=vax
basic_machine=ns32k-encore vendor=dec
os=-sysv # maybe? os=ultrix # maybe?
;; ;;
symmetry) balance)
basic_machine=i386-sequent cpu=ns32k
os=-dynix vendor=sequent
;; os=dynix
sun2) ;;
basic_machine=m68000-sun mmax)
os=-sunos4 cpu=ns32k
;; vendor=encore
sun2os3) os=sysv # maybe?
basic_machine=m68000-sun ;;
os=-sunos3 symmetry)
;; cpu=i386
sun2os4) vendor=sequent
basic_machine=m68000-sun os=dynix
os=-sunos4 ;;
;; sun2)
sun3) cpu=m68000
basic_machine=m68k-sun vendor=sun
os=-sunos4 os=sunos4
;; ;;
sun3os3) sun2os3)
basic_machine=m68k-sun cpu=m68000
os=-sunos3 vendor=sun
;; os=sunos3
sun3os4) ;;
basic_machine=m68k-sun sun2os4)
os=-sunos4 cpu=m68000
;; vendor=sun
sun4) os=sunos4
basic_machine=sparc-sun ;;
os=-sunos4 sun3)
;; cpu=m68k
sun4os3) vendor=sun
basic_machine=sparc-sun os=sunos4
os=-sunos3 ;;
;; sun3os3)
sun4os4) cpu=m68k
basic_machine=sparc-sun vendor=sun
os=-sunos4 os=sunos3
;; ;;
pbd) sun3os4)
basic_machine=sparc-unicom cpu=m68k
os=-sysv vendor=sun
;; os=sunos4
roadrunner | sun386 | sun386i) ;;
basic_machine=i386-sun sun4)
os=-sunos cpu=sparc
;; vendor=sun
ps2) os=sunos4
basic_machine=i386-ibm ;;
os=-sysv # maybe? sun4os3)
;; cpu=sparc
i386sco) vendor=sun
basic_machine=i386-sco os=sunos3
os=-sysv # maybe? ;;
;; sun4os4)
i386v) cpu=sparc
basic_machine=i386-unknown vendor=sun
os=-sysv os=sunos4
;; ;;
i386v32) pbd)
basic_machine=i386-unknown cpu=sparc
os=-sysv32 vendor=unicom
;; os=sysv
next) ;;
basic_machine=m68k-next roadrunner | sun386 | sun386i)
os=-sysv # maybe? cpu=i386
;; vendor=sun
hp300bsd) os=sunos
basic_machine=m68k-hp ;;
os=-bsd ps2)
;; cpu=i386
hp300hpux | hpux | hp9k3[2-9][0-9]) vendor=ibm
basic_machine=m68k-hp os=sysv # maybe?
os=-hpux ;;
;; i386sco)
hp9k31[0-9] | hp9k2[0-9][0-9]) cpu=i386
basic_machine=m68000-hp vendor=sco
os=-hpux os=sysv # maybe?
;; ;;
isi | isi68) i386v)
basic_machine=m68k-isi cpu=i386
os=-sysv # maybe? vendor=none
;; os=sysv
apollo68) ;;
basic_machine=m68k-apollo i386v32)
os=-sysv # maybe? cpu=i386
;; vendor=none
altos | altos3068) os=sysv32
basic_machine=m68k-altos ;;
os=-sysv # maybe? next)
;; cpu=m68k
altosgas) vendor=next
basic_machine=m68k-altos os=sysv # maybe?
os=-gas ;;
;; hp300bsd)
miniframe) cpu=m68k
basic_machine=m68000-convergent vendor=hp
os=-sysv # maybe? os=bsd
;; ;;
tower | tower-32) hp300hpux | hpux | hp9k3[2-9][0-9])
basic_machine=m68k-ncr cpu=m68k
os=-sysv # maybe? vendor=hp
;; os=hpux
bigmips | news-3600 | risc-news) ;;
basic_machine=mips-sony hp9k31[0-9] | hp9k2[0-9][0-9])
os=-newsos # maybe? cpu=m68000
;; vendor=hp
littlemips) os=hpux
basic_machine=mips-little ;;
os=-bsd isi | isi68)
;; cpu=m68k
dec3100 | decstatn | decstation | decstation-3100 | pmax) vendor=isi
basic_machine=mips-dec os=sysv # maybe?
os=-ultrix ;;
;; apollo68)
magnum | m3230) cpu=m68k
basic_machine=mips-mips vendor=apollo
os=-sysv # maybe? os=sysv # maybe?
;; ;;
gmicro) altos | altos3068)
basic_machine=tron cpu=m68k
os=-sysv # maybe? vendor=altos
;; os=sysv # maybe?
convex-c1) ;;
basic_machine=c1-convex altosgas)
os=-sysv # maybe? cpu=m68k
;; vendor=altos
convex-c2) os=gas
basic_machine=c2-convex ;;
os=-sysv # maybe? miniframe)
;; cpu=m68000
*) vendor=convergent
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 os=sysv # maybe?
;;
tower | tower-32)
cpu=m68k
vendor=ncr
os=sysv # maybe?
;;
bigmips | news-3600 | risc-news)
cpu=mips
vendor=sony
os=newsos # maybe?
;;
littlemips)
cpu=mips
vendor=little
os=bsd
;;
dec3100 | decstatn | decstation | decstation-3100 | pmax)
cpu=mips
vendor=dec
os=ultrix
;;
magnum | m3230)
cpu=mips
vendor=mips
os=sysv # maybe?
;;
gmicro)
cpu=tron
vendor=none
os=sysv # maybe?
;;
convex-c1)
cpu=c1
vendor=convex
os=sysv # maybe?
;;
convex-c2)
cpu=c2
vendor=convex
os=sysv # maybe?
;;
none)
cpu=none
vendor=none
os=none
;;
# not an alias. parse what we expect to be a canonical name.
*)
cpu=`echo $1 | sed 's/-.*$//'`
if [ "${cpu}" = "$1" ] ; then
# no vendor so this is an invalid name.
echo '***' No vendor: configuration \`$1\' not recognized 1>&2
exit 1 exit 1
;; else
# parse out vendor
rest=`echo $1 | sed "s/${cpu}-//"`
vendor=`echo ${rest} | sed 's/-.*$//'`
if [ "${vendor}" = "${rest}" ] ; then
# a missing os is acceptable
os=none
else
os=`echo ${rest} | sed "s/${vendor}-//"`
fi
fi
;;
esac esac
# Decode manufacturer-specific aliases for certain operating systems. # At this point we should have three parts of a canonical name in cpu,
# vendor, and os.
case $os in # verify that the cpu is known.
# First accept the basic system types.
# The portable systems comes first. case "${cpu}" in
-bsd* | -sysv* | -mach* \ vax | tahoe | i386 | i860 | m68k | m68000 | m88k | sparc | ns32k \
| -vms* | -sco* | -esix* | -isc* | -aix* | -sunos* | -hpux* \ | alliant | arm | c1 | c2 | mips | pyramid | tron | a29k \
| -unos* | -osf* | -v88r* | -aout | -coff | -bout \ | rtpc | rs6000 | i960)
| -nindy | -vxworks) ;;
;; *)
-newsos*) echo '***' Invalid cpu \`${cpu}\': configuration \`$1\' not recognized 1>&2
os=-bsd exit 1
;; ;;
-ultrix*)
os=-bsd
;;
-osfrose*)
os=-osf
;;
-osf*)
os=-bsd
;;
-dynix*)
os=-bsd
;;
-ctix*)
os=-sysv
;;
*)
# Get rid of the `-' at the beginning of $os.
os=`echo $1 | sed 's/[^-]*-//'`
echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
exit 1
;;
esac esac
echo ${basic_machine}${os} # verify that the vendor is known.
case "${vendor}" in
none | convex | mips | dec | little | sony | ncr | convergent \
| altos | apollo | isi | hp | next | sco | ibm | sun \
| unicom | sequent | encore | motorola | att | sgi \
| utek | gould | wrs | intel | aout | bout | coff) ;;
*)
echo '***' Invalid vendor \`${vendor}\': configuration \`$1\' not recognized 1>&2
exit 1
;;
esac
# verify that the os is known, if it exists.
case "${os}" in
aix* | aout | bout | bsd* | coff | ctix* | dynix* | esix* | hpux* \
| isc* | mach* | newsos* | nindy* | none | osf* | osf* | sco* \
| sunos* | sysv* | ultrix* | unos* | v88r* | vms* | vxworks*)
;;
*)
echo '***' Invalid os \`${os}\': configuration \`$1\' not recognized 1>&2
exit 1
;;
esac
echo ${cpu}-${vendor}-${os}

View File

@ -151,9 +151,9 @@ m68030)
esac esac
;; ;;
none | np1 | pn | np1 | pn | pyramid | merlin | i960 | m88k | a29k) none | tahoe | vax | np1 | pn | np1 | pn | pyramid | merlin | m88k)
gdb_target=${target_cpu} ;; gdb_target=${target_cpu} ;;
a29k) gdb_target=am29k ;;
arm) gdb_target=${target_cpu} ;; arm) gdb_target=${target_cpu} ;;
mips) mips)
@ -166,13 +166,6 @@ mips)
c1 | c2) gdb_target=convex ;; c1 | c2) gdb_target=convex ;;
i386)
case "${target_vendor}" in
sco) gdb_target=i386sco ;;
sun) gdb_target=sun386 ;;
esac
;;
sparc) sparc)
case "${target_vendor}" in case "${target_vendor}" in
sun) sun)
@ -188,7 +181,11 @@ sparc)
i386) i386)
case "${target_vendor}" in case "${target_vendor}" in
sco) gdb_target=i386sco ;;
sun) gdb_target=sun386 ;;
sequent) gdb_target=symmetry ;; sequent) gdb_target=symmetry ;;
coff) gdb_target=i386v ;;
aout) gdb_target=i386v ;;
*) *)
case "${target_os}" in case "${target_os}" in
sysv) gdb_target=i386v ;; sysv) gdb_target=i386v ;;
@ -199,8 +196,8 @@ i386)
i960) i960)
case "${target_vendor}" in case "${target_vendor}" in
wrs) gdb_target=vxworks960 ;; bout | wrs) gdb_target=vxworks960 ;;
intel) gdb_target=nindy960 ;; coff | intel) gdb_target=nindy960 ;;
esac esac
;; ;;

576
readline/config.sub vendored
View File

@ -13,264 +13,332 @@
# a failure to support a valid configuration from a meaningless # a failure to support a valid configuration from a meaningless
# configuration. # configuration.
# Separate what the user gave into CPU-company and OS (if any). # decode aliases into canonical names
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
then os=`echo $1 | sed 's/^.*-/-/'`
else os=; fi
# Decode aliases for certain machine-company combinations. case "$1" in
case $basic_machine in # cpu alone is a valid alias for cpu-none-none.
# Recognize the basic CPU types without company name. vax | tahoe | i386 | i860 | m68k | m68000 | m88k | sparc | ns32k \
vax | tahoe | i386 | i860 | m68k | m68000 | m88k | sparc | ns32k \ | alliant | arm | c1 | c2 | mips | pyramid | tron | a29k \
| alliant | arm | c1 | c2 | mips | pyramid | tron | a29k \ | rtpc | rs6000 | i960)
| rtpc | rs6000 | i960 | none) cpu=$1
;; vendor=none
# Recognize the basic CPU types with company name. os=none
vax-* | tahoe-* | i386-* | i860-* | m68k-* | m68000-* | m88k-* \ ;;
| sparc-* | ns32k-* | alliant-* | arm-* | c1-* | c2-* \ nindy960)
| mips-* | pyramid-* | tron-* | a29k-* | rtpc-* \ cpu=i960
| rs6000-* | i960-*) vendor=intel
;; os=nindy
# Recognize the machine names ;;
# which stand for a CPU time and a company. vxworks68)
nindy960) cpu=m68k
basic_machine=i960-intel vendor=wrs
os=-nindy os=vxworks
;; ;;
vxworks68) vxworks960)
basic_machine=m68k-wrs cpu=i960
os=-vxworks vendor=wrs
;; os=vxworks
vxworks960) ;;
basic_machine=i960-wrs am29k)
os=-vxworks cpu=a29k
;; vendor=none
am29k) os=bsd
basic_machine=a29k-unknown ;;
os=-bsd umax)
;; cpu=ns32k
umax) vendor=encore
basic_machine=ns32k-umax os=sysv # maybe?
os=-sysv # maybe? ;;
;; pn)
pn) cpu=pn
basic_machine=pn-gould vendor=gould
os=-sysv # maybe? os=sysv # maybe?
;; ;;
np1) np1)
basic_machine=np1-gould cpu=np1
os=-sysv # maybe? vendor=gould
;; os=sysv # maybe?
merlin) ;;
basic_machine=merlin-utek merlin)
os=-sysv # maybe? cpu=merlin
;; vendor=utek
iris | iris4d) os=sysv # maybe?
basic_machine=mips-sgi ;;
os=-sysv # maybe? iris | iris4d)
;; cpu=mips
news1000) vendor=sgi
basic_machine=m68030-sony os=sysv # maybe?
os=-sysv # maybe? ;;
;; news1000)
news | news700 | news800 | news900) cpu=m68030
basic_machine=m68k-sony vendor=sony
os=-sysv # maybe? os=sysv # maybe?
;; ;;
unixpc | safari | pc7300 | 3b1 | 7300 | 7300-att | att-7300) news | news700 | news800 | news900)
basic_machine=m68k-att cpu=m68k
os=-sysv # maybe? vendor=sony
;; os=sysv # maybe?
delta | 3300 | motorola-3300 | motorola-delta \ ;;
| 3300-motorola | delta-motorola) unixpc | safari | pc7300 | 3b1 | 7300 | 7300-att | att-7300)
basic_machine=m68k-motorola cpu=m68k
os=-sysv # maybe? vendor=att
;; os=sysv # maybe?
vax-dec) ;;
basic_machine=vax delta | 3300 | motorola-3300 | motorola-delta \
os=-ultrix # maybe? | 3300-motorola | delta-motorola)
;; cpu=m68k
balance) vendor=motorola
basic_machine=ns32k-sequent os=sysv # maybe?
os=-dynix ;;
;; vax-dec)
mmax) cpu=vax
basic_machine=ns32k-encore vendor=dec
os=-sysv # maybe? os=ultrix # maybe?
;; ;;
symmetry) balance)
basic_machine=i386-sequent cpu=ns32k
os=-dynix vendor=sequent
;; os=dynix
sun2) ;;
basic_machine=m68000-sun mmax)
os=-sunos4 cpu=ns32k
;; vendor=encore
sun2os3) os=sysv # maybe?
basic_machine=m68000-sun ;;
os=-sunos3 symmetry)
;; cpu=i386
sun2os4) vendor=sequent
basic_machine=m68000-sun os=dynix
os=-sunos4 ;;
;; sun2)
sun3) cpu=m68000
basic_machine=m68k-sun vendor=sun
os=-sunos4 os=sunos4
;; ;;
sun3os3) sun2os3)
basic_machine=m68k-sun cpu=m68000
os=-sunos3 vendor=sun
;; os=sunos3
sun3os4) ;;
basic_machine=m68k-sun sun2os4)
os=-sunos4 cpu=m68000
;; vendor=sun
sun4) os=sunos4
basic_machine=sparc-sun ;;
os=-sunos4 sun3)
;; cpu=m68k
sun4os3) vendor=sun
basic_machine=sparc-sun os=sunos4
os=-sunos3 ;;
;; sun3os3)
sun4os4) cpu=m68k
basic_machine=sparc-sun vendor=sun
os=-sunos4 os=sunos3
;; ;;
pbd) sun3os4)
basic_machine=sparc-unicom cpu=m68k
os=-sysv vendor=sun
;; os=sunos4
roadrunner | sun386 | sun386i) ;;
basic_machine=i386-sun sun4)
os=-sunos cpu=sparc
;; vendor=sun
ps2) os=sunos4
basic_machine=i386-ibm ;;
os=-sysv # maybe? sun4os3)
;; cpu=sparc
i386sco) vendor=sun
basic_machine=i386-sco os=sunos3
os=-sysv # maybe? ;;
;; sun4os4)
i386v) cpu=sparc
basic_machine=i386-unknown vendor=sun
os=-sysv os=sunos4
;; ;;
i386v32) pbd)
basic_machine=i386-unknown cpu=sparc
os=-sysv32 vendor=unicom
;; os=sysv
next) ;;
basic_machine=m68k-next roadrunner | sun386 | sun386i)
os=-sysv # maybe? cpu=i386
;; vendor=sun
hp300bsd) os=sunos
basic_machine=m68k-hp ;;
os=-bsd ps2)
;; cpu=i386
hp300hpux | hpux | hp9k3[2-9][0-9]) vendor=ibm
basic_machine=m68k-hp os=sysv # maybe?
os=-hpux ;;
;; i386sco)
hp9k31[0-9] | hp9k2[0-9][0-9]) cpu=i386
basic_machine=m68000-hp vendor=sco
os=-hpux os=sysv # maybe?
;; ;;
isi | isi68) i386v)
basic_machine=m68k-isi cpu=i386
os=-sysv # maybe? vendor=none
;; os=sysv
apollo68) ;;
basic_machine=m68k-apollo i386v32)
os=-sysv # maybe? cpu=i386
;; vendor=none
altos | altos3068) os=sysv32
basic_machine=m68k-altos ;;
os=-sysv # maybe? next)
;; cpu=m68k
altosgas) vendor=next
basic_machine=m68k-altos os=sysv # maybe?
os=-gas ;;
;; hp300bsd)
miniframe) cpu=m68k
basic_machine=m68000-convergent vendor=hp
os=-sysv # maybe? os=bsd
;; ;;
tower | tower-32) hp300hpux | hpux | hp9k3[2-9][0-9])
basic_machine=m68k-ncr cpu=m68k
os=-sysv # maybe? vendor=hp
;; os=hpux
bigmips | news-3600 | risc-news) ;;
basic_machine=mips-sony hp9k31[0-9] | hp9k2[0-9][0-9])
os=-newsos # maybe? cpu=m68000
;; vendor=hp
littlemips) os=hpux
basic_machine=mips-little ;;
os=-bsd isi | isi68)
;; cpu=m68k
dec3100 | decstatn | decstation | decstation-3100 | pmax) vendor=isi
basic_machine=mips-dec os=sysv # maybe?
os=-ultrix ;;
;; apollo68)
magnum | m3230) cpu=m68k
basic_machine=mips-mips vendor=apollo
os=-sysv # maybe? os=sysv # maybe?
;; ;;
gmicro) altos | altos3068)
basic_machine=tron cpu=m68k
os=-sysv # maybe? vendor=altos
;; os=sysv # maybe?
convex-c1) ;;
basic_machine=c1-convex altosgas)
os=-sysv # maybe? cpu=m68k
;; vendor=altos
convex-c2) os=gas
basic_machine=c2-convex ;;
os=-sysv # maybe? miniframe)
;; cpu=m68000
*) vendor=convergent
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 os=sysv # maybe?
;;
tower | tower-32)
cpu=m68k
vendor=ncr
os=sysv # maybe?
;;
bigmips | news-3600 | risc-news)
cpu=mips
vendor=sony
os=newsos # maybe?
;;
littlemips)
cpu=mips
vendor=little
os=bsd
;;
dec3100 | decstatn | decstation | decstation-3100 | pmax)
cpu=mips
vendor=dec
os=ultrix
;;
magnum | m3230)
cpu=mips
vendor=mips
os=sysv # maybe?
;;
gmicro)
cpu=tron
vendor=none
os=sysv # maybe?
;;
convex-c1)
cpu=c1
vendor=convex
os=sysv # maybe?
;;
convex-c2)
cpu=c2
vendor=convex
os=sysv # maybe?
;;
none)
cpu=none
vendor=none
os=none
;;
# not an alias. parse what we expect to be a canonical name.
*)
cpu=`echo $1 | sed 's/-.*$//'`
if [ "${cpu}" = "$1" ] ; then
# no vendor so this is an invalid name.
echo '***' No vendor: configuration \`$1\' not recognized 1>&2
exit 1 exit 1
;; else
# parse out vendor
rest=`echo $1 | sed "s/${cpu}-//"`
vendor=`echo ${rest} | sed 's/-.*$//'`
if [ "${vendor}" = "${rest}" ] ; then
# a missing os is acceptable
os=none
else
os=`echo ${rest} | sed "s/${vendor}-//"`
fi
fi
;;
esac esac
# Decode manufacturer-specific aliases for certain operating systems. # At this point we should have three parts of a canonical name in cpu,
# vendor, and os.
case $os in # verify that the cpu is known.
# First accept the basic system types.
# The portable systems comes first. case "${cpu}" in
-bsd* | -sysv* | -mach* \ vax | tahoe | i386 | i860 | m68k | m68000 | m88k | sparc | ns32k \
| -vms* | -sco* | -esix* | -isc* | -aix* | -sunos* | -hpux* \ | alliant | arm | c1 | c2 | mips | pyramid | tron | a29k \
| -unos* | -osf* | -v88r* | -aout | -coff | -bout \ | rtpc | rs6000 | i960)
| -nindy | -vxworks) ;;
;; *)
-newsos*) echo '***' Invalid cpu \`${cpu}\': configuration \`$1\' not recognized 1>&2
os=-bsd exit 1
;; ;;
-ultrix*)
os=-bsd
;;
-osfrose*)
os=-osf
;;
-osf*)
os=-bsd
;;
-dynix*)
os=-bsd
;;
-ctix*)
os=-sysv
;;
*)
# Get rid of the `-' at the beginning of $os.
os=`echo $1 | sed 's/[^-]*-//'`
echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
exit 1
;;
esac esac
echo ${basic_machine}${os} # verify that the vendor is known.
case "${vendor}" in
none | convex | mips | dec | little | sony | ncr | convergent \
| altos | apollo | isi | hp | next | sco | ibm | sun \
| unicom | sequent | encore | motorola | att | sgi \
| utek | gould | wrs | intel | aout | bout | coff) ;;
*)
echo '***' Invalid vendor \`${vendor}\': configuration \`$1\' not recognized 1>&2
exit 1
;;
esac
# verify that the os is known, if it exists.
case "${os}" in
aix* | aout | bout | bsd* | coff | ctix* | dynix* | esix* | hpux* \
| isc* | mach* | newsos* | nindy* | none | osf* | osf* | sco* \
| sunos* | sysv* | ultrix* | unos* | v88r* | vms* | vxworks*)
;;
*)
echo '***' Invalid os \`${os}\': configuration \`$1\' not recognized 1>&2
exit 1
;;
esac
echo ${cpu}-${vendor}-${os}