remove armelf sanitization

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

diff --git a/gas/configure.in b/gas/configure.in
index 39f726613dd920d39b879166feaa5f60db3992c5..6ab9cccc9f96aec43ca64f71721749b230d25183 100644 (file)
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -10,7 +10,7 @@ AC_INIT(as.h)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(gas, 2.9.1)
+AM_INIT_AUTOMAKE(gas, 2.9.4)
 
 AM_PROG_LIBTOOL
 
@@ -43,6 +43,9 @@ AM_CONFIG_HEADER(config.h:config.in)
 
 te_file=generic
 
+# Makefile target for installing gas in $(tooldir)/bin.
+install_tooldir=install-exec-tooldir
+
 canon_targets=""
 if test -n "$enable_targets" ; then
   for t in `echo $enable_targets | sed 's/,/ /g'`; do
@@ -77,9 +80,10 @@ changequote([,])dnl
 changequote(,)dnl
       i[456]86)                cpu_type=i386 ;;
       m680[012346]0)   cpu_type=m68k ;;
+changequote([,])dnl
       m68008)          cpu_type=m68k ;;
       m683??)          cpu_type=m68k ;;
-changequote([,])dnl
+      m5200)           cpu_type=m68k ;;
       m8*)             cpu_type=m88k ;;
       mips*el)         cpu_type=mips endian=little ;;
 # start-sanitize-r5900
@@ -135,13 +139,16 @@ changequote([,])dnl
       arm-*-riscix*)       fmt=aout em=riscix ;;
       arm-*-aout)          fmt=aout ;;
       arm-*-coff | thumb-*-coff)           fmt=coff ;;
+      arm-*-elf | thumb-*-elf)              fmt=elf ;;
       arm-*-riscix*)        fmt=aout ;;
       arm-*-pe | thumb-*-pe)               fmt=coff em=pe ;;
 
       d10v-*-*)                    fmt=elf bfd_gas=yes ;;
-# start-sanitize-d30v
       d30v-*-*)                    fmt=elf bfd_gas=yes ;;
-# end-sanitize-d30v
+
+# start-sanitize-sky
+      dvp-*-*)             fmt=elf bfd_gas=yes install_tooldir= ;;
+# end-sanitize-sky
 
       hppa-*-*elf*)         fmt=elf em=hppa ;;
       hppa-*-lites*)        fmt=elf em=hppa ;;
@@ -155,6 +162,10 @@ changequote([,])dnl
 
       i386-ibm-aix*)        fmt=coff em=i386aix ;;
       i386-sequent-bsd*)    fmt=aout em=dynix bfd_gas=yes ;;
+dnl start-sanitize-beos
+      i386-*-beospe*)       fmt=coff em=pe bfd_gas=yes ;;
+      i386-*-beoself* | i386-*-beos*) fmt=elf ;;
+dnl end-sanitize-beos
       i386-*-bsd*)          fmt=aout em=386bsd ;;
       i386-*-netbsd0.8)     fmt=aout em=386bsd ;;
       i386-*-netbsd*)       fmt=aout em=nbsd bfd_gas=yes;;
@@ -294,10 +305,6 @@ changequote([,])dnl
       tic80-*-*)           fmt=coff ;;
 # end-sanitize-tic80
 
-# start-sanitize-sky
-      dvp-*-*)             fmt=elf bfd_gas=yes ;;
-# end-sanitize-sky
-
       v850-*-*)                    fmt=elf bfd_gas=yes ;;
 
 # start-sanitize-v850e
@@ -367,7 +374,7 @@ changequote([,])dnl
 
     case ${cpu_type} in
       m32r)
-       case ${extra_objects} in
+       case "x${extra_objects}" in
        *cgen.o*) ;;
        *) extra_objects="$extra_objects cgen.o"
           AC_DEFINE(USING_CGEN)
@@ -464,6 +471,17 @@ case "${obj_format}" in
   "") AC_MSG_ERROR(GAS does not know what format to use for target ${target}) ;;
 esac
 
+# Unfortunately the cpu in cpu-opc.h file isn't always $(TARGET_CPU).
+cgen_cpu_prefix=""
+case "x${extra_objects}" in
+  *cgen.o*)
+       case ${target_cpu} in
+         *) cgen_cpu_prefix=${target_cpu} ;;
+       esac
+       ;;
+esac
+AC_SUBST(cgen_cpu_prefix)
+
 dnl
 dnl Make sure the desired support files exist.
 dnl
@@ -587,6 +605,7 @@ esac
 AC_SUBST(target_cpu_type)
 AC_SUBST(obj_format)
 AC_SUBST(te_file)
+AC_SUBST(install_tooldir)
 AC_SUBST(atof)
 dnl AC_SUBST(emulation)
 
@@ -625,6 +644,9 @@ AC_PROG_CC
 AC_PROG_YACC
 AM_PROG_LEX
 
+ALL_LINGUAS=
+CY_GNU_GETTEXT
+
 AM_MAINTAINER_MODE
 AM_CYGWIN32
 AM_EXEEXT
@@ -700,7 +722,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,
+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
@@ -708,7 +730,9 @@ AC_OUTPUT(Makefile doc/Makefile .gdbinit:gdbinit.in,
  echo '#include "itbl-'"${target_cpu_type}"'.h"' > itbl-cpu.h
  case ${target_cpu_type} in
  m32r) echo '#include "opcodes/'"${target_cpu_type}"'-opc.h"' > cgen-opc.h ;;
- esac],
+ esac
+
+ sed -e '/POTFILES =/r po/POTFILES' po/Makefile.in > po/Makefile],
 [target_cpu_type=${target_cpu_type}
  obj_format=${obj_format}
  te_file=${te_file}])