Add i386-knetbsd-gnu triplet.

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

diff --git a/gas/configure.in b/gas/configure.in
index 82b8da88455164d16e43c5454b97813f49fa12e7..3bc47e78bc8841a4af9a80befac36a695c32d2e1 100644 (file)
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -5,9 +5,13 @@ dnl brackets, be sure changequote invocations surround it.
 dnl
 dnl
 dnl v2.5 needed for --bindir et al
-AC_PREREQ(2.13)
+AC_PREREQ(2.57)
 AC_INIT(as.h)
 
+dnl Autoconf 2.57 will find the aux dir without this.  However, unless
+dnl we specify this explicitly, automake-1.7 will assume that ylwrap is in
+dnl gas/ instead of gas/../.
+AC_CONFIG_AUX_DIR(..)
 AC_CANONICAL_SYSTEM
 AC_ISC_POSIX
 
@@ -70,10 +74,14 @@ 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* | *-*-windows*)
     GDBINIT="gdb.ini"
+    AC_CONFIG_FILES(gdb.ini:gdbinit.in)
+    ;;
+  *)
+    GDBINIT=".gdbinit"
+    AC_CONFIG_FILES(.gdbinit:gdbinit.in)
     ;;
 esac
 AC_SUBST(GDBINIT)
@@ -114,12 +122,14 @@ changequote([,])dnl
     arch=
     endian=
     case ${cpu} in
+      am33_2.0)                cpu_type=mn10300 endian=little ;;
       alpha*)          cpu_type=alpha ;;
       arm*b|xscale*b|strongarm*b) cpu_type=arm endian=big ;;
       arm*|xscale*|strongarm*)    cpu_type=arm endian=little ;;
+      c4x*)            cpu_type=tic4x ;;
       hppa*)           cpu_type=hppa ;;
 changequote(,)dnl
-      i[3456]86)       cpu_type=i386 arch=i386;;
+      i[3-7]86)                cpu_type=i386 arch=i386;;
       x86_64)          cpu_type=i386 arch=x86_64;;
       ia64)            cpu_type=ia64 ;;
       ip2k)             cpu_type=ip2k endian=big ;; 
@@ -185,11 +195,14 @@ changequote([,])dnl
       alpha*-*-netbsd*)                        fmt=elf em=nbsd ;;
       alpha*-*-openbsd*)               fmt=elf em=obsd ;;
 
+      # cpu_type for am33_2.0 is set to mn10300
+      mn10300-*-linux*)                        fmt=elf bfd_gas=yes em=linux ;;
+
       arc-*-elf*)                      fmt=elf ;;
 
       arm-*-aout)                      fmt=aout ;;
       arm-*-coff | thumb-*-coff)       fmt=coff ;;
-      arm-*-rtems | thumb-*-rtems)     fmt=elf ;;
+      arm-*-rtems* | thumb-*-rtems*)   fmt=elf ;;
       arm-*-elf | thumb-*-elf)         fmt=elf ;;
       arm-*-kaos*)                     fmt=elf ;;
       arm*-*-conix*)                   fmt=elf ;;
@@ -208,6 +221,7 @@ changequote([,])dnl
 
       avr-*-*)                         fmt=elf ;;
 
+      cris-*-linux-gnu*)               fmt=multi bfd_gas=yes em=linux ;;
       cris-*-*)                                fmt=multi bfd_gas=yes ;;
 
       d10v-*-*)                                fmt=elf ;;
@@ -253,6 +267,8 @@ changequote([,])dnl
       i386-*-bsd*)                     fmt=aout em=386bsd ;;
       i386-*-netbsd0.8)                        fmt=aout em=386bsd ;;
       i386-*-netbsdpe*)                        fmt=coff em=pe ;;
+      i386-*-netbsd*-gnu* | \
+      i386-*-knetbsd*-gnu | \
       i386-*-netbsdelf*)               fmt=elf em=nbsd ;;
       i386-*-*n*bsd*)  case ${cpu} in
                            x86_64)     fmt=elf em=nbsd ;;
@@ -271,6 +287,8 @@ changequote(,)dnl
       i386-*-freebsd[12].*)            fmt=aout em=386bsd ;;
       i386-*-freebsd[12])              fmt=aout em=386bsd ;;
 changequote([,])dnl
+      i386-*-freebsd* | i386-*-kfreebsd*-gnu)
+                                       fmt=elf em=freebsd ;;
       i386-*-sysv*)                    fmt=coff ;;
       i386-*-sco3.2v5*coff)            fmt=coff ;;
       i386-*-isc*)                     fmt=coff ;;
@@ -489,7 +507,7 @@ changequote([,])dnl
       z8k-*-coff | z8k-*-sim)          fmt=coff ;;
 
       *-*-aout | *-*-scout)            fmt=aout ;;
-      *-*-freebsd*)                    fmt=elf em=freebsd ;;
+      *-*-freebsd* | *-*-kfreebsd*-gnu)        fmt=elf em=freebsd ;;
       *-*-nindy*)                      fmt=bout ;;
       *-*-bsd*)                                fmt=aout em=sun3 ;;
       *-*-generic)                     fmt=generic ;;
@@ -539,13 +557,16 @@ changequote([,])dnl
          mipsisa64 | mipsisa64el)
            mips_cpu=mips64
            ;;
+         mipsisa64r2 | mipsisa64r2el)
+           mips_cpu=mips64r2
+           ;;
          mipstx39 | mipstx39el)
            mips_cpu=r3900
            ;;
          mips64vr | mips64vrel)
            mips_cpu=vr4100
            ;;
-         mipsisa32r2*)
+         mipsisa32r2* | mipsisa64r2*)
 changequote(,)dnl
            mips_cpu=`echo $target_cpu | sed -e 's/[a-z]*..r2//' -e 's/el$//'`
 changequote([,])dnl
@@ -580,12 +601,26 @@ changequote([,])dnl
            mips_default_64bit=0
            ;;
        esac
+       # Decide which ABI to target by default.
+       case ${target} in
+         mips64*-linux* | mips-sgi-irix6*)
+           mips_default_abi=N32_ABI
+           ;;
+         mips*-linux*)
+           mips_default_abi=O32_ABI
+           ;;
+         *)
+           mips_default_abi=NO_ABI
+           ;;
+       esac
        AC_DEFINE_UNQUOTED(MIPS_CPU_STRING_DEFAULT, "$mips_cpu",
                           [Default CPU for MIPS targets. ])
        AC_DEFINE_UNQUOTED(USE_E_MIPS_ABI_O32, $use_e_mips_abi_o32,
                           [Allow use of E_MIPS_ABI_O32 on MIPS targets. ])
        AC_DEFINE_UNQUOTED(MIPS_DEFAULT_64BIT, $mips_default_64bit,
                           [Generate 64-bit code by default on MIPS targets. ])
+       AC_DEFINE_UNQUOTED(MIPS_DEFAULT_ABI, $mips_default_abi,
+                          [Choose a default ABI for MIPS targets. ])
        ;;
     esac
 
@@ -1023,7 +1058,8 @@ 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_CONFIG_FILES(Makefile doc/Makefile po/Makefile.in:po/Make-in)
+AC_CONFIG_COMMANDS([default],
 [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
@@ -1038,3 +1074,5 @@ AC_OUTPUT(Makefile doc/Makefile ${GDBINIT}:gdbinit.in po/Makefile.in:po/Make-in,
  cgen_cpu_prefix=${cgen_cpu_prefix}
  obj_format=${obj_format}
  te_file=${te_file}])
+
+AC_OUTPUT