Add a note to the GDB/NEWS file mentioning that the ARM simulator now

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

diff --git a/gas/configure.in b/gas/configure.in
index 10e36486223ba00866511f4f1290da1a52b770d6..1bf315d572aa74d3d0777eeafb4545392b56b374 100644 (file)
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -3,74 +3,84 @@ dnl
 dnl And be careful when changing it!  If you must add tests with square
 dnl brackets, be sure changequote invocations surround it.
 dnl
 dnl And be careful when changing it!  If you must add tests with square
 dnl brackets, be sure changequote invocations surround it.
 dnl

+dnl   Copyright (C) 2012-2014 Free Software Foundation, Inc.
+dnl
+dnl This file is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3 of the License, or
+dnl (at your option) any later version.
+dnl 
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; see the file COPYING3.  If not see
+dnl <http://www.gnu.org/licenses/>.

 dnl
 dnl v2.5 needed for --bindir et al
 dnl
 dnl v2.5 needed for --bindir et al

-AC_PREREQ(2.57)
-AC_INIT(as.h)
+AC_PREREQ(2.59)
+AC_INIT
+AC_CONFIG_SRCDIR(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(..)
 
 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_CANONICAL_TARGET

 AC_ISC_POSIX
 
 changequote(,)dnl
 AC_ISC_POSIX
 
 changequote(,)dnl

-BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[        ]*\([^  ]*\)[   ]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
+BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`

 changequote([,])dnl
 AM_INIT_AUTOMAKE(gas, ${BFD_VERSION})
 
 changequote([,])dnl
 AM_INIT_AUTOMAKE(gas, ${BFD_VERSION})
 

-AM_PROG_LIBTOOL
+AC_PROG_CC
+AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
+ACX_LARGEFILE
+
+LT_INIT

 
 

-user_bfd_gas=
-AC_ARG_ENABLE(bfd-assembler,
-[  --enable-bfd-assembler  use BFD back end for writing object files],
-[case "${enableval}" in
-  yes) need_bfd=yes user_bfd_gas=yes ;;
-  no)  user_bfd_gas=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} given for bfd-assembler option) ;;
-esac])dnl

 AC_ARG_ENABLE(targets,
 AC_ARG_ENABLE(targets,

-[    targets            alternative target configurations besides the primary],
+[  --enable-targets        alternative target configurations besides the primary],

 [case "${enableval}" in
 [case "${enableval}" in

-  yes | "") AC_ERROR(enable-targets option must specify target names or 'all')
+  yes | "") AC_MSG_ERROR(enable-targets option must specify target names or 'all')

            ;;
   no)      enable_targets= ;;
   *)       enable_targets=$enableval ;;
 esac])dnl
            ;;
   no)      enable_targets= ;;
   *)       enable_targets=$enableval ;;
 esac])dnl

-AC_ARG_ENABLE(commonbfdlib,
-[  --enable-commonbfdlib   build shared BFD/opcodes/libiberty library],
+
+ac_checking=yes
+if grep '^RELEASE=y' ${srcdir}/../bfd/Makefile.am >/dev/null 2>/dev/null ; then
+  ac_checking=
+fi
+AC_ARG_ENABLE(checking,
+[  --enable-checking       enable run-time checks],

 [case "${enableval}" in
 [case "${enableval}" in

-  yes) commonbfdlib=true ;;
-  no)  commonbfdlib=false ;;
-  *)   AC_MSG_ERROR([bad value ${enableval} for BFD commonbfdlib option]) ;;
+  no|none)  ac_checking= ;;
+  *)       ac_checking=yes ;;

 esac])dnl
 esac])dnl

+if test x$ac_checking != x ; then
+  AC_DEFINE(ENABLE_CHECKING, 1, [Define if you want run-time sanity checks.])
+fi

 
 using_cgen=no
 
 
 using_cgen=no
 

-build_warnings="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
-AC_ARG_ENABLE(build-warnings,
-[  --enable-build-warnings Enable build-time compiler warnings if gcc is used],
-[case "${enableval}" in
-  yes) ;;
-  no)  build_warnings="-w";;
-  ,*)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
-        build_warnings="${build_warnings} ${t}";;
-  *,)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
-        build_warnings="${t} ${build_warnings}";;
-  *)    build_warnings=`echo "${enableval}" | sed -e "s/,/ /g"`;;
-esac
-if test x"$silent" != x"yes" && test x"$build_warnings" != x""; then
-  echo "Setting warning flags = $build_warnings" 6>&1
-fi])dnl
-WARN_CFLAGS=""
-if test "x${build_warnings}" != x -a "x$GCC" = xyes ; then
-    WARN_CFLAGS="${build_warnings}"
-fi
-AC_SUBST(WARN_CFLAGS)
+AM_BINUTILS_WARNINGS

 
 # Generate a header file
 
 # Generate a header file

-AM_CONFIG_HEADER(config.h:config.in)
+AC_CONFIG_HEADERS(config.h:config.in)
+
+# PR 14072
+AH_VERBATIM([00_CONFIG_H_CHECK],
+[/* Check that config.h is #included before system headers
+   (this works only for glibc, but that should be enough).  */
+#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__CONFIG_H__)
+#  error config.h must be #included before system headers
+#endif
+#define __CONFIG_H__ 1])

 
 # If we are on a DOS filesystem, we must use gdb.ini rather than
 # .gdbinit.
 
 # If we are on a DOS filesystem, we must use gdb.ini rather than
 # .gdbinit.


@@ -86,6 +96,9 @@ case "${host}" in
 esac
 AC_SUBST(GDBINIT)
 
 esac
 AC_SUBST(GDBINIT)
 

+#We need this for the host.  BOUT header is in host order.
+AC_C_BIGENDIAN
+

 te_file=generic
 
 # Makefile target for installing gas in $(tooldir)/bin.
 te_file=generic
 
 # Makefile target for installing gas in $(tooldir)/bin.


@@ -114,59 +127,14 @@ emulations=""
 
 for this_target in $target $canon_targets ; do
 
 
 for this_target in $target $canon_targets ; do
 

-changequote(,)dnl
-    eval `echo $this_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/cpu=\1 vendor=\2 os=\3/'`
-changequote([,])dnl
+    targ=${this_target}
+    . ${srcdir}/configure.tgt

 
 

-    # check for architecture variants
-    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;;
-      x86_64)          cpu_type=i386 arch=x86_64;;
-      ia64)            cpu_type=ia64 ;;
-      ip2k)             cpu_type=ip2k endian=big ;; 
-      iq2000)           cpu_type=iq2000 endian=big ;; 
-      m6811|m6812|m68hc12) cpu_type=m68hc11 ;;
-      m680[012346]0)   cpu_type=m68k ;;
-changequote([,])dnl
-      m68008)          cpu_type=m68k ;;
-      m683??)          cpu_type=m68k ;;
-      m5200)           cpu_type=m68k ;;
-      m8*)             cpu_type=m88k ;;
-      mips*el)         cpu_type=mips endian=little ;;
-      mips*)           cpu_type=mips endian=big ;;
-      or32*)           cpu_type=or32 endian=big ;;
-      pjl*)            cpu_type=pj endian=little ;;
-      pj*)             cpu_type=pj endian=big ;;
-      powerpc*le*)     cpu_type=ppc endian=little ;;
-      powerpc*)                cpu_type=ppc endian=big ;;
-      rs6000*)         cpu_type=ppc ;;
-      s390x*)          cpu_type=s390 arch=s390x ;;
-      s390*)           cpu_type=s390 arch=s390 ;;
-      sh5*)            cpu_type=sh64 endian=big ;;
-      sh5le*)          cpu_type=sh64 endian=little ;;
-      sh64*)            cpu_type=sh64 endian=big ;;
-      sh64le*)         cpu_type=sh64 endian=little ;;
-      sh*le)           cpu_type=sh endian=little ;;
-      sh*)             cpu_type=sh endian=big ;;
-      sparclite*)      cpu_type=sparc arch=sparclite ;;
-      sparclet*)       cpu_type=sparc arch=sparclet ;;
-      sparc64*)                cpu_type=sparc arch=v9-64 ;;
-      sparc86x*)       cpu_type=sparc arch=sparc86x  ;;
-      sparc*)          cpu_type=sparc arch=sparclite ;; # ??? See tc-sparc.c.
-      v850*)           cpu_type=v850 ;;
-      xtensa*)         cpu_type=xtensa arch=xtensa ;;
-      m32r)             cpu_type=m32r target_cpu=m32r endian=big ;;
-      m32rle)           cpu_type=m32r target_cpu=m32r endian=little ;;
-      *)               cpu_type=${cpu} ;;
+    case ${target_cpu} in
+      crisv32)
+       AC_DEFINE_UNQUOTED(DEFAULT_CRIS_ARCH, $arch,
+                          [Default CRIS architecture.])
+       ;;

     esac
 
     if test ${this_target} = $target ; then
     esac
 
     if test ${this_target} = $target ; then


@@ -175,356 +143,46 @@ changequote([,])dnl
       continue
     fi
 
       continue
     fi
 

-    generic_target=${cpu_type}-$vendor-$os
-    dev=no
-    bfd_gas=no
-    em=generic
-
-    # assign object format
+    generic_target=${cpu_type}-${target_vendor}-${target_os}

     case ${generic_target} in
     case ${generic_target} in

-      a29k-*-coff)                     fmt=coff ;;
-      a29k-amd-udi)                    fmt=coff ;;
-      a29k-amd-ebmon)                  fmt=coff ;;
-      a29k-nyu-sym1)                   fmt=coff ;;
-      a29k-*-rtems*)                   fmt=coff ;;
-      a29k-*-vxworks*)                 fmt=coff ;;
-
-      alpha*-*-*vms*)                  fmt=evax ;;
-      alpha*-*-osf*)                   fmt=ecoff ;;
-      alpha*-*-linuxecoff*)            fmt=ecoff ;;
-      alpha*-*-linux-gnu*)             fmt=elf em=linux ;;
-      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-*-elf | thumb-*-elf)         fmt=elf ;;
-      arm-*-kaos*)                     fmt=elf ;;
-      arm*-*-conix*)                   fmt=elf ;;
-      arm-*-linux*aout*)               fmt=aout em=linux ;;
-      arm*-*-linux-gnu*)               fmt=elf  em=linux ;;
-      arm*-*-uclinux*)                 fmt=elf  em=linux ;;
-      arm-*-netbsdelf*)                 fmt=elf  em=nbsd ;;
-      arm-*-*n*bsd*)                   fmt=aout em=nbsd ;;
-      arm-**-nto*)                     fmt=elf ;;
-      arm-*-oabi | thumb-*-oabi)       fmt=elf ;;
-      arm-epoc-pe | thumb-epoc-pe)     fmt=coff em=epoc-pe ;;
-      arm-wince-pe | arm-*-wince)       fmt=coff em=wince-pe ;;
-      arm-*-pe | thumb-*-pe)           fmt=coff em=pe ;;
-      arm-*-riscix*)                   fmt=aout em=riscix ;;
-
-      avr-*-*)                         fmt=elf ;;
-
-      cris-*-linux-gnu*)               fmt=multi bfd_gas=yes em=linux ;;
-      cris-*-*)                                fmt=multi bfd_gas=yes ;;
-
-      d10v-*-*)                                fmt=elf ;;
-      d30v-*-*)                                fmt=elf ;;
-      dlx-*-*)                         fmt=elf ;;
-
-      fr30-*-*)                                fmt=elf ;;
-      frv-*-*linux*)                   fmt=elf em=linux;;
-      frv-*-*)                         fmt=elf ;;
-
-      hppa-*-linux*)   case ${cpu} in
-                           hppa*64*)   fmt=elf em=hppalinux64;;
-                           hppa*)      fmt=elf em=linux;;
-                       esac ;;
-      hppa-*-*elf*)                    fmt=elf em=hppa ;;
-      hppa-*-lites*)                   fmt=elf em=hppa ;;
-      hppa-*-netbsd*)                  fmt=elf em=nbsd ;;
-      hppa-*-openbsd*)                 fmt=elf em=hppa ;;
-      hppa-*-osf*)                     fmt=som em=hppa ;;
-      hppa-*-rtems*)                   fmt=elf em=hppa ;;
-      hppa-*-hpux11*)  case ${cpu} in
-                           hppa*64*)   fmt=elf em=hppa64 ;;
-                           hppa*)      fmt=som em=hppa ;;
-                       esac ;;
-      hppa-*-hpux*)                    fmt=som em=hppa ;;
-      hppa-*-mpeix*)                   fmt=som em=hppa ;;
-      hppa-*-bsd*)                     fmt=som em=hppa ;;
-      hppa-*-hiux*)                    fmt=som em=hppa ;;
-
-      h8300-*-rtems*)                  fmt=coff ;;
-      h8300-*-coff)                    fmt=coff ;;
-      h8300-*-elf)                     fmt=elf ;;
-      h8500-*-rtems*)                  fmt=coff ;;
-      h8500-*-coff)                    fmt=coff ;;
-
-      i370-*-elf* | i370-*-linux*)     fmt=elf ;;
-      i386-ibm-aix*)                   fmt=coff em=i386aix ;;
-      i386-sequent-bsd*)               fmt=aout em=dynix ;;
-      i386-*-beospe*)                  fmt=coff em=pe ;;
-      i386-*-beos*)                    fmt=elf ;;
-      i386-*-coff)                     fmt=coff ;;
-      i386-*-elf)                      fmt=elf ;;
-      i386-*-kaos*)                    fmt=elf ;;
-      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 ;;
-                           *)          fmt=aout em=nbsd ;;
-                       esac ;;
-      i386-*-linux*aout*)              fmt=aout em=linux ;;
-      i386-*-linux*oldld)              fmt=aout em=linux ;;
-      i386-*-linux*coff*)              fmt=coff em=linux ;;
-      i386-*-linux-gnu*)               fmt=elf em=linux ;;
-      x86_64-*-linux-gnu*)             fmt=elf em=linux ;;
-      i386-*-lynxos*)                  fmt=elf em=lynx bfd_gas=yes ;;
-changequote(,)dnl
-      i386-*-sysv[45]*)                        fmt=elf ;;
-      i386-*-solaris*)                 fmt=elf ;;
-      i386-*-freebsdaout*)             fmt=aout em=386bsd ;;
-      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 ;;
-      i386-*-sco3.2v5*)                        fmt=elf
-         if test ${this_target} = $target; then
-           AC_DEFINE(SCO_ELF, 1, [Define if defaulting to ELF on SCO 5.])
-         fi ;;
-      i386-*-sco3.2*)                  fmt=coff ;;
-      i386-*-vsta)                     fmt=aout ;;
+      i386-*-sco3.2v5*)
+       if test ${this_target} = $target; then
+         AC_DEFINE(SCO_ELF, 1, [Define if defaulting to ELF on SCO 5.])
+       fi
+       ;;
+

       i386-*-msdosdjgpp* \
       | i386-*-go32* \
       i386-*-msdosdjgpp* \
       | i386-*-go32* \

-      | i386-go32-rtems*)              fmt=coff em=go32
-           AC_DEFINE(STRICTCOFF, 1, [Using strict COFF?]) ;;
-      i386-*-rtemself*)                        fmt=elf ;;
-      i386-*-rtemscoff*)               fmt=coff ;;
-      i386-*-rtems*)                   fmt=elf ;;
-      i386-*-gnu*)                     fmt=elf ;;
-      i386-*-mach*)                    fmt=aout em=mach ;;
-      i386-*-msdos*)                   fmt=aout ;;
-      i386-*-moss*)                    fmt=elf ;;
-      i386-*-pe)                       fmt=coff em=pe ;;
-      i386-*-cygwin*)                  fmt=coff em=pe ;;
-      i386-*-interix*)                 fmt=coff em=interix ;;
-      i386-*-mingw32*)                 fmt=coff em=pe ;;
-      i386-*-nto-qnx*)                 fmt=elf ;;
-      i386-*-*nt*)                     fmt=coff em=pe ;;
-      i386-*-chaos)                    fmt=elf ;;
-
-      i860-*-*)                                fmt=elf endian=little
-               AC_MSG_WARN(GAS support for ${generic_target} is preliminary and a work in progress) ;;
-      i960-*-bout)                     fmt=bout ;;
-      i960-*-coff)                     fmt=coff em=ic960 ;;
-      i960-*-rtems*)                   fmt=coff em=ic960 ;;
-      i960-*-nindy*)                   fmt=bout ;;
-      i960-*-vxworks5.0)               fmt=bout ;;
-      i960-*-vxworks5.*)               fmt=coff em=ic960 ;;
-      i960-*-vxworks*)                 fmt=bout ;;
-      i960-*-elf*)                     fmt=elf ;;
-
-      ia64-*-elf*)                     fmt=elf ;;
-      ia64-*-aix*)                     fmt=elf em=ia64aix ;;
-      ia64-*-linux-gnu*)               fmt=elf em=linux ;;
-      ia64-*-hpux*)                    fmt=elf em=hpux ;;
-      ia64-*-netbsd*)                  fmt=elf em=nbsd ;;
-
-      ip2k-*-*)                                fmt=elf ;;
-
-      iq2000-*-elf)                    fmt=elf bfd_gas=yes ;;
-
-      m32r-*-elf*)                     fmt=elf ;;
-      m32r-*-linux*)                   fmt=elf em=linux;;
-
-      m68hc11-*-* | m6811-*-*)         fmt=elf ;;
-      m68hc12-*-* | m6812-*-*)         fmt=elf ;;
-
-      m68k-*-vxworks*)                 fmt=aout em=sun3 ;;
-      m68k-ericsson-ose)               fmt=aout em=sun3 ;;
-      m68k-*-sunos*)                   fmt=aout em=sun3 ;;
-      m68k-motorola-sysv*)             fmt=coff em=delta ;;
-      m68k-bull-sysv3*)                        fmt=coff em=dpx2 ;;
-      m68k-apollo-*)                   fmt=coff em=apollo ;;
-      m68k-*-elf*)                     fmt=elf ;;
-      m68k-*-sysv4*)                   fmt=elf em=svr4 ;;
-      m68k-*-sysv*)                    fmt=coff ;;
-      m68k-*-coff | m68k-*-rtemscoff*) fmt=coff ;;
-      m68k-*-rtems*)                   fmt=elf ;;
-      m68k-*-hpux*)                    fmt=hp300 em=hp300 ;;
-      m68k-*-linux*aout*)              fmt=aout em=linux ;;
-      m68k-*-linux-gnu*)               fmt=elf em=linux ;;
-      m68k-*-uclinux*)                 fmt=elf ;;
-      m68k-*-gnu*)                     fmt=elf ;;
-      m68k-*-lynxos*)                  fmt=coff em=lynx ;;
-      m68k-*-netbsdelf*)               fmt=elf em=nbsd ;;
-      m68k-*-netbsd*)                  fmt=aout em=nbsd bfd_gas=yes ;;
-      m68k-*-openbsd*)                 fmt=aout em=nbsd bfd_gas=yes ;;
-      m68k-apple-aux*)                 fmt=coff em=aux ;;
-      m68k-*-psos*)                    fmt=elf em=psos;;
-
-      m88k-motorola-sysv3*)            fmt=coff em=delt88 ;;
-      m88k-*-coff*)                    fmt=coff ;;
-
-      mcore-*-elf)                     fmt=elf ;;
-      mcore-*-pe)                      fmt=coff em=pe bfd_gas=yes ;;
-
-      # don't change em like *-*-bsd does
-      mips-dec-openbsd*)               fmt=elf endian=little ;;
-      mips-sony-bsd*)                  fmt=ecoff ;;
-      mips-*-bsd*)
-           AC_MSG_ERROR(Unknown vendor for mips-bsd configuration.) ;;
-      mips-*-ultrix*)                  fmt=ecoff endian=little ;;
-      mips-*-osf*)                     fmt=ecoff endian=little ;;
-      mips-*-ecoff*)                   fmt=ecoff ;;
-      mips-*-pe*)                      fmt=coff endian=little em=pe ;;
-      mips-*-irix6*)                   fmt=elf em=irix ;;
-      mips-*-irix5*)                   fmt=elf em=irix ;;
-      mips-*-irix*)                    fmt=ecoff em=irix ;;
-      mips-*-lnews*)                   fmt=ecoff em=lnews ;;
-      mips-*-riscos*)                  fmt=ecoff ;;
-      mips*-*-linux*)                  fmt=elf em=tmips ;;
-      mips-*-sysv4*MP* | mips-*-gnu*)  fmt=elf em=tmips ;;
-      mips-*-sysv*)                    fmt=ecoff ;;
-      mips-*-elf* | mips-*-rtems*)     fmt=elf ;;
-      mips-*-netbsd*)                  fmt=elf ;;
-      mips-*-openbsd*)                 fmt=elf ;;
-
-      mmix-*-*)                                fmt=elf ;;
-      mn10200-*-*)                     fmt=elf ;;
-      mn10300-*-*)                     fmt=elf ;;
-      msp430-*-*)                      fmt=elf ;;
-      openrisc-*-*)                    fmt=elf ;;
-      or32-*-rtems*)                   fmt=elf ;;
-      or32-*-coff)                     fmt=coff ;;
-      or32-*-elf)                      fmt=elf ;;
-      pj*)                             fmt=elf ;;
-
-      ppc-*-pe | ppc-*-cygwin*)                fmt=coff em=pe ;;
-      ppc-*-winnt*)                    fmt=coff em=pe ;;
+      | i386-go32-rtems*)
+       AC_DEFINE(STRICTCOFF, 1, [Using strict COFF?])
+       ;;
+
+      i860-*-*)
+       AC_MSG_WARN(GAS support for ${generic_target} is preliminary and a work in progress)
+       ;;
+
+      microblaze*)
+        ;;
+

 changequote(,)dnl
 changequote(,)dnl

-      ppc-*-aix5.[01])                 fmt=coff em=aix5 ;;
+      ppc-*-aix[5-9].*)

 changequote([,])dnl
 changequote([,])dnl

-      ppc-*-aix5.*)                    fmt=coff em=aix5
-       AC_DEFINE(AIX_WEAK_SUPPORT, 1,
+       AC_DEFINE(AIX_WEAK_SUPPORT, 1,

                  [Define if using AIX 5.2 value for C_WEAKEXT.])
                  [Define if using AIX 5.2 value for C_WEAKEXT.])

-      ;;
-      ppc-*-aix*)                      fmt=coff ;;
-      ppc-*-beos*)                     fmt=coff ;;
-      ppc-*-*n*bsd* | ppc-*-elf*)      fmt=elf ;;
-      ppc-*-eabi* | ppc-*-sysv4*)      fmt=elf ;;
-      ppc-*-linux-gnu*)                        fmt=elf em=linux
-           case "$endian" in
-               big)  ;;
-               *)    AC_MSG_ERROR(GNU/Linux must be configured big endian) ;;
-           esac ;;
-      ppc-*-solaris*)                  fmt=elf
-           if test ${this_target} = $target; then
-               AC_DEFINE(TARGET_SOLARIS_COMMENT, 1,
-                         [Define if default target is PowerPC Solaris.])
-           fi
-           if test x${endian} = xbig; then
-               AC_MSG_ERROR(Solaris must be configured little endian)
-           fi ;;
-      ppc-*-rtems*)                    fmt=elf ;;
-      ppc-*-macos*)                    fmt=coff em=macos ;;
-      ppc-*-nto*)                      fmt=elf ;;
-      ppc-*-kaos*)                     fmt=elf ;;
-      ppc-*-lynxos*)                   fmt=elf em=lynx bfd_gas=yes ;;
-
-      s390x-*-linux-gnu*)              fmt=elf em=linux ;;
-      s390-*-linux-gnu*)               fmt=elf em=linux ;;
-
-      sh*-*-linux*)                    fmt=elf em=linux
-           case ${cpu} in
-               sh*eb)  endian=big ;;
-               *)      endian=little ;;
-           esac ;;
-      sh5*-*-netbsd*)                  fmt=elf em=nbsd ;;
-      sh64*-*-netbsd*)                 fmt=elf em=nbsd ;;
-      sh*-*-netbsdelf*)                        fmt=elf em=nbsd ;;
-      sh*-symbian-elf*)                        fmt=elf endian=little
-               AC_DEFINE(TARGET_SYMBIAN, 1, [Define if target is Symbian OS.])
-               ;;
-      sh-*-elf*)                       fmt=elf ;;
-      sh-*-coff*)                      fmt=coff ;;
-      sh-*-nto*)                       fmt=elf ;;
-      sh-*-pe*)                                fmt=coff em=pe bfd_gas=yes endian=little ;;
-      sh-*-rtemscoff*)                 fmt=coff ;;
-      sh-*-rtems*)                     fmt=elf ;;
-      sh-*-kaos*)                      fmt=elf ;;
-      shle*-*-kaos*)                   fmt=elf ;;
-      sh64-*-elf*)                     fmt=elf ;;
-
-      ns32k-pc532-mach*)               fmt=aout em=pc532mach ;;
-      ns32k-pc532-ux*)                 fmt=aout em=pc532mach ;;
-      ns32k-pc532-lites*)              fmt=aout em=nbsd532 ;;
-      ns32k-*-*n*bsd*)                 fmt=aout em=nbsd532 ;;
-
-      sparc-*-rtemsaout*)              fmt=aout ;;
-      sparc-*-rtemself*)               fmt=elf ;;
-      sparc-*-rtems*)                  fmt=elf ;;
-      sparc-*-sunos4*)                 fmt=aout em=sun3 ;;
-      sparc-*-aout | sparc*-*-vxworks*)        fmt=aout em=sparcaout ;;
-      sparc-*-coff)                    fmt=coff ;;
-      sparc-*-linux*aout*)             fmt=aout em=linux ;;
-      sparc-*-linux-gnu*)              fmt=elf em=linux ;;
-      sparc-*-lynxos*)                 fmt=coff em=lynx ;;
-      sparc-fujitsu-none)              fmt=aout ;;
-      sparc-*-elf)                     fmt=elf ;;
-      sparc-*-sysv4*)                  fmt=elf ;;
-      sparc-*-solaris*)                        fmt=elf ;;
-      sparc-*-netbsdelf*)              fmt=elf em=nbsd ;;
-      sparc-*-*n*bsd*) case ${cpu} in
-                           sparc64)    fmt=elf em=nbsd ;;
-                           *)          fmt=aout em=nbsd ;;
-                       esac ;;
-      strongarm-*-coff)                        fmt=coff ;;
-      strongarm-*-elf)                 fmt=elf ;;
-      strongarm-*-kaos*)               fmt=elf ;;
-      xscale-*-coff)                   fmt=coff ;;
-      xscale-*-elf)                    fmt=elf ;;
-
-      tic30-*-*aout*)                  fmt=aout bfd_gas=yes ;;
-      tic30-*-*coff*)                  fmt=coff bfd_gas=yes ;;
-      tic4x-*-* | c4x-*-*)              fmt=coff bfd_gas=yes ;;
-      tic54x-*-* | c54x*-*-*)          fmt=coff bfd_gas=yes need_libm=yes;;
-      tic80-*-*)                       fmt=coff ;;
-
-      v850-*-*)                                fmt=elf ;;
-      v850e-*-*)                       fmt=elf ;;
-      v850ea-*-*)                      fmt=elf ;;
-
-      vax-*-netbsdelf*)                        fmt=elf em=nbsd ;;
-      vax-*-netbsd*)                   fmt=aout em=nbsd ;;
-      vax-*-bsd* | vax-*-ultrix*)      fmt=aout ;;
-      vax-*-linux-gnu*)                        fmt=elf em=linux bfd_gas=yes ;;
-      vax-*-vms)                       fmt=vms ;;
-
-      w65-*-*)                         fmt=coff ;;
-
-      xstormy16-*-*)                   fmt=elf ;;
-
-      xtensa-*-*)                      fmt=elf ;;
-
-      z8k-*-coff | z8k-*-sim)          fmt=coff ;;
-
-      *-*-aout | *-*-scout)            fmt=aout ;;
-      *-*-freebsd* | *-*-kfreebsd*-gnu)        fmt=elf em=freebsd ;;
-      *-*-nindy*)                      fmt=bout ;;
-      *-*-bsd*)                                fmt=aout em=sun3 ;;
-      *-*-generic)                     fmt=generic ;;
-      *-*-xray | *-*-hms)              fmt=coff ;;
-      *-*-sim)                         fmt=coff ;;
-      *-*-elf | *-*-sysv4* | *-*-solaris*) fmt=elf dev=yes ;;
-      *-*-aros*)                       fmt=elf em=linux bfd_gas=yes ;;
-      *-*-vxworks | *-*-windiss)       fmt=elf ;;
-      *-*-netware)                     fmt=elf em=netware ;;
+       ;;
+      ppc-*-solaris*)
+       if test ${this_target} = $target; then
+         AC_DEFINE(TARGET_SOLARIS_COMMENT, 1,
+                   [Define if default target is PowerPC Solaris.])
+       fi
+       if test x${endian} = xbig; then
+         AC_MSG_ERROR(Solaris must be configured little endian)
+       fi
+       ;;
+
+      sh*-*-symbianelf*)
+       AC_DEFINE(TARGET_SYMBIAN, 1, [Define if target is Symbian OS.])
+       ;;

     esac
 
     if test ${this_target} = $target ; then
     esac
 
     if test ${this_target} = $target ; then


@@ -540,13 +198,6 @@ changequote([,])dnl
       fi
     fi
 
       fi
     fi
 

-    case ${cpu_type}-${fmt} in
-       alpha*-* | arm-* | i386-* | ia64*-* | mips-* | ns32k-* \
-               | pdp11-* | ppc-* | sparc-* | strongarm-* | xscale-* \
-               | *-elf | *-ecoff | *-som)
-           bfd_gas=yes ;;
-    esac
-

 # Other random stuff.
 
     case ${cpu_type} in
 # Other random stuff.
 
     case ${cpu_type} in


@@ -582,15 +233,19 @@ changequote([,])dnl
          mips64* | mipsisa64* | mipsisa32*)
 changequote(,)dnl
            mips_cpu=`echo $target_cpu | sed -e 's/[a-z]*..//' -e 's/el$//'`
          mips64* | mipsisa64* | mipsisa32*)
 changequote(,)dnl
            mips_cpu=`echo $target_cpu | sed -e 's/[a-z]*..//' -e 's/el$//'`

+changequote([,])dnl
+           ;;
+         mips*)
+changequote(,)dnl
+           mips_cpu=`echo $target_cpu | sed -e 's/^mips//' -e 's/el$//'`

 changequote([,])dnl
            ;;
          *)
 changequote([,])dnl
            ;;
          *)

-           AC_ERROR($target_cpu isn't a supported MIPS CPU name)
+           AC_MSG_ERROR($target_cpu isn't a supported MIPS CPU name)

            ;;
        esac
        # See whether it's appropriate to set E_MIPS_ABI_O32 for o32
        # binaries.  It's a GNU extension that some OSes don't understand.
            ;;
        esac
        # See whether it's appropriate to set E_MIPS_ABI_O32 for o32
        # binaries.  It's a GNU extension that some OSes don't understand.

-       # The value only matters on ELF targets.

        case ${target} in
          *-*-irix*)
            use_e_mips_abi_o32=0
        case ${target} in
          *-*-irix*)
            use_e_mips_abi_o32=0


@@ -611,12 +266,15 @@ changequote([,])dnl
        esac
        # Decide which ABI to target by default.
        case ${target} in
        esac
        # Decide which ABI to target by default.
        case ${target} in

-         mips64*-linux* | mips-sgi-irix6*)
+         mips64*-linux* | mips-sgi-irix6* | mips64*-freebsd* | mips64*-kfreebsd*-gnu)

            mips_default_abi=N32_ABI
            ;;
            mips_default_abi=N32_ABI
            ;;

-         mips*-linux*)
+         mips*-linux* | mips*-freebsd* | mips*-kfreebsd*-gnu)

            mips_default_abi=O32_ABI
            ;;
            mips_default_abi=O32_ABI
            ;;

+         mips64*-openbsd*)
+           mips_default_abi=N64_ABI
+           ;;

          *)
            mips_default_abi=NO_ABI
            ;;
          *)
            mips_default_abi=NO_ABI
            ;;


@@ -634,7 +292,7 @@ changequote([,])dnl
 
     # Do we need the opcodes library?
     case ${cpu_type} in
 
     # Do we need the opcodes library?
     case ${cpu_type} in

-      vax | i386 | tic30)
+      vax | tic30)

        ;;
 
       *)
        ;;
 
       *)


@@ -645,19 +303,31 @@ changequote([,])dnl
        *opcodes*) shared_opcodes=true ;;
        *) shared_opcodes=false ;;
        esac
        *opcodes*) shared_opcodes=true ;;
        *) shared_opcodes=false ;;
        esac

-       if test "${shared_opcodes}" = "true"; then
-         # A shared libopcodes must be linked against libbfd.
-         need_bfd=yes
-       fi

        ;;
     esac
 
     # Any other special object files needed ?
     case ${cpu_type} in
        ;;
     esac
 
     # Any other special object files needed ?
     case ${cpu_type} in

-      fr30 | ip2k | iq2000 | m32r | openrisc)
+
+      bfin)
+        echo ${extra_objects} | grep -s "bfin-parse.o"
+        if test $? -ne 0 ; then
+          extra_objects="$extra_objects bfin-parse.o"
+        fi
+
+        echo ${extra_objects} | grep -s "bfin-lex-wrapper.o"
+        if test $? -ne 0 ; then
+          extra_objects="$extra_objects bfin-lex-wrapper.o"
+        fi
+        ;;
+
+      epiphany | fr30 | ip2k | iq2000 | lm32 | m32r | openrisc)

        using_cgen=yes
        ;;
 
        using_cgen=yes
        ;;
 

+      m32c)
+       using_cgen=yes
+       ;;

       frv)
        using_cgen=yes
        ;;
       frv)
        using_cgen=yes
        ;;


@@ -668,33 +338,128 @@ changequote([,])dnl
        esac
        ;;
 
        esac
        ;;
 

+      mep)
+       using_cgen=yes
+       ;;
+

       mips)
       mips)

-       echo ${extra_objects} | grep -s "itbl-parse.o" 
+       echo ${extra_objects} | grep -s "itbl-parse.o"

        if test $? -ne 0 ; then
          extra_objects="$extra_objects itbl-parse.o"
        fi
 
        if test $? -ne 0 ; then
          extra_objects="$extra_objects itbl-parse.o"
        fi
 

-       echo ${extra_objects} | grep -s "itbl-lex.o" 
+       echo ${extra_objects} | grep -s "itbl-lex-wrapper.o"

        if test $? -ne 0 ; then
        if test $? -ne 0 ; then

-         extra_objects="$extra_objects itbl-lex.o"
+         extra_objects="$extra_objects itbl-lex-wrapper.o"

        fi
 
        fi
 

-       echo ${extra_objects} | grep -s "itbl-ops.o" 
+       echo ${extra_objects} | grep -s "itbl-ops.o"

        if test $? -ne 0 ; then
          extra_objects="$extra_objects itbl-ops.o"
        fi
        ;;
 
        if test $? -ne 0 ; then
          extra_objects="$extra_objects itbl-ops.o"
        fi
        ;;
 

+      mt)
+        using_cgen=yes
+       ;;
+
+      nds32)
+        # Decide BASELINE, REDUCED_REGS, FPU_DP_EXT, FPU_SP_EXT features
+       # based on arch_name.
+       AC_MSG_CHECKING(for default configuration of --with-arch)
+       if test "x${with_arch}" != x; then
+         case ${with_arch} in
+            v2j | v2s | v2f | v2 | v3m | v3j | v3s | v3f | v3 )
+             AC_DEFINE_UNQUOTED(NDS32_DEFAULT_ARCH_NAME, "$with_arch",
+                                [Define value for nds32_arch_name])
+              ;;
+           *)
+             AC_MSG_ERROR(This kind of arch name does *NOT* exist!)
+             ;;
+          esac
+       fi
+       AC_MSG_RESULT($with_arch)
+
+        # Decide features one by one.
+        AC_MSG_CHECKING(for default configuration of --enable-dx-regs)
+       if test "x${enable_dx_regs}" == xyes; then
+         AC_DEFINE(NDS32_DEFAULT_DX_REGS, 1,
+                   [Define value for nds32_dx_regs])
+       else
+         AC_DEFINE(NDS32_DEFAULT_DX_REGS, 0,
+                   [Define default value for nds32_dx_regs])
+       fi
+       AC_MSG_RESULT($enable_dx_regs)
+
+        AC_MSG_CHECKING(for default configuration of --enable-perf-ext)
+       if test "x${enable_perf_ext}" == xno; then
+         AC_DEFINE(NDS32_DEFAULT_PERF_EXT, 0,
+                   [Define value for nds32_perf_ext])
+       else
+         AC_DEFINE(NDS32_DEFAULT_PERF_EXT, 1,
+                   [Define default value for nds32_perf_ext])
+       fi
+       AC_MSG_RESULT($enable_perf_ext)
+
+        AC_MSG_CHECKING(for default configuration of --enable-perf-ext2)
+       if test "x${enable_perf_ext2}" == xno; then
+         AC_DEFINE(NDS32_DEFAULT_PERF_EXT2, 0,
+                   [Define value for nds32_perf_ext2])
+       else
+         AC_DEFINE(NDS32_DEFAULT_PERF_EXT2, 1,
+                   [Define default value for nds32_perf_ext2])
+       fi
+       AC_MSG_RESULT($enable_perf_ext2)
+
+        AC_MSG_CHECKING(for default configuration of --enable-string-ext)
+       if test "x${enable_string_ext}" == xno; then
+         AC_DEFINE(NDS32_DEFAULT_STRING_EXT, 0,
+                   [Define value for nds32_string_ext])
+       else
+         AC_DEFINE(NDS32_DEFAULT_STRING_EXT, 1,
+                   [Define default value for nds32_string_ext])
+       fi
+       AC_MSG_RESULT($enable_string_ext)
+
+        AC_MSG_CHECKING(for default configuration of --enable-audio-ext)
+       if test "x${enable_audio_ext}" == xno; then
+         AC_DEFINE(NDS32_DEFAULT_AUDIO_EXT, 0,
+                   [Define value for nds32_audio_ext])
+       else
+         AC_DEFINE(NDS32_DEFAULT_AUDIO_EXT, 1,
+                   [Define default value for nds32_audio_ext])
+       fi
+       AC_MSG_RESULT($enable_audio_ext)
+       ;;
+

       i386 | s390 | sparc)
        if test $this_target = $target ; then
          AC_DEFINE_UNQUOTED(DEFAULT_ARCH, "${arch}", [Default architecture.])
        fi
        ;;
 
       i386 | s390 | sparc)
        if test $this_target = $target ; then
          AC_DEFINE_UNQUOTED(DEFAULT_ARCH, "${arch}", [Default architecture.])
        fi
        ;;
 

+      rl78)
+        echo ${extra_objects} | grep -s "rl78-parse.o"
+        if test $? -ne 0 ; then
+          extra_objects="$extra_objects rl78-parse.o"
+        fi
+       ;;
+
+      rx)
+        echo ${extra_objects} | grep -s "rx-parse.o"
+        if test $? -ne 0 ; then
+          extra_objects="$extra_objects rx-parse.o"
+        fi
+       ;;
+

       xstormy16)
        using_cgen=yes
        ;;
 
       xstormy16)
        using_cgen=yes
        ;;
 

+      xc16x)
+       using_cgen=yes
+       ;;
+

       xtensa)
        echo ${extra_objects} | grep -s "xtensa-relax.o"
        if test $? -ne 0 ; then
       xtensa)
        echo ${extra_objects} | grep -s "xtensa-relax.o"
        if test $? -ne 0 ; then


@@ -716,37 +481,21 @@ changequote([,])dnl
 # See if we really can support this configuration with the emulation code.
 
     if test $this_target = $target ; then
 # 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
       te_file=$em
       obj_format=$fmt
       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
 
     fi
 

+   case ${te_file} in
+      vms) extra_objects="$extra_objects te-vms.o" ;;
+   esac
+

 # From target name and format, produce a list of supported emulations.
 
     case ${generic_target}-${fmt} in
 # From target name and format, produce a list of supported emulations.
 
     case ${generic_target}-${fmt} in

-      mips-*-irix5*-*) emulation="mipsbelf mipslelf mipself mipsbecoff mipslecoff mipsecoff" ;;
-      mips*-*-linux*-*) case "$endian" in
+      mips-*-*-*)      case "$endian" in

                        big)    emulation="mipsbelf mipslelf mipself" ;;
                        *)      emulation="mipslelf mipsbelf mipself" ;;
                        esac ;;
                        big)    emulation="mipsbelf mipslelf mipself" ;;
                        *)      emulation="mipslelf mipsbelf mipself" ;;
                        esac ;;

-      mips-*-lnews*-ecoff) ;;
-      mips-*-*-ecoff)  case "$endian" in
-                       big)    emulation="mipsbecoff mipslecoff mipsecoff" ;;
-                       *)      emulation="mipslecoff mipsbecoff mipsecoff" ;;
-                       esac ;;
-      mips-*-*-elf)    case "$endian" in
-                       big)    emulation="mipsbelf mipslelf mipself" ;;
-                       *)      emulation="mipslelf mipsbelf mipself" ;;
-                       esac ;;
-      mips-*-sysv4*MP*-*) emulation="mipsbelf mipslelf mipself mipsbecoff mipslecoff mipsecoff" ;;

       # i386-pc-pe-coff != i386-pc-coff.
       i386-*-pe-coff)  ;;
       # Uncommenting the next line will turn on support for i386 AOUT
       # i386-pc-pe-coff != i386-pc-coff.
       i386-*-pe-coff)  ;;
       # Uncommenting the next line will turn on support for i386 AOUT


@@ -782,15 +531,32 @@ if test ${all_targets} = "yes"; then
       ;;
     esac
   ;;
       ;;
     esac
   ;;

+  x86_64)
+    case ${obj_format} in
+    aout)
+      emulations="$emulations i386coff i386elf"
+      ;;
+    coff)
+      emulations="$emulations i386aout i386elf"
+    ;;
+    elf)
+      emulations="$emulations i386aout i386coff"
+      ;;
+    esac
+  ;;

   esac
 fi
 
   esac
 fi
 

+# PE code has way too many macros tweaking behaviour
+case ${te_file} in
+  pe*) emulations="" ;;
+esac
+

 # 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
 # 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} ;;
-  pdp11)       atof=vax ;;
+  vax | pdp11 )        atof=vax ;;

   *)           atof=ieee ;;
 esac
 
   *)           atof=ieee ;;
 esac
 


@@ -820,27 +586,6 @@ if test ! -r ${srcdir}/config/obj-${obj_format}.c; then
   AC_MSG_ERROR(GAS does not have support for object file format ${obj_format})
 fi
 
   AC_MSG_ERROR(GAS does not have support for object file format ${obj_format})
 fi
 

-case ${user_bfd_gas}-${primary_bfd_gas} in
-  yes-yes | no-no)
-    # We didn't override user's choice.
-    ;;
-  no-yes)
-    AC_MSG_WARN(Use of BFD is required for ${target}; overriding config options.)
-    ;;
-  no-preferred)
-    primary_bfd_gas=no
-    ;;
-  *-preferred)
-    primary_bfd_gas=yes
-    ;;
-  yes-*)
-    primary_bfd_gas=yes
-    ;;
-  -*)
-    # User specified nothing.
-    ;;
-esac
-

 # Some COFF configurations want these random other flags set.
 case ${obj_format} in
   coff)
 # Some COFF configurations want these random other flags set.
 case ${obj_format} in
   coff)


@@ -848,13 +593,14 @@ case ${obj_format} in
       i386) AC_DEFINE(I386COFF, 1, [Using i386 COFF?]) ;;
       m68k) AC_DEFINE(M68KCOFF, 1, [Using m68k COFF?]) ;;
       m88k) AC_DEFINE(M88KCOFF, 1, [Using m88k COFF?]) ;;
       i386) AC_DEFINE(I386COFF, 1, [Using i386 COFF?]) ;;
       m68k) AC_DEFINE(M68KCOFF, 1, [Using m68k COFF?]) ;;
       m88k) AC_DEFINE(M88KCOFF, 1, [Using m88k COFF?]) ;;

+      x86_64) AC_DEFINE(I386COFF, 1, [Using i386 COFF?]) ;;

     esac
     ;;
 esac
 
 # Getting this done right is going to be a bitch.  Each configuration specified
     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.
+# with --enable-targets=... should be checked for environment, format, cpu
+# 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
 #
 # 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


@@ -862,7 +608,7 @@ esac
 #
 # And then there's "--enable-targets=all"....
 #
 #
 # And then there's "--enable-targets=all"....
 #

-# For now, just always do it for MIPS ELF or ECOFF configurations.  Sigh.
+# For now, just always do it for MIPS ELF configurations.  Sigh.

 
 formats="${obj_format}"
 emfiles=""
 
 formats="${obj_format}"
 emfiles=""


@@ -873,8 +619,6 @@ for em in . $emulations ; do
     .) continue ;;
     mipsbelf | mipslelf | mipself)
        fmt=elf   file=mipself ;;
     .) continue ;;
     mipsbelf | mipslelf | mipself)
        fmt=elf   file=mipself ;;

-    mipsbecoff | mipslecoff | mipsecoff)
-       fmt=ecoff file=mipsecoff ;;

     *coff)
        fmt=coff  file=$em ;;
     *aout)
     *coff)
        fmt=coff  file=$em ;;
     *aout)


@@ -897,10 +641,7 @@ if test `set . $formats ; shift ; echo $#` -gt 1 ; then
       ecoff)   AC_DEFINE(OBJ_MAYBE_ECOFF, 1,   [ECOFF support?])   ;;
       elf)     AC_DEFINE(OBJ_MAYBE_ELF, 1,     [ELF support?])     ;;
       generic) AC_DEFINE(OBJ_MAYBE_GENERIC, 1, [generic support?]) ;;
       ecoff)   AC_DEFINE(OBJ_MAYBE_ECOFF, 1,   [ECOFF support?])   ;;
       elf)     AC_DEFINE(OBJ_MAYBE_ELF, 1,     [ELF support?])     ;;
       generic) AC_DEFINE(OBJ_MAYBE_GENERIC, 1, [generic support?]) ;;

-      hp300)   AC_DEFINE(OBJ_MAYBE_HP300, 1,   [HP300 support?])   ;;
-      ieee)    AC_DEFINE(OBJ_MAYBE_IEEE, 1,    [IEEE support?])    ;;

       som)     AC_DEFINE(OBJ_MAYBE_SOM, 1,     [SOM support?])     ;;
       som)     AC_DEFINE(OBJ_MAYBE_SOM, 1,     [SOM support?])     ;;

-      vms)     AC_DEFINE(OBJ_MAYBE_VMS, 1,     [VMS support?])     ;;

     esac
     extra_objects="$extra_objects obj-$fmt.o"
   done
     esac
     extra_objects="$extra_objects obj-$fmt.o"
   done


@@ -908,11 +649,11 @@ if test `set . $formats ; shift ; echo $#` -gt 1 ; then
 fi
 if test `set . $emfiles ; shift ; echo $#` -gt 0 ; then
   DEFAULT_EMULATION=`set . $emulations ; echo $2`
 fi
 if test `set . $emfiles ; shift ; echo $#` -gt 0 ; then
   DEFAULT_EMULATION=`set . $emulations ; echo $2`

-  # e-mips* has more than one emulation per file, e-i386* has just one at the
+  # e-mipself 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
   # 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*)
+    multi* | *mipself*)

       extra_objects="$extra_objects $emfiles"
       AC_DEFINE(USE_EMULATIONS, 1, [Use emulation support?]) ;;
   esac
       extra_objects="$extra_objects $emfiles"
       AC_DEFINE(USE_EMULATIONS, 1, [Use emulation support?]) ;;
   esac


@@ -922,12 +663,6 @@ AC_DEFINE_UNQUOTED(EMULATIONS, $EMULATIONS, [Supported emulations.])
 AC_DEFINE_UNQUOTED(DEFAULT_EMULATION, "$DEFAULT_EMULATION",
                   [Default emulation.])
 
 AC_DEFINE_UNQUOTED(DEFAULT_EMULATION, "$DEFAULT_EMULATION",
                   [Default emulation.])
 

-case ${primary_bfd_gas}-${target_cpu_type}-${obj_format} in
-  yes-*-coff)  need_bfd=yes ;;
-  no-*-coff)   need_bfd=yes
-               AC_DEFINE(MANY_SEGMENTS, 1, [old COFF support?]) ;;
-esac
-

 reject_dev_configs=yes
 
 case ${reject_dev_configs}-${dev} in
 reject_dev_configs=yes
 
 case ${reject_dev_configs}-${dev} in


@@ -943,11 +678,6 @@ AC_SUBST(install_tooldir)
 AC_SUBST(atof)
 dnl AC_SUBST(emulation)
 
 AC_SUBST(atof)
 dnl AC_SUBST(emulation)
 

-case "${primary_bfd_gas}" in
-  yes) AC_DEFINE(BFD_ASSEMBLER, 1, [Use BFD interface?])
-       need_bfd=yes ;;
-esac
-

 # do we need the opcodes library?
 case "${need_opcodes}" in
 yes)
 # do we need the opcodes library?
 case "${need_opcodes}" in
 yes)


@@ -955,38 +685,27 @@ yes)
   ;;
 esac
 
   ;;
 esac
 

-case "${need_bfd}" in
-yes)
-  BFDLIB=../bfd/libbfd.la
-  BFDVER_H=../bfd/bfdver.h
-  ALL_OBJ_DEPS="$ALL_OBJ_DEPS"' ../bfd/bfd.h $(INCDIR)/symcat.h'
-  ;;
-esac
-
-AC_SUBST(BFDLIB)

 AC_SUBST(OPCODES_LIB)
 
 AC_SUBST(OPCODES_LIB)
 

-AC_SUBST(BFDVER_H)
-AC_SUBST(ALL_OBJ_DEPS)
-

 AC_DEFINE_UNQUOTED(TARGET_ALIAS,       "${target_alias}", [Target alias.])
 AC_DEFINE_UNQUOTED(TARGET_CANONICAL,   "${target}",       [Canonical target.])
 AC_DEFINE_UNQUOTED(TARGET_CPU,         "${target_cpu}",   [Target CPU.])
 AC_DEFINE_UNQUOTED(TARGET_VENDOR,      "${target_vendor}", [Target vendor.])
 AC_DEFINE_UNQUOTED(TARGET_OS,          "${target_os}",    [Target OS.])
 
 AC_DEFINE_UNQUOTED(TARGET_ALIAS,       "${target_alias}", [Target alias.])
 AC_DEFINE_UNQUOTED(TARGET_CANONICAL,   "${target}",       [Canonical target.])
 AC_DEFINE_UNQUOTED(TARGET_CPU,         "${target_cpu}",   [Target CPU.])
 AC_DEFINE_UNQUOTED(TARGET_VENDOR,      "${target_vendor}", [Target vendor.])
 AC_DEFINE_UNQUOTED(TARGET_OS,          "${target_os}",    [Target OS.])
 

-AC_PROG_CC
-

 AC_PROG_YACC
 AM_PROG_LEX
 
 AC_PROG_YACC
 AM_PROG_LEX
 

-ALL_LINGUAS="fr tr es"
-CY_GNU_GETTEXT
+ALL_LINGUAS="fr tr es rw id ru fi ja"
+ZW_GNU_GETTEXT_SISTER_DIR
+AM_PO_SUBDIRS

 
 AM_MAINTAINER_MODE
 
 AM_MAINTAINER_MODE

+AM_CONDITIONAL(GENINSRC_NEVER, false)

 AC_EXEEXT
 
 AC_EXEEXT
 

-AC_CHECK_HEADERS(string.h stdlib.h memory.h strings.h unistd.h stdarg.h varargs.h errno.h sys/types.h)
+AC_CHECK_HEADERS(string.h stdlib.h memory.h strings.h unistd.h errno.h sys/types.h limits.h locale.h time.h sys/stat.h)
+ACX_HEADER_STRING

 
 # Put this here so that autoconf's "cross-compiling" message doesn't confuse
 # people who are not cross-compiling but are compiling cross-assemblers.
 
 # Put this here so that autoconf's "cross-compiling" message doesn't confuse
 # people who are not cross-compiling but are compiling cross-assemblers.


@@ -1000,20 +719,20 @@ fi
 AC_MSG_RESULT($cross_gas)
 
 dnl ansidecl.h will deal with const
 AC_MSG_RESULT($cross_gas)
 
 dnl ansidecl.h will deal with const

-dnl AC_CONST
+dnl AC_C_CONST

 AC_FUNC_ALLOCA
 AC_C_INLINE
 
 # VMS doesn't have unlink.
 AC_CHECK_FUNCS(unlink remove, break)
 AC_FUNC_ALLOCA
 AC_C_INLINE
 
 # VMS doesn't have unlink.
 AC_CHECK_FUNCS(unlink remove, break)

+AC_CHECK_FUNCS(sbrk setlocale)

 
 

-# Some systems don't have sbrk().
-AC_CHECK_FUNCS(sbrk)
+AM_LC_MESSAGES

 
 # do we need the math library?
 case "${need_libm}" in
 
 # do we need the math library?
 case "${need_libm}" in

-yes) 
-  AC_CHECK_LIBM
+yes)
+  LT_LIB_M

   AC_SUBST(LIBM)
   ;;
 esac
   AC_SUBST(LIBM)
   ;;
 esac


@@ -1044,11 +763,6 @@ gas_test_headers="
 #include <unistd.h>
 #endif
 "
 #include <unistd.h>
 #endif
 "

-GAS_CHECK_DECL_NEEDED(strstr, f, char *(*f)(), $gas_test_headers)
-GAS_CHECK_DECL_NEEDED(malloc, f, char *(*f)(), $gas_test_headers)
-GAS_CHECK_DECL_NEEDED(free, f, void (*f)(), $gas_test_headers)
-GAS_CHECK_DECL_NEEDED(sbrk, f, char *(*f)(), $gas_test_headers)
-GAS_CHECK_DECL_NEEDED(environ, f, char **f, $gas_test_headers)

 
 # Does errno.h declare errno, or do we have to add a separate declaration
 # for it?
 
 # Does errno.h declare errno, or do we have to add a separate declaration
 # for it?


@@ -1058,6 +772,48 @@ GAS_CHECK_DECL_NEEDED(errno, f, int f, [
 #endif
 ])
 
 #endif
 ])
 

+AC_MSG_CHECKING(for a known getopt prototype in unistd.h)
+AC_CACHE_VAL(gas_cv_decl_getopt_unistd_h,
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <unistd.h>], [extern int getopt (int, char *const*, const char *);])],
+gas_cv_decl_getopt_unistd_h=yes, gas_cv_decl_getopt_unistd_h=no)])
+AC_MSG_RESULT($gas_cv_decl_getopt_unistd_h)
+if test $gas_cv_decl_getopt_unistd_h = yes; then
+  AC_DEFINE([HAVE_DECL_GETOPT], 1,
+           [Is the prototype for getopt in <unistd.h> in the expected format?])
+fi
+
+GAS_CHECK_DECL_NEEDED(environ, f, char **f, $gas_test_headers)
+GAS_CHECK_DECL_NEEDED(ffs, f, int (*f)(int), $gas_test_headers)
+GAS_CHECK_DECL_NEEDED(free, f, void (*f)(), $gas_test_headers)
+GAS_CHECK_DECL_NEEDED(malloc, f, char *(*f)(), $gas_test_headers)
+GAS_CHECK_DECL_NEEDED(sbrk, f, char *(*f)(), $gas_test_headers)
+GAS_CHECK_DECL_NEEDED(strstr, f, char *(*f)(), $gas_test_headers)
+
+AC_CHECK_DECLS([free, getenv, malloc, mempcpy, realloc, stpcpy, strstr, vsnprintf])
+
+BFD_BINARY_FOPEN
+
+# Link in zlib if we can.  This allows us to write compressed debug sections.
+AM_ZLIB
+
+# Support for VMS timestamps via cross compile
+
+if test "$ac_cv_header_time_h" = yes; then
+  GAS_HAVE_TIME_TYPE_MEMBER(struct tm, tm_gmtoff)
+fi
+
+if test "$ac_cv_header_sys_stat_h" = yes; then
+    GAS_HAVE_SYS_STAT_TYPE_MEMBER(struct stat, st_mtim, tv_sec)
+    GAS_HAVE_SYS_STAT_TYPE_MEMBER(struct stat, st_mtim, tv_nsec)
+fi
+
+
+dnl Required for html, pdf, install-pdf and install-html targets.
+AC_SUBST(datarootdir)
+AC_SUBST(docdir)
+AC_SUBST(htmldir)
+AC_SUBST(pdfdir)
+

 dnl This must come last.
 
 dnl We used to make symlinks to files in the source directory, but now
 dnl This must come last.
 
 dnl We used to make symlinks to files in the source directory, but now


@@ -1075,9 +831,7 @@ AC_CONFIG_COMMANDS([default],
  echo '#include "itbl-'"${target_cpu_type}"'.h"' > itbl-cpu.h
  if test "x$cgen_cpu_prefix" != x ; then
    echo '#include "opcodes/'"${cgen_cpu_prefix}"'-desc.h"' > cgen-desc.h
  echo '#include "itbl-'"${target_cpu_type}"'.h"' > itbl-cpu.h
  if test "x$cgen_cpu_prefix" != x ; then
    echo '#include "opcodes/'"${cgen_cpu_prefix}"'-desc.h"' > cgen-desc.h

- fi
-
- sed -e '/POTFILES =/r po/POTFILES' po/Makefile.in > po/Makefile],
+ fi],

 [target_cpu_type=${target_cpu_type}
  cgen_cpu_prefix=${cgen_cpu_prefix}
  obj_format=${obj_format}
 [target_cpu_type=${target_cpu_type}
  cgen_cpu_prefix=${cgen_cpu_prefix}
  obj_format=${obj_format}