First cut at handling multiple emulation modes for some MIPS targets.

Mostly works, not entirely.
Details in ChangeLog.

1 files changed, 343 insertions, 173 deletions

diff --git a/gas/configure.in b/gas/configure.in
index 82ee491..aa846ef 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -7,7 +7,6 @@ dnl
 AC_PREREQ(2.3)dnl We only need 2.0, but pre-2.3 loses on some AIX version.
 AC_INIT(as.h)dnl
 dnl
-bfd_gas=no
 user_bfd_gas=
 AC_ARG_ENABLE(bfd-assembler,
 [    bfd-assembler	use BFD back end for writing object files],
@@ -16,6 +15,14 @@ AC_ARG_ENABLE(bfd-assembler,
   no)  user_bfd_gas=no ;;
   *)   AC_MSG_ERROR(bad value ${enableval} given for bfd-assembler option) ;;
 esac])dnl
+AC_ARG_ENABLE(targets,
+[    targets            alternative target configurations besides the primary],
+[case "${enableval}" in
+  yes | "") AC_ERROR(enable-targets option must specify target names or 'all')
+	    ;;
+  no)	    enable_targets= ;;
+  *)	    enable_targets=$enableval ;;
+esac])dnl
 
 # Generate a header file -- gets more post-processing by Makefile later.
 AC_CONFIG_HEADER(conf)
@@ -25,7 +32,7 @@ AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/..)
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
 
-emulation=generic
+te_file=generic
 
 # assign cpu type
 
@@ -41,8 +48,8 @@ changequote([,])dnl
   m8*)		cpu_type=m88k ;;
   mips*el)	cpu_type=mips endian=little;;
   mips*)	cpu_type=mips endian=big ;;
-  powerpcle*)	cpu_type=ppc endian=little;;
-  powerpc*)	cpu_type=ppc endian=big;;
+  powerpcle*)	cpu_type=ppc endian=little ;;
+  powerpc*)	cpu_type=ppc endian=big ;;
   rs6000*)	cpu_type=ppc ;;
   sparc64)	cpu_type=sparc obj_format=elf
 		AC_DEFINE(sparcv9) ;;
@@ -61,166 +68,270 @@ esac
 AC_SUBST(OPCODES_LIB)
 
 gas_target=${cpu_type}
-generic_target=${cpu_type}-${target_vendor}-${target_os}
-dev=no
+this_target=${generic_target}
+
+canon_targets=""
+if test -n "$enable_targets" ; then
+  for t in `echo $enable_targets | sed 's/,/ /g'`; do
+    result=`$ac_config_sub $t 2>/dev/null`
+    if test -n "$result" ; then
+      canon_targets="$canon_targets $result"
+#    else
+#      # Permit "all", etc.  We don't support it yet though.
+#      canon_targets="$canon_targets $t"
+    fi
+  done
+  GAS_UNIQ(canon_targets)
+fi
+
+emulations=""
+
+for this_target in $target $canon_targets ; do
+
+    eval `echo $this_target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/cpu=\1 vendor=\2 os=\3/'`
 
-# assign object format
-case ${generic_target} in
-  a29k-amd-udi)		obj_format=coff gas_target=ebmon29k ;;
-  a29k-amd-ebmon)	obj_format=coff gas_target=ebmon29k ;;
-  a29k-*-vxworks*)      obj_format=coff ;;
+    # check for architecture variants
+    case ${cpu} in
+      hppa*)		cpu_type=hppa ;;
+changequote(,)dnl
+      i[45]86)		cpu_type=i386 ;;
+      m680[012346]0)	cpu_type=m68k ;;
+      m68008)		cpu_type=m68k ;;
+      m683??)		cpu_type=m68k ;;
+changequote([,])dnl
+      m8*)		cpu_type=m88k ;;
+      mips*el)		cpu_type=mips endian=little;;
+      mips*)		cpu_type=mips endian=big ;;
+      powerpcle*)	cpu_type=ppc endian=little ;;
+      powerpc*)		cpu_type=ppc endian=big ;;
+      rs6000*)		cpu_type=ppc ;;
+      sparc64)		cpu_type=sparc obj_format=elf want_sparcv9=true ;;
+      sparclite*)	cpu_type=sparc ;;
+      *)		cpu_type=${target_cpu} ;;
+    esac
+
+    if test ${this_target} = $target ; then
+      target_cpu_type=${cpu_type}
+    elif test ${target_cpu_type} != ${cpu_type} ; then
+      continue
+    fi
+
+    targ=${cpu_type}
+    generic_target=${cpu_type}-$vendor-$os
+    dev=no
+    bfd_gas=no
+    em=generic
 
-  alpha-*-netware*)	obj_format=ecoff ;;
-  alpha-*-osf*)		obj_format=ecoff ;;
+    # assign object format
+    case ${generic_target} in
+      a29k-amd-udi)         fmt=coff targ=ebmon29k ;;
+      a29k-amd-ebmon)       fmt=coff targ=ebmon29k ;;
+      a29k-*-vxworks*)      fmt=coff ;;
+
+      alpha-*-netware*)     fmt=ecoff ;;
+      alpha-*-osf*)         fmt=ecoff ;;
 
 # start-sanitize-arc
-  arc-*-elf*)		obj_format=elf bfd_gas=yes ;;
+      arc-*-elf*)           fmt=elf bfd_gas=yes ;;
 # end-sanitize-arc
 
-  arm-*-riscix*)	obj_format=aout ;;
-
-  hppa-*-*elf*)		obj_format=elf emulation=hppa ;;
-  hppa-*-lites*)	obj_format=elf emulation=hppa ;;
-  hppa-*-osf*)		obj_format=som emulation=hppa ;;
-  hppa-*-hpux*)		obj_format=som emulation=hppa ;;
-  hppa-*-bsd*)		obj_format=som emulation=hppa ;;
-  hppa-*-hiux*)		obj_format=som emulation=hppa ;;
-
-  h8300-*-coff)		obj_format=coff ;;
-
-  i386-ibm-aix*)	obj_format=coff gas_target=i386coff
-			 emulation=i386aix ;;
-  i386-*-bsd*)		obj_format=aout emulation=386bsd ;;
-  i386-*-netbsd0.8)	obj_format=aout emulation=386bsd ;;
-  i386-*-netbsd*)	obj_format=aout emulation=nbsd bfd_gas=yes;;
-  i386-*-linux*aout*)	obj_format=aout  emulation=linux ;;
-  i386-*-linux*coff*)	obj_format=coff emulation=linux
-			 gas_target=i386coff ;;
-  i386-*-linux*)	obj_format=elf emulation=linux ;;
-  i386-*-lynxos*)	obj_format=coff gas_target=i386coff
-			 emulation=lynx ;;
-  i386-*-sysv4* | i386-*-solaris* | i386-*-elf)
-			obj_format=elf ;;
-  i386-*-coff | i386-*-sysv* | i386-*-sco* | i386-*-isc*)
-			obj_format=coff gas_target=i386coff ;;
-  i386-*-vsta)		obj_format=aout ;;
-  i386-*-go32)		obj_format=coff gas_target=i386coff ;;
-  i386-*-gnu*elf*)	obj_format=elf ;;
-  i386-*-mach* | i386-*-gnu*)
-			obj_format=aout emulation=mach bfd_gas=yes ;;
-  i386-*-msdos*)	obj_format=aout ;;
-
-  i960-*-bout)		obj_format=bout ;;
-  i960-*-coff)		obj_format=coff emulation=ic960 gas_target=ic960coff ;;
-  i960-*-nindy*)	obj_format=bout ;;
-  i960-*-vxworks4*)	obj_format=bout ;;
-  i960-*-vxworks5.0)	obj_format=bout ;;
-  i960-*-vxworks5.*)	obj_format=coff emulation=ic960 gas_target=ic960coff ;;
-  i960-*-vxworks*)	obj_format=bout ;;
-
-  m68k-*-vxworks* | m68k-ericsson-ose | m68k-*-sunos*)
-			obj_format=aout emulation=sun3 ;;
-  m68k-motorola-sysv)	obj_format=coff gas_target=m68kcoff emulation=delta ;;
-  m68k-bull-sysv3*)	obj_format=coff gas_target=m68kcoff emulation=dpx2 ;;
-  m68k-apollo-*)	obj_format=coff gas_target=apollo emulation=apollo ;;
-  m68k-*-coff | m68k-*-sysv*)
-			obj_format=coff gas_target=m68kcoff ;;
-  m68k-*-elf)		obj_format=elf ;;
-  m68k-*-hpux*)		obj_format=hp300 emulation=hp300 ;;
-  m68k-*-lynxos*)	obj_format=coff gas_target=m68kcoff
-			 emulation=lynx ;;
-  m68k-*-netbsd*)	obj_format=aout emulation=nbsd bfd_gas=yes ;;
-
-  m88k-*-coff*)		obj_format=coff gas_target=m88kcoff ;;
-
-  # don't change emulation like *-*-bsd does
-  mips-dec-bsd*)	obj_format=aout gas_target=mips-lit ;;
-  mips-sony-bsd*)	obj_format=ecoff gas_target=mips-big ;;
-  mips-*-bsd*)		AC_MSG_ERROR(Unknown vendor for mips-bsd configuration.) ;;
-  mips-*-ultrix*)	obj_format=ecoff gas_target=mips-lit ;;
-  mips-*-ecoff*)	obj_format=ecoff 
-			case "$endian" in
-			big) gas_target=mips-big ;;
-			*)   gas_target=mips-lit ;;
-			esac
-			;;
-  mips-*-ecoff*)	obj_format=ecoff gas_target=mips-big ;;
-  mips-*-gnu*)		obj_format=aout
-			case "$endian" in
-			big) gas_target=mips-big ;;
-			*)   gas_target=mips-lit ;;
-			esac
-			;;
-  mips-*-irix5*)	obj_format=elf gas_target=mips-big ;;
-  mips-*-irix*)		obj_format=ecoff gas_target=mips-big ;;
-  mips-*-riscos*)	obj_format=ecoff gas_target=mips-big ;;
-  mips-*-sysv*)		obj_format=ecoff gas_target=mips-big ;;
-  mips-*-elf*)		obj_format=elf 
-			case "$endian" in
-			big) gas_target=mips-big ;;
-			*)   gas_target=mips-lit ;;
-			esac
-			;;
-  ppc-*-aix*)		obj_format=coff ;;
-  ppc-*-elf* | ppc-*-eabi* | ppc-*-sysv4*)
-			obj_format=elf
-			case "$endian" in
-			big) gas_target=ppc-big ;;
-			*)   gas_target=ppc-lit ;;
-			esac
-			;;
-  ppc-*-netware*)	obj_format=elf emulation=ppcnw ;;
-
-  sh-*-coff)		obj_format=coff ;;
+      arm-*-riscix*)        fmt=aout ;;
+
+      hppa-*-*elf*)         fmt=elf em=hppa ;;
+      hppa-*-lites*)        fmt=elf em=hppa ;;
+      hppa-*-osf*)          fmt=som em=hppa ;;
+      hppa-*-hpux*)         fmt=som em=hppa ;;
+      hppa-*-bsd*)          fmt=som em=hppa ;;
+      hppa-*-hiux*)         fmt=som em=hppa ;;
+
+      h8300-*-coff)         fmt=coff ;;
+
+      i386-ibm-aix*)        fmt=coff targ=i386coff
+			     em=i386aix ;;
+      i386-*-bsd*)          fmt=aout em=386bsd ;;
+      i386-*-netbsd0.8)     fmt=aout em=386bsd ;;
+      i386-*-netbsd*)       fmt=aout em=nbsd bfd_gas=yes;;
+      i386-*-linux*aout*)   fmt=aout  em=linux ;;
+      i386-*-linux*coff*)   fmt=coff em=linux
+			     targ=i386coff ;;
+      i386-*-linux*)        fmt=elf em=linux ;;
+      i386-*-lynxos*)       fmt=coff targ=i386coff
+			     em=lynx ;;
+      i386-*-sysv4* | i386-*-solaris* | i386-*-elf)
+			    fmt=elf ;;
+      i386-*-coff | i386-*-sysv* | i386-*-sco* | i386-*-isc*)
+			    fmt=coff targ=i386coff ;;
+      i386-*-vsta)          fmt=aout ;;
+      i386-*-go32)          fmt=coff targ=i386coff ;;
+      i386-*-gnu*elf*)      fmt=elf ;;
+      i386-*-mach* | i386-*-gnu*)
+			    fmt=aout em=mach bfd_gas=yes ;;
+      i386-*-msdos*)        fmt=aout ;;
+
+      i960-*-bout)          fmt=bout ;;
+      i960-*-coff)          fmt=coff em=ic960 targ=ic960coff ;;
+      i960-*-nindy*)        fmt=bout ;;
+      i960-*-vxworks4*)     fmt=bout ;;
+      i960-*-vxworks5.0)    fmt=bout ;;
+      i960-*-vxworks5.*)    fmt=coff em=ic960 targ=ic960coff ;;
+      i960-*-vxworks*)      fmt=bout ;;
+
+      m68k-*-vxworks* | m68k-ericsson-ose | m68k-*-sunos*)
+			    fmt=aout em=sun3 ;;
+      m68k-motorola-sysv)   fmt=coff targ=m68kcoff em=delta ;;
+      m68k-bull-sysv3*)     fmt=coff targ=m68kcoff em=dpx2 ;;
+      m68k-apollo-*)        fmt=coff targ=apollo em=apollo ;;
+      m68k-*-coff | m68k-*-sysv*)
+			    fmt=coff targ=m68kcoff ;;
+      m68k-*-elf)           fmt=elf ;;
+      m68k-*-hpux*)         fmt=hp300 em=hp300 ;;
+      m68k-*-lynxos*)       fmt=coff targ=m68kcoff
+			     em=lynx ;;
+      m68k-*-netbsd*)       fmt=aout em=nbsd bfd_gas=yes ;;
+
+      m88k-*-coff*)         fmt=coff targ=m88kcoff ;;
+
+      # don't change em like *-*-bsd does
+      mips-dec-bsd*)        fmt=aout targ=mips-lit ;;
+      mips-sony-bsd*)       fmt=ecoff targ=mips-big ;;
+      mips-*-bsd*)          AC_MSG_ERROR(Unknown vendor for mips-bsd configuration.) ;;
+      mips-*-ultrix*)       fmt=ecoff targ=mips-lit ;;
+      mips-*-ecoff*)        fmt=ecoff 
+			    case "$endian" in
+			    big) targ=mips-big ;;
+			    *)   targ=mips-lit ;;
+			    esac
+			    ;;
+      mips-*-ecoff*)        fmt=ecoff targ=mips-big ;;
+      mips-*-gnu*)          fmt=aout
+			    case "$endian" in
+			    big) targ=mips-big ;;
+			    *)   targ=mips-lit ;;
+			    esac
+			    ;;
+      mips-*-irix5*)        fmt=elf targ=mips-big ;;
+      mips-*-irix*)         fmt=ecoff targ=mips-big ;;
+      mips-*-riscos*)       fmt=ecoff targ=mips-big ;;
+      mips-*-sysv*)         fmt=ecoff targ=mips-big ;;
+      mips-*-elf*)          fmt=elf 
+			    case "$endian" in
+			    big) targ=mips-big ;;
+			    *)   targ=mips-lit ;;
+			    esac
+			    ;;
+      ppc-*-aix*)           fmt=coff ;;
+      ppc-*-elf* | ppc-*-eabi* | ppc-*-sysv4*)
+			    fmt=elf
+			    case "$endian" in
+			    big)  targ=ppc-big ;;
+			    *)    targ=ppc-lit ;;
+			    esac
+			    ;;
+      ppc-*-netware*)       fmt=elf em=ppcnw ;;
+
+      sh-*-coff)            fmt=coff ;;
 
 # start-sanitize-rce
-  rce-*-aout)		obj_format=aout ;;
+      rce-*-aout)           fmt=aout ;;
 # end-sanitize-rce
 
-  ns32k-pc532-mach*)	obj_format=aout emulation=pc532mach ;;
-  ns32k-pc532-netbsd*)	obj_format=aout emulation=nbsd532 ;;
-
-  sparc-*-sunos4*)	obj_format=aout emulation=sun3 ;;
-  sparc-*-aout | sparc*-*-vxworks)
-			obj_format=aout ;;
-  sparc-*-coff)		obj_format=coff ;;
-  sparc-*-lynxos*)	obj_format=coff emulation=lynx ;;
-  sparc-fujitsu-none)	obj_format=aout ;;
-  sparc-*-elf | sparc*-*-solaris*)
-			obj_format=elf ;;
-  sparc-*-netbsd*)	obj_format=aout emulation=nbsd bfd_gas=yes ;;
-
-  vax-*-bsd* | vax-*-ultrix*)
-			obj_format=aout ;;
-  vax-*-vms)		obj_format=vms ;;
-
-  z8k-*-coff | z8k-*-sim)
-			obj_format=coff ;;
-
-  w65-*-*)		obj_format=coff ;;
-
-  *-*-aout | *-*-scout)
-			obj_format=aout ;;
-  *-*-nindy*)
-			obj_format=bout ;;
-  *-*-bsd*)
-			obj_format=aout emulation=sun3 ;;
-  *-*-generic)		obj_format=generic ;;
-  *-*-xray | *-*-hms)	obj_format=coff ;;
-  *-*-sim)		obj_format=coff ;;
-  *-*-elf | *-*-sysv4* | *-*-solaris*)
-			AC_MSG_WARN(GAS support for ELF format is incomplete)
-			obj_format=elf dev=yes ;;
-  *-*-vxworks)		obj_format=aout ;;
-  *-*-netware)		obj_format=elf ;;
-esac
+      ns32k-pc532-mach*)    fmt=aout em=pc532mach ;;
+      ns32k-pc532-netbsd*)  fmt=aout em=nbsd532 ;;
+
+      sparc-*-sunos4*)      fmt=aout em=sun3 ;;
+      sparc-*-aout | sparc*-*-vxworks)
+			    fmt=aout ;;
+      sparc-*-coff)         fmt=coff ;;
+      sparc-*-lynxos*)      fmt=coff em=lynx ;;
+      sparc-fujitsu-none)   fmt=aout ;;
+      sparc-*-elf | sparc*-*-solaris*)
+			    fmt=elf ;;
+      sparc-*-netbsd*)      fmt=aout em=nbsd bfd_gas=yes ;;
+
+      vax-*-bsd* | vax-*-ultrix*)
+			    fmt=aout ;;
+      vax-*-vms)            fmt=vms ;;
+
+      z8k-*-coff | z8k-*-sim)
+			    fmt=coff ;;
+
+      w65-*-*)              fmt=coff ;;
+
+      *-*-aout | *-*-scout)
+			    fmt=aout ;;
+      *-*-nindy*)
+			    fmt=bout ;;
+      *-*-bsd*)
+			    fmt=aout em=sun3 ;;
+      *-*-generic)          fmt=generic ;;
+      *-*-xray | *-*-hms)   fmt=coff ;;
+      *-*-sim)              fmt=coff ;;
+      *-*-elf | *-*-sysv4* | *-*-solaris*)
+			    AC_MSG_WARN(GAS support for ELF format is incomplete.)
+			    fmt=elf dev=yes ;;
+      *-*-vxworks)          fmt=aout ;;
+      *-*-netware)          fmt=elf ;;
+    esac
+
+    case ${cpu_type}-${fmt} in
+      arm-*)	bfd_gas=yes ;;
+    # not yet
+    # i386-aout)	bfd_gas=preferred ;;
+      mips-*)	bfd_gas=yes ;;
+      ns32k-*)	bfd_gas=yes ;;
+      ppc-*)	bfd_gas=yes ;;
+      sparc-*)	bfd_gas=yes ;;
+      *-elf)	bfd_gas=yes ;;
+      *-ecoff)	bfd_gas=yes ;;
+      *-som)	bfd_gas=yes ;;
+      *)		;;
+    esac
+
+# See if we really can support this configuration with the emulation code.
+
+    if test $this_target = $target ; then
+      primary_bfd_gas=$bfd_gas
+      obj_format=$fmt
+      gas_target=$targ
+      te_file=$em
+
+      if test $bfd_gas = no ; then
+	# Can't support other configurations this way.
+	break
+      fi
+    elif test $bfd_gas = no ; then
+      # Can't support this configuration.
+      break
+    fi
+
+# From target name and format, produce a list of supported emulations.
+
+    case ${generic_target}-${fmt} in
+      mips-*-irix5*-*)	emulation="mipsbelf mipslelf mipsbecoff mipslecoff" ;;
+      mips-*-*-ecoff)	case "$endian" in
+			big)	emulation="mipsbecoff mipslecoff" ;;
+			*)	emulation="mipslecoff mipsbecoff" ;;
+			esac ;;
+      mips-*-*-elf)	case "$endian" in
+			big)	emulation="mipsbelf mipslelf" ;;
+			*)	emulation="mipslelf mipsbelf" ;;
+			esac ;;
+    esac
+
+    emulations="$emulations $emulation"
+
+# Other random stuff.
+
+    test -n "$want_sparcv9" && AC_DEFINE(sparcv9)
+
+done
 
 # Assign floating point type.  Most processors with FP support
 # IEEE FP.  On those that don't support FP at all, usually IEEE
 # is emulated.
 case ${target_cpu} in
   vax | tahoe )	atof=${target_cpu} ;;
-  *)			atof=ieee ;;
+  *)		atof=ieee ;;
 esac
 
 case "${obj_format}" in
@@ -247,21 +358,7 @@ if test ! -r ${target_frag}; then
 fi
 AC_SUBST_FILE(target_frag)
 
-case ${cpu_type}-${obj_format} in
-  arm-*)	bfd_gas=yes ;;
-# not yet
-# i386-aout)	bfd_gas=preferred ;;
-  mips-*)	bfd_gas=yes ;;
-  ns32k-*)	bfd_gas=yes ;;
-  ppc-*)	bfd_gas=yes ;;
-  sparc-*)	bfd_gas=yes ;;
-  *-elf)	bfd_gas=yes ;;
-  *-ecoff)	bfd_gas=yes ;;
-  *-som)	bfd_gas=yes ;;
-  *)		;;
-esac
-
-case ${user_bfd_gas}-${bfd_gas} in
+case ${user_bfd_gas}-${primary_bfd_gas} in
   yes-yes | no-no)
     # We didn't override user's choice.
     ;;
@@ -269,20 +366,96 @@ case ${user_bfd_gas}-${bfd_gas} in
     AC_MSG_WARN(Use of BFD is required for ${target}; overriding config options.)
     ;;
   no-preferred)
-    bfd_gas=no
+    primary_bfd_gas=no
     ;;
   *-preferred)
-    bfd_gas=yes
+    primary_bfd_gas=yes
     ;;
   yes-*)
-    bfd_gas=yes
+    primary_bfd_gas=yes
     ;;
   -*)
     # User specified nothing.
     ;;
 esac
 
-case ${bfd_gas}-${cpu_type}-${obj_format} in
+# Some COFF configurations want these random other flags set.
+case ${obj_format} in
+  coff)
+    case ${target_cpu_type} in
+      i386) AC_DEFINE(I386COFF) ;;
+      m68k) AC_DEFINE(M68KCOFF) ;;
+      m88k) AC_DEFINE(M88KCOFF) ;;
+    esac
+    ;;
+esac
+
+# Getting this done right is going to be a bitch.  Each configuration specified
+# with --enable-targets=... should be checked for environment, format, cpu, and
+# bfd_gas setting.
+#
+# For each configuration, the necessary object file support code must be linked
+# in.  This might be only one, it might be up to four.  The necessary emulation
+# code needs to be provided, too.
+#
+# And then there's "--enable-targets=all"....
+#
+# For now, just always do it for MIPS ELF or ECOFF configurations.  Sigh.
+
+formats="${obj_format}"
+emfiles=""
+EMULATIONS=""
+GAS_UNIQ(emulations)
+for em in . $emulations ; do
+  case $em in
+    .)	continue ;;
+    mipsbelf | mipslelf)
+	fmt=elf   file=mipself ;;
+    mipsbecoff | mipslecoff)
+	fmt=ecoff file=mipsecoff ;;
+  esac
+  formats="$formats $fmt"
+  emfiles="$emfiles e-$file.o"
+  EMULATIONS="$EMULATIONS &$em,"
+done
+GAS_UNIQ(formats)
+GAS_UNIQ(emfiles)
+if test `set . $formats ; shift ; echo $#` -gt 1 ; then
+  for fmt in $formats ; do
+    case $fmt in
+      aout)	AC_DEFINE(OBJ_MAYBE_AOUT)    ;;
+      bout)	AC_DEFINE(OBJ_MAYBE_BOUT)    ;;
+      coff)	AC_DEFINE(OBJ_MAYBE_COFF)    ;;
+      ecoff)	AC_DEFINE(OBJ_MAYBE_ECOFF)   ;;
+      elf)	AC_DEFINE(OBJ_MAYBE_ELF)     ;;
+      generic)	AC_DEFINE(OBJ_MAYBE_GENERIC) ;;
+      hp300)	AC_DEFINE(OBJ_MAYBE_HP300)   ;;
+      ieee)	AC_DEFINE(OBJ_MAYBE_IEEE)    ;;
+      som)	AC_DEFINE(OBJ_MAYBE_SOM)     ;;
+      vms)	AC_DEFINE(OBJ_MAYBE_VMS)     ;;
+    esac
+    extra_objects="$extra_objects obj-$fmt.o"
+  done
+  obj_format=multi
+fi
+if test `set . $emfiles ; shift ; echo $#` -gt 0 ; then
+  te_file=multi
+  extra_objects="$extra_objects $emfiles"
+  DEFAULT_EMULATION=`set . $emulations ; echo $2`
+  AC_DEFINE(USE_EMULATIONS)
+fi
+AC_SUBST(extra_objects)
+AC_DEFINE_UNQUOTED(EMULATIONS, $EMULATIONS)
+AC_DEFINE_UNQUOTED(DEFAULT_EMULATION, "$DEFAULT_EMULATION")
+
+files="config/tc-${cpu_type}.c	config/tc-${cpu_type}.h \
+	config/obj-${obj_format}.h config/obj-${obj_format}.c \
+	config/te-${te_file}.h config/atof-${atof}.c \
+	$extra_files"
+links="targ-cpu.c targ-cpu.h obj-format.h obj-format.c targ-env.h atof-targ.c \
+	$extra_links"
+
+case ${primary_bfd_gas}-${cpu_type}-${obj_format} in
   yes-*-coff)	need_bfd=yes ;;
   no-*-coff)	need_bfd=yes
 		AC_DEFINE(MANY_SEGMENTS) ;;
@@ -299,14 +472,11 @@ esac
 AC_SUBST(cpu_type)
 AC_SUBST(obj_format)
 AC_SUBST(atof)
-AC_SUBST(emulation)
+dnl AC_SUBST(emulation)
 
-AC_LINK_FILES(config/tc-${cpu_type}.c	config/tc-${cpu_type}.h \
-	config/obj-${obj_format}.h config/obj-${obj_format}.c \
-	config/te-${emulation}.h config/atof-${atof}.c,
-	targ-cpu.c targ-cpu.h obj-format.h obj-format.c targ-env.h atof-targ.c)
+AC_LINK_FILES($files, $links)
 
-case "${bfd_gas}" in
+case "${primary_bfd_gas}" in
   yes)	AC_DEFINE(BFD_ASSEMBLER)
 	need_bfd=yes ;;
 esac