more Utah changes, some cleanup of mine

[binutils.git] / gas / configure.in

diff --git a/gas/configure.in b/gas/configure.in
index 2c90667c144ebcf92949debc97d4c903790f105e..c52d3ca3ab4375d06c7052593365890cf6b64929 100644 (file)
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -42,7 +42,7 @@ case "${host}" in
 
   alpha-*-osf*)                        gas_host=ansi           ;;
 
-  hppa*-hp-hpux*)              gas_host=hppahpux       ;;
+  hppa*-hp-hpux*)              gas_host=hpux           ;;
   hppa*-hp-bsd*)               gas_host=hppabsd        ;;
   hppa*-hp-osf*)               gas_host=hppaosf        ;;
 
@@ -97,10 +97,11 @@ emulation=generic
 # check for architecture variants
 case ${target_cpu} in
   sparclite*)   cpu_type=sparc ;;
-  sparc64)     cpu_type=sparc obj_format=aout ;;
+  sparc64)     cpu_type=sparc64 obj_format=elf ;; # v9
   m680[01234]0) cpu_type=m68k ;;
   m683??)       cpu_type=m68k ;;
   i486)                cpu_type=i386 ;;
+  h8300h)      cpu_type=h8300 ;;
   # Actually we've only got support for the 1.1, so we shouldn't generalize,
   # but this is what the support files are named...
   hppa1.1)     cpu_type=hppa ;;
@@ -120,11 +121,13 @@ case ${generic_target} in
   hppa-*-osf)          obj_format=elf emulation=hppa ;;
   hppa-*-hpux*)                obj_format=som emulation=hppa ;;
 
+  h8300-*-coff)                obj_format=coffbfd ;;
+
   i386-ibm-aix*)       obj_format=coffbfd gas_target=i386coff
                         emulation=i386aix ;;
   i386-*-bsd*)         obj_format=aout emulation=386bsd ;;
   i386-*-linux*)       obj_format=aout emulation=linux ;;
-  i386-*-coff | i386-*-sysv* | i386-*-sco* | i386-*-isc*)
+  i386-*-lynxos* | i386-*-coff | i386-*-sysv* | i386-*-sco* | i386-*-isc*)
                        obj_format=coffbfd gas_target=i386coff ;; 
   i386-*-go32)         obj_format=aout ;;
 
@@ -138,6 +141,8 @@ case ${generic_target} in
                        obj_format=coffbfd gas_target=m68kcoff ;;
   m68k-*-hpux)         obj_format=hp300 emulation=hp300 ;;
 
+  m88k-*-coff*)                obj_format=coffbfd gas_target=m88kcoff ;;
+
   # don't change emulation like *-*-bsd does
   mips-*-bsd*)         bfd_gas=yes obj_format=aout gas_target=mips-lit ;;
   mips-*-ultrix*)      obj_format=ecoff gas_target=mips-lit ;;
@@ -145,8 +150,11 @@ case ${generic_target} in
   mips-*-ecoff*)       obj_format=ecoff gas_target=mips-big ;;
   mips-*-irix*)                obj_format=ecoff gas_target=mips-big emulation=irix ;;
 
-  sparclite*-fujitsu-none)
-                       obj_format=aout ;;
+  sparc*-*-sunos4*)    bfd_gas=preferred obj_format=aout emulation=sun3 ;;
+
+  sparc*-fujitsu-none) obj_format=aout ;;
+
+  sparc64-*-aout*)     obj_format=aout bfd_gas=yes ;; # v9
 
   *-*-aout | *-*-scout | *-*-linux)
                        obj_format=aout ;;
@@ -206,18 +214,23 @@ case ${bfd_gas}-${obj_format} in
   *)           ;;
 esac
 
-case ${with_bfd_assembler} in
-  "")
-    # User specified nothing.
-    ;;
-  "${bfd_gas}")
+case ${with_bfd_assembler}-${bfd_gas} in
+  yes-yes | no-no)
     # We didn't override user's choice.
     ;;
-  no)
-    # ... but we overrode it.
+  no-yes)
     echo '*** Use of BFD is required for ${target}; overriding config options'\
                1>&2
     ;;
+  no-preferred)
+    bfd_gas=no
+    ;;
+  *-preferred)
+    bfd_gas=yes
+    ;;
+  -*)
+    # User specified nothing.
+    ;;
 esac
 
 files="config/ho-${gas_host}.h config/tc-${cpu_type}.c \
@@ -254,4 +267,14 @@ case ${need_bfd} in
     ;;
 esac
 
+if [ x${host} != x${target} ] ; then
+    rm -f Makefile.tem
+    mv Makefile Makefile.tem
+    echo CROSS=-DCROSS_COMPILE > Makefile
+    cat Makefile.tem >> Makefile
+    rm -f Makefile.tem
+else
+    true
+fi
+
 # end of gas/configure.in