Update to current standards.

This commit is contained in:
K. Richard Pixley
1991-08-28 21:49:12 +00:00
parent dae50edd99
commit b678740d04
3 changed files with 406 additions and 383 deletions

579
gas/config.sub vendored
View File

@ -13,264 +13,335 @@
# 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). # Please email any bugs, comments, and/or additions to this file to:
basic_machine=`echo $1 | sed 's/-[^-]*$//'` # configure@cygnus.com
if [ $basic_machine != $1 ]
then os=`echo $1 | sed 's/^.*-/-/'`
else os=; fi
# Decode aliases for certain machine-company combinations. # decode aliases into canonical names
case $basic_machine in
# Recognize the basic CPU types without company name. case "$1" in
vax | tahoe | i386 | i860 | m68k | m68000 | m88k | sparc | ns32k \ # cpu alone is a valid alias for cpu-none-none.
| alliant | arm | c1 | c2 | mips | pyramid | tron | a29k \ vax | tahoe | i386 | i860 | m68k | m68000 | m88k | sparc | ns32k \
| rtpc | rs6000 | i960 | none) | alliant | arm | c1 | c2 | mips | pyramid | tron | a29k \
;; | rtpc | rs6000 | i960)
# Recognize the basic CPU types with company name. cpu=$1
vax-* | tahoe-* | i386-* | i860-* | m68k-* | m68000-* | m88k-* \ vendor=none
| sparc-* | ns32k-* | alliant-* | arm-* | c1-* | c2-* \ os=none
| mips-* | pyramid-* | tron-* | a29k-* | rtpc-* \ ;;
| rs6000-* | i960-*) nindy960)
;; cpu=i960
# Recognize the machine names vendor=intel
# which stand for a CPU time and a company. os=nindy
nindy960) ;;
basic_machine=i960-intel vxworks68)
os=-nindy cpu=m68k
;; vendor=wrs
vxworks68) os=vxworks
basic_machine=m68k-wrs ;;
os=-vxworks vxworks960)
;; cpu=i960
vxworks960) vendor=wrs
basic_machine=i960-wrs os=vxworks
os=-vxworks ;;
;; am29k)
am29k) cpu=a29k
basic_machine=a29k-unknown vendor=none
os=-bsd os=bsd
;; ;;
umax) umax)
basic_machine=ns32k-umax cpu=ns32k
os=-sysv # maybe? vendor=encore
;; os=sysv # maybe?
pn) ;;
basic_machine=pn-gould pn)
os=-sysv # maybe? cpu=pn
;; vendor=gould
np1) os=sysv # maybe?
basic_machine=np1-gould ;;
os=-sysv # maybe? np1)
;; cpu=np1
merlin) vendor=gould
basic_machine=merlin-utek os=sysv # maybe?
os=-sysv # maybe? ;;
;; merlin)
iris | iris4d) cpu=merlin
basic_machine=mips-sgi vendor=utek
os=-sysv # maybe? os=sysv # maybe?
;; ;;
news1000) iris | iris4d)
basic_machine=m68030-sony cpu=mips
os=-sysv # maybe? vendor=sgi
;; os=sysv # maybe?
news | news700 | news800 | news900) ;;
basic_machine=m68k-sony news1000)
os=-sysv # maybe? cpu=m68030
;; vendor=sony
unixpc | safari | pc7300 | 3b1 | 7300 | 7300-att | att-7300) os=sysv # maybe?
basic_machine=m68k-att ;;
os=-sysv # maybe? news | news700 | news800 | news900)
;; cpu=m68k
delta | 3300 | motorola-3300 | motorola-delta \ vendor=sony
| 3300-motorola | delta-motorola) os=sysv # maybe?
basic_machine=m68k-motorola ;;
os=-sysv # maybe? unixpc | safari | pc7300 | 3b1 | 7300 | 7300-att | att-7300)
;; cpu=m68k
vax-dec) vendor=att
basic_machine=vax os=sysv # maybe?
os=-ultrix # maybe? ;;
;; delta | 3300 | motorola-3300 | motorola-delta \
balance) | 3300-motorola | delta-motorola)
basic_machine=ns32k-sequent cpu=m68k
os=-dynix vendor=motorola
;; os=sysv # maybe?
mmax) ;;
basic_machine=ns32k-encore vax-dec)
os=-sysv # maybe? cpu=vax
;; vendor=dec
symmetry) os=ultrix # maybe?
basic_machine=i386-sequent ;;
os=-dynix balance)
;; cpu=ns32k
sun2) vendor=sequent
basic_machine=m68000-sun os=dynix
os=-sunos4 ;;
;; mmax)
sun2os3) cpu=ns32k
basic_machine=m68000-sun vendor=encore
os=-sunos3 os=sysv # maybe?
;; ;;
sun2os4) symmetry)
basic_machine=m68000-sun cpu=i386
os=-sunos4 vendor=sequent
;; os=dynix
sun3) ;;
basic_machine=m68k-sun sun2)
os=-sunos4 cpu=m68000
;; vendor=sun
sun3os3) os=sunos4
basic_machine=m68k-sun ;;
os=-sunos3 sun2os3)
;; cpu=m68000
sun3os4) vendor=sun
basic_machine=m68k-sun os=sunos3
os=-sunos4 ;;
;; sun2os4)
sun4) cpu=m68000
basic_machine=sparc-sun vendor=sun
os=-sunos4 os=sunos4
;; ;;
sun4os3) sun3)
basic_machine=sparc-sun cpu=m68k
os=-sunos3 vendor=sun
;; os=sunos4
sun4os4) ;;
basic_machine=sparc-sun sun3os3)
os=-sunos4 cpu=m68k
;; vendor=sun
pbd) os=sunos3
basic_machine=sparc-unicom ;;
os=-sysv sun3os4)
;; cpu=m68k
roadrunner | sun386 | sun386i) vendor=sun
basic_machine=i386-sun os=sunos4
os=-sunos ;;
;; sun4)
ps2) cpu=sparc
basic_machine=i386-ibm vendor=sun
os=-sysv # maybe? os=sunos4
;; ;;
i386sco) sun4os3)
basic_machine=i386-sco cpu=sparc
os=-sysv # maybe? vendor=sun
;; os=sunos3
i386v) ;;
basic_machine=i386-unknown sun4os4)
os=-sysv cpu=sparc
;; vendor=sun
i386v32) os=sunos4
basic_machine=i386-unknown ;;
os=-sysv32 pbd)
;; cpu=sparc
next) vendor=unicom
basic_machine=m68k-next os=sysv
os=-sysv # maybe? ;;
;; roadrunner | sun386 | sun386i)
hp300bsd) cpu=i386
basic_machine=m68k-hp vendor=sun
os=-bsd os=sunos
;; ;;
hp300hpux | hpux | hp9k3[2-9][0-9]) ps2)
basic_machine=m68k-hp cpu=i386
os=-hpux vendor=ibm
;; os=sysv # maybe?
hp9k31[0-9] | hp9k2[0-9][0-9]) ;;
basic_machine=m68000-hp i386sco)
os=-hpux cpu=i386
;; vendor=sco
isi | isi68) os=sysv # maybe?
basic_machine=m68k-isi ;;
os=-sysv # maybe? i386v)
;; cpu=i386
apollo68) vendor=none
basic_machine=m68k-apollo os=sysv
os=-sysv # maybe? ;;
;; i386v32)
altos | altos3068) cpu=i386
basic_machine=m68k-altos vendor=none
os=-sysv # maybe? os=sysv32
;; ;;
altosgas) next)
basic_machine=m68k-altos cpu=m68k
os=-gas vendor=next
;; os=sysv # maybe?
miniframe) ;;
basic_machine=m68000-convergent hp300bsd)
os=-sysv # maybe? cpu=m68k
;; vendor=hp
tower | tower-32) os=bsd
basic_machine=m68k-ncr ;;
os=-sysv # maybe? hp300hpux | hpux | hp9k3[2-9][0-9])
;; cpu=m68k
bigmips | news-3600 | risc-news) vendor=hp
basic_machine=mips-sony os=hpux
os=-newsos # maybe? ;;
;; hp9k31[0-9] | hp9k2[0-9][0-9])
littlemips) cpu=m68000
basic_machine=mips-little vendor=hp
os=-bsd os=hpux
;; ;;
dec3100 | decstatn | decstation | decstation-3100 | pmax) isi | isi68)
basic_machine=mips-dec cpu=m68k
os=-ultrix vendor=isi
;; os=sysv # maybe?
magnum | m3230) ;;
basic_machine=mips-mips apollo68)
os=-sysv # maybe? cpu=m68k
;; vendor=apollo
gmicro) os=sysv # maybe?
basic_machine=tron ;;
os=-sysv # maybe? altos | altos3068)
;; cpu=m68k
convex-c1) vendor=altos
basic_machine=c1-convex os=sysv # maybe?
os=-sysv # maybe? ;;
;; altosgas)
convex-c2) cpu=m68k
basic_machine=c2-convex vendor=altos
os=-sysv # maybe? os=gas
;; ;;
*) miniframe)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 cpu=m68000
vendor=convergent
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 | none)
| -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}

142
gas/configure vendored
View File

@ -375,13 +375,13 @@ cpu_type=${target_cpu}
# assign object format # assign object format
case ${target_os} in case ${target_os} in
-sysv* | -coff*) sysv* | -coff*)
obj_format=coff obj_format=coff
;; ;;
-bout*) bout*)
obj_format=bout obj_format=bout
;; ;;
-bsd* | -sunos* | *) bsd* | sunos* | *)
obj_format=aout obj_format=aout
;; ;;
generic) generic)
@ -620,6 +620,26 @@ links="host.h targ-cpu.c targ-cpu.h targ-env.h obj-format.h obj-format.c atof-ta
originaldir=`pwd` originaldir=`pwd`
cd ${srcdir} cd ${srcdir}
fi fi
# If there are subdirectories, then recurse.
if [ -z "${norecurse}" -a -n "${configdirs}" ] ; then
for configdir in ${configdirs} ; do
if [ -n "${verbose}" ] ; then
echo Configuring ${configdir}...
fi
if [ -d ${configdir} ] ; then
(cd ${configdir} ;
./configure -recursing ${host} +target=${target} \
${verbose} ${subdirs} ${removing} +destdir=${destdir}) \
| sed 's/^/ /'
else
if [ -n "${verbose}" ] ; then
echo Warning: directory \"${configdir}\" is missing.
fi
fi
done
fi
done # for each target done # for each target
# Now build a Makefile for this host. # Now build a Makefile for this host.
@ -639,104 +659,32 @@ E!O!F
fi fi
done # for each host done # for each host
# If there are subdirectories, then recurse.
if [ -n "${norecurse}" -o -z "${configdirs}" ] ; then exit 0 ; fi
# configdirs is not null
for configdir in ${configdirs} ; do
if [ -n "${verbose}" ] ; then
echo Configuring ${configdir}...
fi
specifics=
commons=
if [ -n "${defaulttargets}" ] ; then
for host in ${hosts} ; do
if [ -d ${configdir}.${host} ] ; then
newspecifics="${specifics} ${host}"
specifics=${newspecifics}
else
newcommons="${commons} ${host}"
commons=${newcommons}
fi # if target specific
done # for each host
if [ -n "${commons}" ] ; then
if [ -d ${configdir} ] ; then
(cd ${configdir} ;
./configure -recursing ${commons} ${verbose} ${subdirs} ${removing} +destdir=${destdir}) \
| sed 's/^/ /'
else
if [ -n "${verbose}" ] ; then
echo Warning: directory \"${configdir}\" is missing.
fi
fi
fi # if any common hosts
if [ -n "${specifics}" ] ; then
for host in ${specifics} ; do
if [ -n "${verbose}" ] ; then
echo Configuring target specific directory ${configdir}.${host}...
fi
(cd ${configdir}.${host} ;
./configure -recursing ${host} ${verbose} ${subdirs} ${removing} +destdir=${destdir}) \
| sed 's/^/ /'
done # for host in specifics
fi # if there are any specifics
else
for target in ${targets} ; do
if [ -d ${configdir}.${target} ] ; then
newspecifics="${specifics} ${target}"
specifics=${newspecifics}
else
newcommons="${commons} +target=${target}"
commons=${newcommons}
fi
done # check for target specific dir override
if [ -n "${verbose}" ] ; then
echo " "commons=\"${commons}\"
echo " "specifics=\"${specifics}\"
fi # if verbose
if [ -n "${commons}" ] ; then
if [ -d ${configdir} ] ; then
(cd ${configdir} ;
./configure -recursing ${hosts} ${verbose} ${subdirs} ${removing} \
${commons} +destdir=${destdir}) \
| sed 's/^/ /'
else
if [ -n "${verbose}" ] ; then
echo Warning: directory \"${configdir}\" is missing.
fi
fi
fi # if any commons
if [ -n "${specifics}" ] ; then
for target in ${specifics} ; do
if [ -n "${verbose}" ] ; then
echo Configuring target specific directory ${configdir}.${target}...
fi
(cd ${configdir}.${target} ;
./configure -recursing ${hosts} ${verbose} ${subdirs} ${removing} \
"+target=${target}" +destdir=${destdir}) \
| sed 's/^/ /'
done
fi # if any specifics
fi # not default targets
done
exit 0 exit 0
# #
# $Log$ # $Log$
# Revision 1.21 1991/08/22 03:21:56 rich # Revision 1.23 1991/08/28 21:49:10 rich
# Update to current standards.
#
# Revision 1.35 1991/08/26 04:29:31 rich
# Welcome cvs to the big time.
#
# Revision 1.34 1991/08/25 23:40:23 rich
# rcs enters the soup.
#
# Revision 1.33 1991/08/25 21:48:38 rich
# Adding diff to the fray.
#
# Revision 1.32 1991/08/25 20:18:20 rich
# Adding grep to the fray.
#
# Revision 1.31 1991/08/23 04:50:57 rich
# Minor config polish.
#
# Revision 1.22 1991/08/23 03:31:43 rich
# Minor polish & config mapping.
#
# Revision 1.30 1991/08/22 07:15:51 rich
# Three part names, etc. # Three part names, etc.
# #
# Revision 1.29 1991/08/20 04:56:51 rich # Revision 1.29 1991/08/20 04:56:51 rich

View File

@ -9,54 +9,58 @@ targetdependent=true
# per-host: # per-host:
gas_host=generic
case "${host_cpu}" in
a29k | rs6000 | vax) gas_host=${host_cpu} ;;
mips)
case "${host_os}" in
ultrix) gas_host=decstation ;;
esac
;;
*)
case "${host_os}" in
ansi | ultrix | hpux | sysv*) gas_host=${host_os} ;;
*)
case "${host_vendor}" in
sun)
case "${host_cpu}" in
m68k) gas_host=sun3 ;;
i386) gas_host=sun386 ;;
sparc) gas_host=sun4 ;;
esac
;;
esac
;;
esac
;;
esac
# per-target: # per-target:
# assign cpu type # assign cpu type
emulation=generic emulation=generic
case ${target} in cpu_type=${target_cpu}
sun4* | sparc*)
cpu_type=sparc
;;
sun3*)
cpu_type=m68k
;;
i386*)
cpu_type=i386
;;
i960*)
cpu_type=i960
emulation=ic960
;;
a29k*)
cpu_type=a29k
;;
m68k*)
cpu_type=m68k
;;
*)
cpu_type=generic
;;
esac
# assign object format # assign object format
case ${target} in case ${target_os} in
*-coff) sysv* | -coff*)
obj_format=coff obj_format=coff
;; ;;
*-bout) bout*)
obj_format=bout obj_format=bout
;; ;;
bsd* | sunos* | *)
obj_format=aout
;;
generic) generic)
obj_format=generic obj_format=generic
;; ;;
*)
obj_format=aout
;;
esac esac
# assign floating point type # assign floating point type
case ${target} in case ${target_cpu} in
vax) vax)
atof=vax atof=vax
;; ;;
@ -65,7 +69,7 @@ vax)
;; ;;
esac esac
files="config/ho-${host}.h config/tc-${cpu_type}.c \ files="config/ho-${gas_host}.h config/tc-${cpu_type}.c \
config/tc-${cpu_type}.h config/te-${emulation}.h \ config/tc-${cpu_type}.h config/te-${emulation}.h \
config/obj-${obj_format}.h config/obj-${obj_format}.c \ config/obj-${obj_format}.h config/obj-${obj_format}.c \
config/atof-${atof}.c" config/atof-${atof}.c"