Use elf on Unixware 7.

[deliverable/binutils-gdb.git] / gas / configure.in

diff --git a/gas/configure.in b/gas/configure.in
index df24951658d26277f3ab6ae4e1f458b70c26b1c7..dafdfd49785cb53f5ceef6d99740575fcd35d55a 100644 (file)
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -189,25 +189,30 @@ changequote([,])dnl
 
       avr-*-*)             fmt=elf bfd_gas=yes ;;
 
+      cris-*-*)                    fmt=multi bfd_gas=yes ;;
+
       d10v-*-*)                    fmt=elf bfd_gas=yes ;;
       d30v-*-*)                    fmt=elf bfd_gas=yes ;;
 
 
       fr30-*-*)                    fmt=elf bfd_gas=yes ;;
 
-      hppa-*-linux-gnu*)    fmt=elf em=linux ;;
+      hppa-*-linux-gnu*)    case ${cpu} in
+                               hppa*64*)
+                                       fmt=elf em=hppalinux64;;
+                               hppa*)
+                                       fmt=elf em=linux;;
+                           esac ;;
       hppa-*-*elf*)         fmt=elf em=hppa ;;
       hppa-*-lites*)        fmt=elf em=hppa ;;
       hppa-*-osf*)          fmt=som em=hppa ;;
       hppa-*-rtems*)        fmt=elf em=hppa ;;
-      hppa-*-hpux11*)      em=hppa
-                           case ${cpu} in
+      hppa-*-hpux11*)      case ${cpu} in
                                hppa*64*)
-                                       fmt=elf;;
+                                       fmt=elf em=hppa64 ;;
                                hppa*)
-                                       fmt=som;;
-                           esac
-                           ;;
+                                       fmt=som em=hppa ;;
+                           esac ;;
       hppa-*-hpux*)         fmt=som em=hppa ;;
       hppa-*-mpeix*)        fmt=som em=hppa ;;
       hppa-*-bsd*)          fmt=som em=hppa ;;
@@ -228,9 +233,9 @@ changequote([,])dnl
       i386-*-linux*coff*)   fmt=coff em=linux ;;
       i386-*-linux-gnu*)    fmt=elf em=linux bfd_gas=yes ;;
       i386-*-lynxos*)       fmt=coff em=lynx ;;
-      i386-*-sysv4* | i386-*-solaris* | i386-*-elf)
-                           fmt=elf bfd_gas=yes ;;
 changequote(,)dnl
+      i386-*-sysv[45]* | i386-*-solaris* | i386-*-elf)
+                           fmt=elf bfd_gas=yes ;;
       i386-*-freebsdaout* | i386-*-freebsd[12].* | i386-*-freebsd[12])
                             fmt=aout em=386bsd ;;
 changequote([,])dnl
@@ -260,6 +265,9 @@ changequote([,])dnl
       i386-*-mingw32*)      fmt=coff em=pe bfd_gas=yes ;;
       i386-*-*nt*)          fmt=coff em=pe bfd_gas=yes ;;
       i386-*-vxworks*)      fmt=aout ;;
+      i860-stardent-sysv4* | i860-stardent-elf*)
+                           fmt=elf bfd_gas=yes endian=little
+                           AC_MSG_WARN(GAS support for ${generic_target} is preliminary and a work in progress) ;;
       i960-*-bout)          fmt=bout ;;
       i960-*-coff)          fmt=coff em=ic960 ;;
       i960-*-rtems*)        fmt=coff em=ic960 ;;
@@ -319,11 +327,7 @@ changequote([,])dnl
       mips-*-irix*)         fmt=ecoff ;;
       mips-*-lnews*)        fmt=ecoff em=lnews ;;
       mips-*-riscos*)       fmt=ecoff ;;
-      mips-*-sysv4*MP*)     if test -d /usr/dde; then 
-                             fmt=elf 
-                             em=tmips 
-                           fi
-                           ;;
+      mips-*-sysv4*MP*)     fmt=elf em=tmips ;;
       mips-*-sysv*)         fmt=ecoff ;;
       mips-*-elf* | mips-*-rtems* | mips-*-linux-gnu* | mips-*-gnu* | mips-*-openbsd*)
                            fmt=elf ;;
@@ -567,10 +571,7 @@ changequote([,])dnl
                        big)    emulation="mipsbelf mipslelf mipself" ;;
                        *)      emulation="mipslelf mipsbelf mipself" ;;
                        esac ;;
-      mips-*-sysv4*MP*-*) if test -d /usr/dde; then
-                               emulation="mipsbelf mipslelf mipself mipsbecoff mipslecoff mipsecoff" 
-                       fi
-                       ;;
+      mips-*-sysv4*MP*-*) emulation="mipsbelf mipslelf mipself mipsbecoff mipslecoff mipsecoff" ;;
       # i386-pc-pe-coff != i386-pc-coff.
       i386-*-pe-coff)  ;;
       # Uncommenting the next line will turn on support for i386 AOUT
@@ -580,6 +581,9 @@ changequote([,])dnl
       i386-*-aout)     emulation="i386aout" ;;
       i386-*-coff)     emulation="i386coff" ;;
       i386-*-elf)      emulation="i386elf" ;;
+
+      # Always all formats.  Having a.out first makes it the default.
+      cris-*-*)                emulation="crisaout criself" ;;
     esac
 
     emulations="$emulations $emulation"
@@ -732,11 +736,6 @@ if test `set . $emfiles ; shift ; echo $#` -gt 0 ; then
   # USE_EMULATIONS or include any of the e-files as they will only be bloat.
   case "${obj_format}${emfiles}" in
     multi* | *mips*)
-  # if te_file is tmips, that means the target is mips-*-sysv4*MP* and we do
-  # not set it to multi.
-      if [[ $te_file -ne "tmips" ]]; then
-        te_file=multi
-      fi
       extra_objects="$extra_objects $emfiles"
       AC_DEFINE(USE_EMULATIONS, 1, [Use emulation support?]) ;;
   esac