* configure.in: Call AM_PROG_LEX rather than AC_PROG_LEX and

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

diff --git a/gas/configure.in b/gas/configure.in
index fcbe94f48128cac533295df77c22a7512f68d180..39f726613dd920d39b879166feaa5f60db3992c5 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.8.2)
+AM_INIT_AUTOMAKE(gas, 2.9.1)
 
 AM_PROG_LIBTOOL
 
@@ -69,6 +69,7 @@ changequote([,])dnl
     arch=
     endian=
     case ${cpu} in
+      alpha*)          cpu_type=alpha ;;
       armeb)           cpu_type=arm endian=big ;;
       arm*)            cpu_type=arm endian=little ;;
       thumb*)          cpu_type=arm endian=little ;;
@@ -81,14 +82,17 @@ changequote(,)dnl
 changequote([,])dnl
       m8*)             cpu_type=m88k ;;
       mips*el)         cpu_type=mips endian=little ;;
+# start-sanitize-r5900
       mips*5900*)       cpu_type=mips endian=little ;;
+# end-sanitize-r5900
       mips*)           cpu_type=mips endian=big ;;
       powerpcle*)      cpu_type=ppc endian=little ;;
       powerpc*)                cpu_type=ppc endian=big ;;
       rs6000*)         cpu_type=ppc ;;
       sparclite*)      cpu_type=sparc arch=sparclite ;;
       sparclet*)       cpu_type=sparc arch=sparclet ;;
-      sparc64*)                cpu_type=sparc arch=v9 ;;
+      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 ;;
       *)               cpu_type=${cpu} ;;
@@ -118,12 +122,13 @@ changequote([,])dnl
       a29k-nyu-sym1)        fmt=coff ;;
       a29k-*-vxworks*)      fmt=coff ;;
 
-      alpha-*-*vms*)       fmt=evax ;;
-      alpha-*-netware*)     fmt=ecoff ;;
-      alpha-*-openbsd*)     fmt=ecoff ;;
-      alpha-*-osf*)         fmt=ecoff ;;
-      alpha-*-linuxecoff*)  fmt=ecoff ;;
-      alpha-*-linux*)       fmt=elf em=linux ;;
+      alpha*-*-*vms*)      fmt=evax ;;
+      alpha*-*-netware*)    fmt=ecoff ;;
+      alpha*-*-openbsd*)    fmt=ecoff ;;
+      alpha*-*-osf*)        fmt=ecoff ;;
+      alpha*-*-linuxecoff*) fmt=ecoff ;;
+      alpha*-*-linux-gnu*)  fmt=elf em=linux ;;
+      alpha*-*-netbsd*)     fmt=elf em=nbsd ;;
 
       arc-*-elf*)           fmt=elf bfd_gas=yes ;;
 
@@ -131,7 +136,7 @@ changequote([,])dnl
       arm-*-aout)          fmt=aout ;;
       arm-*-coff | thumb-*-coff)           fmt=coff ;;
       arm-*-riscix*)        fmt=aout ;;
-      arm-*-pe)             fmt=coff em=pe ;;
+      arm-*-pe | thumb-*-pe)               fmt=coff em=pe ;;
 
       d10v-*-*)                    fmt=elf bfd_gas=yes ;;
 # start-sanitize-d30v
@@ -156,19 +161,22 @@ changequote([,])dnl
       i386-*-openbsd*)      fmt=aout em=nbsd bfd_gas=yes;;
       i386-*-linux*aout* | i386-*-linuxoldld)   fmt=aout em=linux ;;
       i386-*-linux*coff*)   fmt=coff em=linux ;;
-      i386-*-linux*)        fmt=elf em=linux ;;
+      i386-*-linux-gnu*)    fmt=elf em=linux ;;
       i386-*-lynxos*)       fmt=coff em=lynx ;;
-      i386-*-sysv4* | i386-*-solaris* | i386-*-elf | i386-*-freebsdelf*)
+      i386-*-sysv4* | i386-*-solaris* | i386-*-elf)
                            fmt=elf ;;
-      i386-*-sco*elf*)      fmt=elf
+      i386-*-freebsdelf*)   fmt=elf ;;
+      i386-*-freebsd*)      fmt=aout em=386bsd ;;
+      i386-*-coff | i386-*-sysv* | i386-*-sco3.2v5*coff | i386-*-isc*)
+                          fmt=coff ;;
+      i386-*-sco3.2v5*)      fmt=elf
                            if test ${this_target} = $target; then
                                AC_DEFINE(SCO_ELF)
                            fi
                            ;;
-      i386-*-coff | i386-*-sysv* | i386-*-sco* | i386-*-isc*)
-                           fmt=coff ;;
+      i386-*-sco3.2*)       fmt=coff ;;
       i386-*-vsta)          fmt=aout ;;
-      i386-*-msdosdjgpp* | i386-*-go32*)
+      i386-*-msdosdjgpp* | i386-*-go32* | i386-go32-rtems*)
                            fmt=coff em=go32;;
       i386-*-rtems*)        fmt=coff ;;
       i386-*-gnu*)          fmt=elf ;;
@@ -177,8 +185,9 @@ changequote([,])dnl
       i386-*-msdos*)        fmt=aout ;;
       i386-*-moss*)        fmt=elf ;;
       i386-*-pe)            fmt=coff em=pe ;;
-      i386-*-cygwin32)      fmt=coff em=pe bfd_gas=yes ;;
-      i386-*-*nt)           fmt=coff em=pe ;;
+      i386-*-cygwin32*)     fmt=coff em=pe bfd_gas=yes ;;
+      i386-*-mingw32*)      fmt=coff em=pe bfd_gas=yes ;;
+      i386-*-*nt*)          fmt=coff em=pe ;;
       i960-*-bout)          fmt=bout ;;
       i960-*-coff)          fmt=coff em=ic960 ;;
       i960-*-rtems*)        fmt=coff em=ic960 ;;
@@ -202,7 +211,7 @@ changequote([,])dnl
                            fmt=coff ;;
       m68k-*-hpux*)         fmt=hp300 em=hp300 ;;
       m68k-*-linux*aout*)   fmt=aout em=linux ;;
-      m68k-*-linux*)       fmt=elf em=linux ;;
+      m68k-*-linux-gnu*)    fmt=elf em=linux ;;
       m68k-*-lynxos*)       fmt=coff em=lynx ;;
       m68k-*-netbsd*)       fmt=aout em=nbsd bfd_gas=yes ;;
       m68k-*-openbsd*)      fmt=aout em=nbsd bfd_gas=yes ;;
@@ -228,7 +237,7 @@ changequote([,])dnl
       mips-*-lnews*)        fmt=ecoff em=lnews ;;
       mips-*-riscos*)       fmt=ecoff ;;
       mips-*-sysv*)         fmt=ecoff ;;
-      mips-*-elf* | mips-*-rtems* | mips-*-linux* | mips-*-gnu* | mips-*-openbsd*)
+      mips-*-elf* | mips-*-rtems* | mips-*-linux-gnu* | mips-*-gnu* | mips-*-openbsd*)
                            fmt=elf ;;
       mn10200-*-*)         fmt=elf bfd_gas=yes ;;
       mn10300-*-*)         fmt=elf bfd_gas=yes ;;
@@ -238,10 +247,10 @@ changequote([,])dnl
       ppc-*-beos*)          fmt=coff ;;
       ppc-*-*bsd* | ppc-*-elf* | ppc-*-eabi* | ppc-*-sysv4*)
                            fmt=elf ;;
-      ppc-*-linux*)        fmt=elf
+      ppc-*-linux-gnu*)            fmt=elf
                            case "$endian" in
                            big)  ;;
-                           *)    AC_MSG_ERROR(Linux must be configured big endian) ;;
+                           *)    AC_MSG_ERROR(GNU/Linux must be configured big endian) ;;
                            esac
                            ;;
       ppc-*-solaris*)      fmt=elf
@@ -259,7 +268,7 @@ changequote([,])dnl
 
       sh-*-elf*)           fmt=elf ;;
       sh-*-coff*)           fmt=coff ;;
-      sh-*-rtems*)         fmt=elf ;;
+      sh-*-rtems*)         fmt=coff ;;
 
       ns32k-pc532-mach* | ns32k-pc532-ux*)    fmt=aout em=pc532mach ;;
       ns32k-pc532-netbsd* | ns32k-pc532-lites*)  fmt=aout em=nbsd532 ;;
@@ -271,7 +280,7 @@ changequote([,])dnl
                            fmt=aout em=sparcaout ;;
       sparc-*-coff)         fmt=coff ;;
       sparc-*-linux*aout*)  fmt=aout em=linux ;;
-      sparc-*-linux*)      fmt=elf em=linux ;;
+      sparc-*-linux-gnu*)   fmt=elf em=linux ;;
       sparc-*-lynxos*)      fmt=coff em=lynx ;;
       sparc-fujitsu-none)   fmt=aout ;;
       sparc-*-elf | sparc-*-sysv4* | sparc-*-solaris*)
@@ -279,14 +288,21 @@ changequote([,])dnl
       sparc-*-netbsd*)      fmt=aout em=nbsd bfd_gas=yes ;;
       sparc-*-openbsd*)     fmt=aout em=nbsd bfd_gas=yes ;;
 
+      tic30-*-*aout*)      fmt=aout bfd_gas=yes ;;
+      tic30-*-*coff*)       fmt=coff bfd_gas=yes ;;
 # start-sanitize-tic80
       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
       v850e-*-*)           fmt=elf bfd_gas=yes ;;
-      v850eq-*-*)          fmt=elf bfd_gas=yes ;;
+      v850ea-*-*)          fmt=elf bfd_gas=yes ;;
 # end-sanitize-v850e
       vax-*-bsd* | vax-*-ultrix*)
                            fmt=aout ;;
@@ -314,7 +330,7 @@ changequote([,])dnl
     esac
 
     case ${cpu_type}-${fmt} in
-      alpha-*) bfd_gas=yes ;;
+      alpha*-*)        bfd_gas=yes ;;
       arm-*)   bfd_gas=yes ;;
     # not yet
     # i386-aout)       bfd_gas=preferred ;;
@@ -332,10 +348,16 @@ changequote([,])dnl
 
     # do we need the opcodes library?
     case ${cpu_type} in
-      vax | i386)
+      vax | i386 | tic30)
        ;;
       *)
        need_opcodes=yes
+
+       case "${enable_shared}" in
+       yes) shared_opcodes=true ;;
+       *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
@@ -378,7 +400,9 @@ changequote([,])dnl
        ;;
 
       sparc)
-       AC_DEFINE_UNQUOTED(DEFAULT_ARCH, "${arch}")
+       if test $this_target = $target ; then
+         AC_DEFINE_UNQUOTED(DEFAULT_ARCH, "${arch}")
+       fi
        ;;
 
       *)
@@ -405,7 +429,7 @@ changequote([,])dnl
 
     case ${generic_target}-${fmt} in
       mips-*-irix5*-*) emulation="mipsbelf mipslelf mipself mipsbecoff mipslecoff mipsecoff" ;;
-      mips-*-linux*-*) case "$endian" in
+      mips-*-linux-gnu*-*) case "$endian" in
                        big)    emulation="mipsbelf mipslelf mipself mipsbecoff mipslecoff mipsecoff" ;;
                        *)      emulation="mipslelf mipsbelf mipself mipslecoff mipsbecoff mipsecoff" ;;
                        esac ;;
@@ -597,11 +621,9 @@ AC_DEFINE_UNQUOTED(TARGET_VENDOR,  "${target_vendor}")
 AC_DEFINE_UNQUOTED(TARGET_OS,          "${target_os}")
 
 AC_PROG_CC
-AC_PROG_INSTALL
 
 AC_PROG_YACC
-AC_PROG_LEX
-AC_DECL_YYTEXT
+AM_PROG_LEX
 
 AM_MAINTAINER_MODE
 AM_CYGWIN32