Initial revision

[pf3gnuchains/pf3gnuchains4x.git] / gas / configure.in

diff --git a/gas/configure.in b/gas/configure.in
index 24ba82e..697211a 100644 (file)
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -43,6 +43,16 @@ using_cgen=no
 # Generate a header file
 AM_CONFIG_HEADER(config.h:config.in)
 
+# If we are on a DOS filesystem, we must use gdb.ini rather than
+# .gdbinit.
+GDBINIT=".gdbinit"
+case "${host}" in
+  *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
+    GDBINIT="gdb.ini"
+    ;;
+esac
+AC_SUBST(GDBINIT)
+
 te_file=generic
 
 # Makefile target for installing gas in $(tooldir)/bin.
@@ -51,7 +61,7 @@ install_tooldir=install-exec-tooldir
 canon_targets=""
 if test -n "$enable_targets" ; then
   for t in `echo $enable_targets | sed 's/,/ /g'`; do
-    result=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $t 2>/dev/null`
+    result=`$ac_config_sub $t 2>/dev/null`
     if test -n "$result" ; then
       canon_targets="$canon_targets $result"
 #    else
@@ -93,6 +103,8 @@ changequote([,])dnl
       m8*)             cpu_type=m88k ;;
       mips*el)         cpu_type=mips endian=little ;;
       mips*)           cpu_type=mips endian=big ;;
+      pjl*)            cpu_type=pj endian=little ;;
+      pj*)             cpu_type=pj endian=big ;;
       powerpcle*)      cpu_type=ppc endian=little ;;
       powerpc*)                cpu_type=ppc endian=big ;;
       rs6000*)         cpu_type=ppc ;;
@@ -267,6 +279,7 @@ changequote([,])dnl
                            ;;
       mn10200-*-*)         fmt=elf bfd_gas=yes ;;
       mn10300-*-*)         fmt=elf bfd_gas=yes ;;
+      pj*)                 fmt=elf ;;
       ppc-*-pe | ppc-*-cygwin* | ppc-*-winnt*)
                            fmt=coff em=pe ;;
       ppc-*-aix*)           fmt=coff ;;
@@ -380,6 +393,9 @@ changequote([,])dnl
       *-elf)   bfd_gas=yes ;;
       *-ecoff) bfd_gas=yes ;;
       *-som)   bfd_gas=yes ;;
+    #enable bfd for coff to allow testing if a bfd target is the primary target,
+    #but not for coff as the primary target
+      i386-coff)       if test x${primary_bfd_gas} = xyes; then bfd_gas=yes; fi ;;
       *)               ;;
     esac
 
@@ -483,11 +499,12 @@ changequote([,])dnl
       mips-*-*-elf)    case "$endian" in
                        big)    emulation="mipsbelf mipslelf mipself" ;;
                        *)      emulation="mipslelf mipsbelf mipself" ;;
-      # Uncommenting the next line will turn on support for i386 COFF
-      # in any i386 ELF configuration.  This probably doesn't work
-      # correctly.
-      # i386-*-*-elf)  emulation="i386coff i386elf" ;;
                        esac ;;
+      i386-*-elf)      emulation="i386elf" ;;
+      i386-*-coff)     emulation="i386coff" ;;
+      # Uncommenting the next line will turn on support for i386 COFF
+      # in any i386 ELF configuration.
+      # i386-*-*-elf)  emulation="i386elf i386coff" ;;
     esac
 
     emulations="$emulations $emulation"
@@ -613,10 +630,16 @@ if test `set . $formats ; shift ; echo $#` -gt 1 ; then
   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, 1, [Use emulation support?])
+  # e-mips* has more than one emulation per file, e-i386* has just one at the
+  # moment.  If only one emulation is specified, then don't define
+  # USE_EMULATIONS or include any of the e-files as they will only be bloat.
+  case "${obj_format}${emfiles}" in
+    multi* | *mips*)
+      te_file=multi
+      extra_objects="$extra_objects $emfiles"
+      AC_DEFINE(USE_EMULATIONS, 1, [Use emulation support?]) ;;
+  esac
 fi
 AC_SUBST(extra_objects)
 AC_DEFINE_UNQUOTED(EMULATIONS, $EMULATIONS, [Supported emulations.])
@@ -757,7 +780,7 @@ dnl the build directory which include the right .h file.  Make sure
 dnl the old symlinks don't exist, so that a reconfigure in an existing
 dnl directory behaves reasonably.
 
-AC_OUTPUT(Makefile doc/Makefile .gdbinit:gdbinit.in po/Makefile.in:po/Make-in,
+AC_OUTPUT(Makefile doc/Makefile ${GDBINIT}:gdbinit.in po/Makefile.in:po/Make-in,
 [rm -f targ-cpu.c targ-cpu.h obj-format.h obj-format.c targ-env.h atof-targ.c itbl-cpu.h
  echo '#include "tc-'"${target_cpu_type}"'.h"' > targ-cpu.h
  echo '#include "obj-'"${obj_format}"'.h"' > obj-format.h