X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fconfigure.in;h=ec34939296dab5471607593fb2ed3d7ee4944172;hb=118fecd30767bc6fdd71e8d29304d65d061e12c1;hp=076969b63a53d82e97980d71869ebcbf1eb3563a;hpb=a06a29f25f5dc608a08e5ff3608923c97769faee;p=deliverable%2Fbinutils-gdb.git

diff --git a/gas/configure.in b/gas/configure.in
index 076969b63a..ec34939296 100644
--- 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,9 +122,11 @@ 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[3-7]86)		cpu_type=i386 arch=i386;;
@@ -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 ;;
@@ -272,7 +286,8 @@ changequote(,)dnl
       i386-*-freebsd[12].*)		fmt=aout em=386bsd ;;
       i386-*-freebsd[12])		fmt=aout em=386bsd ;;
 changequote([,])dnl
-      i386-*-freebsd*)			fmt=elf em=freebsd ;;
+      i386-*-freebsd* | i386-*-kfreebsd*-gnu)
+					fmt=elf em=freebsd ;;
       i386-*-sysv*)			fmt=coff ;;
       i386-*-sco3.2v5*coff)		fmt=coff ;;
       i386-*-isc*)			fmt=coff ;;
@@ -491,7 +506,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 ;;
@@ -541,13 +556,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
@@ -1039,7 +1057,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
@@ -1054,3 +1073,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