diff options
| -rwxr-xr-x | gas/config.sub | 579 | ||||
| -rwxr-xr-x | gas/configure | 142 | ||||
| -rw-r--r-- | gas/configure.in | 68 |
3 files changed, 406 insertions, 383 deletions
diff --git a/gas/config.sub b/gas/config.sub index 58338df..cd4d4af 100755 --- a/gas/config.sub +++ b/gas/config.sub @@ -13,264 +13,335 @@ # a failure to support a valid configuration from a meaningless # configuration. -# Separate what the user gave into CPU-company and OS (if any). -basic_machine=`echo $1 | sed 's/-[^-]*$//'` -if [ $basic_machine != $1 ] -then os=`echo $1 | sed 's/^.*-/-/'` -else os=; fi +# Please email any bugs, comments, and/or additions to this file to: +# configure@cygnus.com -# Decode aliases for certain machine-company combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - vax | tahoe | i386 | i860 | m68k | m68000 | m88k | sparc | ns32k \ - | alliant | arm | c1 | c2 | mips | pyramid | tron | a29k \ - | rtpc | rs6000 | i960 | none) - ;; - # Recognize the basic CPU types with company name. - vax-* | tahoe-* | i386-* | i860-* | m68k-* | m68000-* | m88k-* \ - | sparc-* | ns32k-* | alliant-* | arm-* | c1-* | c2-* \ - | mips-* | pyramid-* | tron-* | a29k-* | rtpc-* \ - | rs6000-* | i960-*) - ;; - # Recognize the machine names - # which stand for a CPU time and a company. - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - am29k) - basic_machine=a29k-unknown - os=-bsd - ;; - umax) - basic_machine=ns32k-umax - os=-sysv # maybe? - ;; - pn) - basic_machine=pn-gould - os=-sysv # maybe? - ;; - np1) - basic_machine=np1-gould - os=-sysv # maybe? - ;; - merlin) - basic_machine=merlin-utek - os=-sysv # maybe? - ;; - iris | iris4d) - basic_machine=mips-sgi - os=-sysv # maybe? - ;; - news1000) - basic_machine=m68030-sony - os=-sysv # maybe? - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-sysv # maybe? - ;; - unixpc | safari | pc7300 | 3b1 | 7300 | 7300-att | att-7300) - basic_machine=m68k-att - os=-sysv # maybe? - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - os=-sysv # maybe? - ;; - vax-dec) - basic_machine=vax - os=-ultrix # maybe? - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - mmax) - basic_machine=ns32k-encore - os=-sysv # maybe? - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - sun2) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - pbd) - basic_machine=sparc-unicom - os=-sysv - ;; - roadrunner | sun386 | sun386i) - basic_machine=i386-sun - os=-sunos - ;; - ps2) - basic_machine=i386-ibm - os=-sysv # maybe? - ;; - i386sco) - basic_machine=i386-sco - os=-sysv # maybe? - ;; - i386v) - basic_machine=i386-unknown - os=-sysv - ;; - i386v32) - basic_machine=i386-unknown - os=-sysv32 - ;; - next) - basic_machine=m68k-next - os=-sysv # maybe? - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux | hpux | hp9k3[2-9][0-9]) - basic_machine=m68k-hp - os=-hpux - ;; - hp9k31[0-9] | hp9k2[0-9][0-9]) - basic_machine=m68000-hp - os=-hpux - ;; - isi | isi68) - basic_machine=m68k-isi - os=-sysv # maybe? - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv # maybe? - ;; - altos | altos3068) - basic_machine=m68k-altos - os=-sysv # maybe? - ;; - altosgas) - basic_machine=m68k-altos - os=-gas - ;; - miniframe) - basic_machine=m68000-convergent - os=-sysv # maybe? - ;; - tower | tower-32) - basic_machine=m68k-ncr - os=-sysv # maybe? - ;; - bigmips | news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos # maybe? - ;; - littlemips) - basic_machine=mips-little - os=-bsd - ;; - dec3100 | decstatn | decstation | decstation-3100 | pmax) - basic_machine=mips-dec - os=-ultrix - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv # maybe? - ;; - gmicro) - basic_machine=tron - os=-sysv # maybe? - ;; - convex-c1) - basic_machine=c1-convex - os=-sysv # maybe? - ;; - convex-c2) - basic_machine=c2-convex - os=-sysv # maybe? - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 +# decode aliases into canonical names + +case "$1" in +# cpu alone is a valid alias for cpu-none-none. +vax | tahoe | i386 | i860 | m68k | m68000 | m88k | sparc | ns32k \ + | alliant | arm | c1 | c2 | mips | pyramid | tron | a29k \ + | rtpc | rs6000 | i960) + cpu=$1 + vendor=none + os=none + ;; +nindy960) + cpu=i960 + vendor=intel + os=nindy + ;; +vxworks68) + cpu=m68k + vendor=wrs + os=vxworks + ;; +vxworks960) + cpu=i960 + vendor=wrs + os=vxworks + ;; +am29k) + cpu=a29k + vendor=none + os=bsd + ;; +umax) + cpu=ns32k + vendor=encore + os=sysv # maybe? + ;; +pn) + cpu=pn + vendor=gould + os=sysv # maybe? + ;; +np1) + cpu=np1 + vendor=gould + os=sysv # maybe? + ;; +merlin) + cpu=merlin + vendor=utek + os=sysv # maybe? + ;; +iris | iris4d) + cpu=mips + vendor=sgi + os=sysv # maybe? + ;; +news1000) + cpu=m68030 + vendor=sony + os=sysv # maybe? + ;; +news | news700 | news800 | news900) + cpu=m68k + vendor=sony + os=sysv # maybe? + ;; +unixpc | safari | pc7300 | 3b1 | 7300 | 7300-att | att-7300) + cpu=m68k + vendor=att + os=sysv # maybe? + ;; +delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + cpu=m68k + vendor=motorola + os=sysv # maybe? + ;; +vax-dec) + cpu=vax + vendor=dec + os=ultrix # maybe? + ;; +balance) + cpu=ns32k + vendor=sequent + os=dynix + ;; +mmax) + cpu=ns32k + vendor=encore + os=sysv # maybe? + ;; +symmetry) + cpu=i386 + vendor=sequent + os=dynix + ;; +sun2) + cpu=m68000 + vendor=sun + os=sunos4 + ;; +sun2os3) + cpu=m68000 + vendor=sun + os=sunos3 + ;; +sun2os4) + cpu=m68000 + vendor=sun + os=sunos4 + ;; +sun3) + cpu=m68k + vendor=sun + os=sunos4 + ;; +sun3os3) + cpu=m68k + vendor=sun + os=sunos3 + ;; +sun3os4) + cpu=m68k + vendor=sun + os=sunos4 + ;; +sun4) + cpu=sparc + vendor=sun + os=sunos4 + ;; +sun4os3) + cpu=sparc + vendor=sun + os=sunos3 + ;; +sun4os4) + cpu=sparc + vendor=sun + os=sunos4 + ;; +pbd) + cpu=sparc + vendor=unicom + os=sysv + ;; +roadrunner | sun386 | sun386i) + cpu=i386 + vendor=sun + os=sunos + ;; +ps2) + cpu=i386 + vendor=ibm + os=sysv # maybe? + ;; +i386sco) + cpu=i386 + vendor=sco + os=sysv # maybe? + ;; +i386v) + cpu=i386 + vendor=none + os=sysv + ;; +i386v32) + cpu=i386 + vendor=none + os=sysv32 + ;; +next) + cpu=m68k + vendor=next + os=sysv # maybe? + ;; +hp300bsd) + cpu=m68k + vendor=hp + os=bsd + ;; +hp300hpux | hpux | hp9k3[2-9][0-9]) + cpu=m68k + vendor=hp + os=hpux + ;; +hp9k31[0-9] | hp9k2[0-9][0-9]) + cpu=m68000 + vendor=hp + os=hpux + ;; +isi | isi68) + cpu=m68k + vendor=isi + os=sysv # maybe? + ;; +apollo68) + cpu=m68k + vendor=apollo + os=sysv # maybe? + ;; +altos | altos3068) + cpu=m68k + vendor=altos + os=sysv # maybe? + ;; +altosgas) + cpu=m68k + vendor=altos + os=gas + ;; +miniframe) + 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 - ;; + 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 -# 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 - # First accept the basic system types. - # The portable systems comes first. - -bsd* | -sysv* | -mach* \ - | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos* | -hpux* \ - | -unos* | -osf* | -v88r* | -aout | -coff | -bout \ - | -nindy | -vxworks) - ;; - -newsos*) - os=-bsd - ;; - -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 - ;; +# verify that the cpu is known. + +case "${cpu}" in +vax | tahoe | i386 | i860 | m68k | m68000 | m88k | sparc | ns32k \ + | alliant | arm | c1 | c2 | mips | pyramid | tron | a29k \ + | rtpc | rs6000 | i960 | none) + ;; +*) + echo '***' Invalid cpu \`${cpu}\': configuration \`$1\' not recognized 1>&2 + exit 1 + ;; +esac + +# 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 ${basic_machine}${os} +echo ${cpu}-${vendor}-${os} diff --git a/gas/configure b/gas/configure index 0fb0508..e20b1ac 100755 --- a/gas/configure +++ b/gas/configure @@ -375,13 +375,13 @@ cpu_type=${target_cpu} # assign object format case ${target_os} in --sysv* | -coff*) +sysv* | -coff*) obj_format=coff ;; --bout*) +bout*) obj_format=bout ;; --bsd* | -sunos* | *) +bsd* | sunos* | *) obj_format=aout ;; 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` cd ${srcdir} 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 # Now build a Makefile for this host. @@ -639,104 +659,32 @@ E!O!F fi 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 # # $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. # # Revision 1.29 1991/08/20 04:56:51 rich diff --git a/gas/configure.in b/gas/configure.in index 1532d36..d305443 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -9,54 +9,58 @@ targetdependent=true # per-host: -# per-target: +gas_host=generic -# assign cpu type -emulation=generic - -case ${target} in -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 +case "${host_cpu}" in +a29k | rs6000 | vax) gas_host=${host_cpu} ;; +mips) + case "${host_os}" in + ultrix) gas_host=decstation ;; + esac ;; *) - cpu_type=generic + 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: + +# assign cpu type +emulation=generic + +cpu_type=${target_cpu} + # assign object format -case ${target} in -*-coff) +case ${target_os} in +sysv* | -coff*) obj_format=coff ;; -*-bout) +bout*) obj_format=bout ;; +bsd* | sunos* | *) + obj_format=aout + ;; generic) obj_format=generic ;; -*) - obj_format=aout - ;; esac # assign floating point type -case ${target} in +case ${target_cpu} in vax) atof=vax ;; @@ -65,7 +69,7 @@ vax) ;; 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/obj-${obj_format}.h config/obj-${obj_format}.c \ config/atof-${atof}.c" |