Accept any C library to accompany a GNU Linux implementation, not just the GNU

C library.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3920087..9ee10a9 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-23  Mike Frysinger  <vapier@gentoo.org>
+           Nick Clifton  <nickc@redhat.com>
+
+       * config.bfd: Accept any C library to accompany a GNU Linux
+       implementation, not just the GNU C library.
+       * configure.in: Likewise.
+       * configure: Regenerate.
+
 2005-03-22  H.J. Lu  <hongjiu.lu@intel.com>
 
        * bfd-in.h (_bfd_elf_provide_symbol): New.

diff --git a/bfd/config.bfd b/bfd/config.bfd
index 41b953c..5bf985a 100644 (file)
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -140,7 +140,7 @@ case "${targ}" in
     targ_defvec=ecoffalpha_little_vec
     targ_selvecs=bfd_elf64_alpha_vec
     ;;
-  alpha*-*-linux-gnu* | alpha*-*-elf*)
+  alpha*-*-linux-* | alpha*-*-elf*)
     targ_defvec=bfd_elf64_alpha_vec
     targ_selvecs=ecoffalpha_little_vec
     ;;
@@ -150,7 +150,7 @@ case "${targ}" in
   alpha*-*-*)
     targ_defvec=ecoffalpha_little_vec
     ;;
-  ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-gnu* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu)
+  ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu)
     targ_defvec=bfd_elf64_ia64_little_vec
     targ_selvecs="bfd_elf64_ia64_big_vec bfd_efi_app_ia64_vec"
     ;;
@@ -227,7 +227,7 @@ case "${targ}" in
     targ_defvec=bfd_elf32_littlearm_vec
     targ_selvecs=bfd_elf32_bigarm_vec
     ;;
-  armeb-*-elf | arm*b-*-linux-gnu*)
+  armeb-*-elf | arm*b-*-linux-*)
     targ_defvec=bfd_elf32_bigarm_vec
     targ_selvecs=bfd_elf32_littlearm_vec
     ;;
@@ -235,7 +235,7 @@ case "${targ}" in
     targ_defvec=bfd_elf32_littlearm_vec
     targ_selvecs=bfd_elf32_bigarm_vec
     ;;
-  arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | \
+  arm-*-elf | arm-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
   arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
   arm*-*-eabi* )
     targ_defvec=bfd_elf32_littlearm_vec
@@ -385,7 +385,7 @@ case "${targ}" in
     ;;
 
 #ifdef BFD64
-  hppa*64*-*-linux-gnu*)
+  hppa*64*-*-linux-*)
     targ_defvec=bfd_elf64_hppa_linux_vec
     targ_selvecs=bfd_elf64_hppa_vec
     ;;
@@ -396,7 +396,7 @@ case "${targ}" in
     ;;
 #endif
 
-  hppa*-*-linux-gnu*)
+  hppa*-*-linux-*)
     targ_defvec=bfd_elf32_hppa_linux_vec
     targ_selvecs=bfd_elf32_hppa_vec
     ;;
@@ -529,7 +529,7 @@ case "${targ}" in
     targ_selvecs=bfd_elf32_i386_vec
     targ_underscore=yes
     ;;
-  i[3-7]86-*-linux-gnu*)
+  i[3-7]86-*-linux-*)
     targ_defvec=bfd_elf32_i386_vec
     targ_selvecs="i386linux_vec bfd_efi_app_ia32_vec"
     targ64_selvecs=bfd_elf64_x86_64_vec
@@ -547,7 +547,7 @@ case "${targ}" in
     targ_defvec=bfd_elf64_x86_64_vec
     targ_selvecs="bfd_elf32_i386_vec i386netbsd_vec i386coff_vec bfd_efi_app_ia32_vec"
     ;;
-  x86_64-*-linux-gnu*)
+  x86_64-*-linux-*)
     targ_defvec=bfd_elf64_x86_64_vec
     targ_selvecs="bfd_elf32_i386_vec i386linux_vec bfd_efi_app_ia32_vec"
     ;;
@@ -723,7 +723,7 @@ case "${targ}" in
     targ_selvecs=bfd_elf32_m68k_vec
     targ_underscore=yes
     ;;
-  m68*-*-linux-gnu*)
+  m68*-*-linux-*)
     targ_defvec=bfd_elf32_m68k_vec
     targ_selvecs=m68klinux_vec
     ;;
@@ -1009,7 +1009,7 @@ case "${targ}" in
     ;;
 #endif
   powerpc-*-*bsd* | powerpc-*-elf* | powerpc-*-sysv4* | powerpc-*-eabi* | \
-  powerpc-*-solaris2* | powerpc-*-linux-gnu* | powerpc-*-rtems* | \
+  powerpc-*-solaris2* | powerpc-*-linux-* | powerpc-*-rtems* | \
   powerpc-*-chorus* | powerpc-*-vxworks* | powerpc-*-windiss*)
     targ_defvec=bfd_elf32_powerpc_vec
     targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec ppcboot_vec"
@@ -1046,7 +1046,7 @@ case "${targ}" in
     targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
     ;;
   powerpcle-*-elf* | powerpcle-*-sysv4* | powerpcle-*-eabi* | \
-  powerpcle-*-solaris2* | powerpcle-*-linux-gnu* | powerpcle-*-vxworks* |\
+  powerpcle-*-solaris2* | powerpcle-*-linux-* | powerpcle-*-vxworks* |\
   powerpcle-*-rtems*)
     targ_defvec=bfd_elf32_powerpcle_vec
     targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
@@ -1217,7 +1217,7 @@ case "${targ}" in
     targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec"
     targ_underscore=yes
     ;;
-  sparc-*-linux-gnu*)
+  sparc-*-linux-*)
     targ_defvec=bfd_elf32_sparc_vec
     targ_selvecs="sparclinux_vec bfd_elf64_sparc_vec sunos_big_vec"
     ;;
@@ -1264,7 +1264,7 @@ case "${targ}" in
     targ_defvec=sunos_big_vec
     targ_underscore=yes
     ;;
-  sparc64-*-linux-gnu*)
+  sparc64-*-linux-*)
     targ_defvec=bfd_elf64_sparc_vec
     targ_selvecs="bfd_elf32_sparc_vec sparclinux_vec sunos_big_vec"
     ;;
@@ -1333,7 +1333,7 @@ case "${targ}" in
     targ_underscore=yes
     ;;
 
-  vax-*-linux-gnu*)
+  vax-*-linux-*)
     targ_defvec=bfd_elf32_vax_vec
     ;;
 

diff --git a/bfd/configure b/bfd/configure
index 2918460..ff8d47f 100755 (executable)
--- a/bfd/configure
+++ b/bfd/configure
@@ -9939,7 +9939,7 @@ if test "${target}" = "${host}"; then
   alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
        COREFILE=''
        ;;
-  alpha*-*-linux-gnu*)
+  alpha*-*-linux-*)
        COREFILE=trad-core.lo
        TRAD_HEADER='"hosts/alphalinux.h"'
        ;;
@@ -10003,7 +10003,7 @@ if test "${target}" = "${host}"; then
        COREFILE=trad-core.lo
        TRAD_HEADER='"hosts/i386mach3.h"'
        ;;
-  i[3-7]86-*-linux-gnu*)
+  i[3-7]86-*-linux-*)
        COREFILE=trad-core.lo
        TRAD_HEADER='"hosts/i386linux.h"'
        ;;
@@ -10041,7 +10041,7 @@ if test "${target}" = "${host}"; then
        COREFILE=trad-core.lo
        TRAD_HEADER='"hosts/hp300bsd.h"'
        ;;
-  m68*-*-linux-gnu*)
+  m68*-*-linux-*)
        COREFILE=trad-core.lo
        TRAD_HEADER='"hosts/m68klinux.h"'
        ;;
@@ -10175,7 +10175,7 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
        COREFILE=trad-core.lo
        TRAD_HEADER='"hosts/vaxult2.h"'
        ;;
-  vax-*-linux-gnu*)
+  vax-*-linux-*)
        COREFILE=trad-core.lo
        TRAD_HEADER='"hosts/vaxlinux.h"'
        ;;

diff --git a/bfd/configure.in b/bfd/configure.in
index 9eafb2c..3735490 100644 (file)
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -179,7 +179,7 @@ if test "${target}" = "${host}"; then
   alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
        COREFILE=''
        ;;
-  alpha*-*-linux-gnu*)
+  alpha*-*-linux-*)
        COREFILE=trad-core.lo
        TRAD_HEADER='"hosts/alphalinux.h"'
        ;;
@@ -264,7 +264,7 @@ changequote([,])dnl
        TRAD_HEADER='"hosts/i386mach3.h"'
        ;;
 changequote(,)dnl
-  i[3-7]86-*-linux-gnu*)
+  i[3-7]86-*-linux-*)
 changequote([,])dnl
        COREFILE=trad-core.lo
        TRAD_HEADER='"hosts/i386linux.h"'
@@ -305,7 +305,7 @@ changequote([,])dnl
        COREFILE=trad-core.lo
        TRAD_HEADER='"hosts/hp300bsd.h"'
        ;;
-  m68*-*-linux-gnu*)
+  m68*-*-linux-*)
        COREFILE=trad-core.lo
        TRAD_HEADER='"hosts/m68klinux.h"'
        ;;
@@ -391,7 +391,7 @@ changequote([,])dnl
        COREFILE=trad-core.lo
        TRAD_HEADER='"hosts/vaxult2.h"'
        ;;
-  vax-*-linux-gnu*)
+  vax-*-linux-*)
        COREFILE=trad-core.lo
        TRAD_HEADER='"hosts/vaxlinux.h"'
        ;;

diff --git a/gas/ChangeLog b/gas/ChangeLog
index ad73b79..6fb07d2 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-23  Mike Frysinger  <vapier@gentoo.org>
+           Nick Clifton  <nickc@redhat.com>
+
+       * configure.tgt: Accept any C library to accompany a GNU Linux
+       implementation, not just the GNU C library.
+       * configure.in: Likewise.
+       * configure: Regenerate.
+
 2005-03-23  Nick Clifton  <nickc@redhat.com>
 
        * config/tc-tic30.c: Convert to ISO C90 formatting.

diff --git a/gas/configure b/gas/configure
index 60ebac9..1ffb401 100755 (executable)
--- a/gas/configure
+++ b/gas/configure
@@ -4483,7 +4483,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
        ;;
-      ppc-*-linux-gnu*)
+      ppc-*-linux-*)
        case "$endian" in
          big)  ;;
          *)    { { echo "$as_me:$LINENO: error: GNU/Linux must be configured big endian" >&5

diff --git a/gas/configure.in b/gas/configure.in
index b3db9b1..e6a7267 100644 (file)
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -177,7 +177,7 @@ for this_target in $target $canon_targets ; do
        AC_DEFINE(AIX_WEAK_SUPPORT, 1,
                  [Define if using AIX 5.2 value for C_WEAKEXT.])
        ;;
-      ppc-*-linux-gnu*)
+      ppc-*-linux-*)
        case "$endian" in
          big)  ;;
          *)    AC_MSG_ERROR(GNU/Linux must be configured big endian) ;;

diff --git a/gas/configure.tgt b/gas/configure.tgt
index 976ecd1..9bb6929 100644 (file)
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -98,7 +98,7 @@ case ${generic_target} in
   alpha-*-*vms*)                       fmt=evax ;;
   alpha-*-osf*)                                fmt=ecoff ;;
   alpha-*-linuxecoff*)                 fmt=ecoff ;;
-  alpha-*-linux-gnu*)                  fmt=elf em=linux ;;
+  alpha-*-linux-*)                     fmt=elf em=linux ;;
   alpha-*-netbsd*)                     fmt=elf em=nbsd ;;
   alpha-*-openbsd*)                    fmt=elf em=obsd ;;
 
@@ -114,7 +114,7 @@ case ${generic_target} in
   arm-*-conix*)                                fmt=elf ;;
   arm-*-linux*aout*)                   fmt=aout em=linux ;;
   arm-*-linux-gnueabi*)                        fmt=elf  em=armlinuxeabi ;;
-  arm-*-linux-gnu*)                    fmt=elf  em=linux ;;
+  arm-*-linux-*)                       fmt=elf  em=linux ;;
   arm-*-uclinux*)                      fmt=elf  em=linux ;;
   arm-*-netbsdelf*)                    fmt=elf  em=nbsd ;;
   arm-*-*n*bsd*)                       fmt=aout em=nbsd ;;
@@ -126,7 +126,7 @@ case ${generic_target} in
 
   avr-*-*)                             fmt=elf ;;
 
-  cris-*-linux-gnu* | crisv32-*-linux-gnu*)
+  cris-*-linux-* | crisv32-*-linux-*)
                                        fmt=multi em=linux ;;
   cris-*-* | crisv32-*-*)              fmt=multi ;;
 
@@ -190,7 +190,7 @@ case ${generic_target} in
   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 ;;
+  i386-*-linux-*)                      fmt=elf em=linux ;;
   i386-*-lynxos*)                      fmt=elf em=lynx ;;
   i386-*-sysv[45]*)                    fmt=elf ;;
   i386-*-solaris*)                     fmt=elf ;;
@@ -236,7 +236,7 @@ case ${generic_target} in
 
   ia64-*-elf*)                         fmt=elf ;;
   ia64-*-aix*)                         fmt=elf em=ia64aix ;;
-  ia64-*-linux-gnu*)                   fmt=elf em=linux ;;
+  ia64-*-linux-*)                      fmt=elf em=linux ;;
   ia64-*-hpux*)                                fmt=elf em=hpux ;;
   ia64-*-netbsd*)                      fmt=elf em=nbsd ;;
 
@@ -263,7 +263,7 @@ case ${generic_target} in
   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-*-linux-*)                      fmt=elf em=linux ;;
   m68k-*-uclinux*)                     fmt=elf ;;
   m68k-*-gnu*)                         fmt=elf ;;
   m68k-*-netbsdelf*)                   fmt=elf em=nbsd ;;
@@ -330,7 +330,7 @@ case ${generic_target} in
   ppc-*-beos*)                         fmt=coff ;;
   ppc-*-*n*bsd* | ppc-*-elf*)          fmt=elf ;;
   ppc-*-eabi* | ppc-*-sysv4*)          fmt=elf ;;
-  ppc-*-linux-gnu*)                    fmt=elf em=linux ;;
+  ppc-*-linux-*)                       fmt=elf em=linux ;;
   ppc-*-solaris*)                      fmt=elf ;;
   ppc-*-rtems*)                                fmt=elf ;;
   ppc-*-macos*)                                fmt=coff em=macos ;;
@@ -338,7 +338,7 @@ case ${generic_target} in
   ppc-*-kaos*)                         fmt=elf ;;
   ppc-*-lynxos*)                       fmt=elf em=lynx ;;
 
-  s390-*-linux-gnu*)                   fmt=elf em=linux ;;
+  s390-*-linux-*)                      fmt=elf em=linux ;;
   s390-*-tpf*)                         fmt=elf ;;
 
   sh*-*-linux*)                                fmt=elf em=linux
@@ -367,7 +367,7 @@ case ${generic_target} in
   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-*-linux-*)                     fmt=elf em=linux ;;
   sparc-fujitsu-none)                  fmt=aout ;;
   sparc-*-elf)                         fmt=elf ;;
   sparc-*-sysv4*)                      fmt=elf ;;
@@ -392,7 +392,7 @@ case ${generic_target} in
   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 ;;
+  vax-*-linux-*)                       fmt=elf em=linux ;;
 
   w65-*-*)                             fmt=coff ;;
 

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 49e0a0c..02e604a 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-23  Mike Frysinger  <vapier@gentoo.org>
+           Nick Clifton  <nickc@redhat.com>
+
+       * configure.host: Accept any C library to accompany a GNU Linux
+       implementation, not just the GNU C library.
+       * configure.tgt: Likewise.
+       * emultempl/elf32.em: Likewise.
+               
 2005-03-22  H.J. Lu  <hongjiu.lu@intel.com>
 
        * emultempl/elf32.em (gld${EMULATION_NAME}_provide_bound_symbols): New

diff --git a/ld/configure.host b/ld/configure.host
index 334f090..def726e 100644 (file)
--- a/ld/configure.host
+++ b/ld/configure.host
@@ -83,7 +83,7 @@ am33_2.0-*-linux*)
   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,ld\[^ \]\*,ld-linux,g"`
   ;;
 
-arm*-*-linux-gnu*)
+arm*-*-linux-*)
   HOSTING_CRT0='-p '`echo "$HOSTING_CRT0" | sed -e "s,ld\[^ \]\*,ld-linux,g"`
   ;;
 
@@ -141,7 +141,7 @@ i[3-7]86-*-cygwin*)
   HOSTING_LIBS="$HOSTING_LIBS"' -lcygwin -L/usr/lib/w32api -luser32 -lkernel32 -ladvapi32 -lshell32 `if [ -f ../gcc/libgcc.a ] ; then echo ../gcc/libgcc.a ; else ${CC} -print-libgcc-file-name; fi`'
   ;;
 
-ia64-*-linux-gnu*)
+ia64-*-linux-*)
   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,ld\[^ \]*\*,ld-linux-ia64,g"`
   ;;
 
@@ -155,11 +155,11 @@ mips*-sgi-irix6*)
   HOSTING_LIBS='-L/usr/lib32 '"$HOSTING_LIBS"' `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o ; else ${CC} -print-file-name=crtend.o; fi` /usr/lib32/crtn.o -init __do_global_ctors -fini __do_global_dtors'
   ;;
 
-mips*-*-linux-gnu*)
+mips*-*-linux-*)
   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld.so.1,"`
   ;;
 
-m68*-*-linux-gnu*)
+m68*-*-linux-*)
   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld.so.1,"`
   ;;
 
@@ -183,19 +183,19 @@ m88*-motorola-sysv3)
   HOSTING_LIBS="$HOSTING_LIBS"' `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o; else ${CC} -print-file-name=crtend.o; fi`'
   ;;
 
-powerpc64*-*-linux-gnu*)
+powerpc64*-*-linux-*)
   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib64/ld64.so.1,"`
   ;;
 
-powerpc*-*-linux-gnu*)
+powerpc*-*-linux-*)
   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld.so.1,"`
   ;;
 
-s390x-*-linux-gnu*)
+s390x-*-linux-*)
   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld64.so.1,"`
   ;;
 
-s390-*-linux-gnu*)
+s390-*-linux-*)
   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld.so.1,"`
   ;;
 
@@ -209,15 +209,15 @@ sparc64-*-solaris2* | sparcv9-*-solaris2*)
   HOSTING_LIBS="$HOSTING_LIBS"' `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o; else ${CC} -print-file-name=crtend.o; fi` `if [ -f ../gcc/crtn.o ]; then echo ../gcc/crtn.o; else ${CC} -print-file-name=crtn.o; fi`'
   ;;
 
-sparc-*-linux-gnu*)
+sparc-*-linux-*)
   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld-linux.so.2,"`
   ;;
 
-sparc64-*-linux-gnu*)
+sparc64-*-linux-*)
   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib64/ld-linux.so.2,"`
   ;;
 
-x86_64-*-linux-gnu*)
+x86_64-*-linux-*)
   HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib64/ld-linux-x86-64.so.2,"`
   ;;
 

diff --git a/ld/configure.tgt b/ld/configure.tgt
index 486e21f..7764b09 100644 (file)
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -30,7 +30,7 @@ cr16c-*-elf*)           targ_emul=elf32cr16c ;;
 cris-*-*aout*)         targ_emul=crisaout
                        targ_extra_emuls="criself crislinux"
                        targ_extra_libpath=$targ_extra_emuls ;;
-cris-*-linux-gnu* | cris-*-linux-gnu*)
+cris-*-linux-* | crisv32-*-linux-*)
                        targ_emul=crislinux ;;
 cris-*-* | crisv32-*-*)        targ_emul=criself
                        targ_extra_emuls="crisaout crislinux"
@@ -62,14 +62,14 @@ sparc*-*-linux*aout*)       targ_emul=sparclinux
                        tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/aout//'`
                        tdir_sun4=sparc-sun-sunos4
                        ;;
-sparc64-*-linux-gnu*)  targ_emul=elf64_sparc
+sparc64-*-linux-*)     targ_emul=elf64_sparc
                        targ_extra_emuls="elf32_sparc sparclinux sun4"
                        targ_extra_libpath=elf32_sparc
                        tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/64//'`
                        tdir_sparclinux=${tdir_elf32_sparc}aout
                        tdir_sun4=sparc-sun-sunos4
                        ;;
-sparc*-*-linux-gnu*)   targ_emul=elf32_sparc
+sparc*-*-linux-*)      targ_emul=elf32_sparc
                        targ_extra_emuls="sparclinux elf64_sparc sun4"
                        targ_extra_libpath=elf64_sparc
                        tdir_sparclinux=${targ_alias}aout
@@ -119,8 +119,8 @@ ia64-*-linux*)              targ_emul=elf64_ia64 ;;
 ia64-*-aix*)           targ_emul=elf64_aix ;;
 m32r*le-*-elf*)         targ_emul=m32rlelf ;;
 m32r*-*-elf*)           targ_emul=m32relf ;;
-m32r*le-*-linux-gnu*)   targ_emul=m32rlelf_linux ;;
-m32r*-*-linux-gnu*)     targ_emul=m32relf_linux ;;
+m32r*le-*-linux-*)      targ_emul=m32rlelf_linux ;;
+m32r*-*-linux-*)        targ_emul=m32relf_linux ;;
 m68hc11-*-*|m6811-*-*) targ_emul=m68hc11elf 
                        targ_extra_emuls="m68hc11elfb m68hc12elf m68hc12elfb" ;;
 m68hc12-*-*|m6812-*-*) targ_emul=m68hc12elf 
@@ -131,7 +131,7 @@ m68*-ericsson-ose)  targ_emul=sun3 ;;
 m68*-apple-aux*)       targ_emul=m68kaux ;;
 maxq-*-coff)            targ_emul=maxqcoff;;
 *-tandem-none)         targ_emul=st2000 ;;
-i370-*-elf* | i370-*-linux-gnu*) targ_emul=elf32i370 ;;
+i370-*-elf* | i370-*-linux-*) targ_emul=elf32i370 ;;
 i[3-7]86-*-nto-qnx*)   targ_emul=i386nto ;;
 i[3-7]86-*-vsta)       targ_emul=vsta ;;
 i[3-7]86-go32-rtems*)  targ_emul=i386go32 ;;
@@ -155,14 +155,14 @@ i[3-7]86-*-linux*aout*)   targ_emul=i386linux
                        tdir_elf_i386=`echo ${targ_alias} | sed -e 's/aout//'`
                        ;;
 i[3-7]86-*-linux*oldld)        targ_emul=i386linux; targ_extra_emuls=elf_i386 ;;
-i[3-7]86-*-linux-gnu*) targ_emul=elf_i386
+i[3-7]86-*-linux-*)    targ_emul=elf_i386
                        targ_extra_emuls=i386linux
                        if test x${want64} = xtrue; then
                          targ_extra_emuls="$targ_extra_emuls elf_x86_64"
                        fi
                        tdir_i386linux=${targ_alias}aout
                        ;;
-x86_64-*-linux-gnu*)   targ_emul=elf_x86_64
+x86_64-*-linux-*)      targ_emul=elf_x86_64
                        targ_extra_emuls="elf_i386 i386linux"
                        targ_extra_libpath=elf_i386
                        tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'`
@@ -266,13 +266,13 @@ arm*-*-symbianelf*)     targ_emul=armsymbian;;
 arm-*-kaos*)           targ_emul=armelf ;;
 arm9e-*-elf)           targ_emul=armelf ;;
 arm*b-*-linux-gnueabi) targ_emul=armelfb_linux_eabi ;;
-arm*b-*-linux-gnu*)    targ_emul=armelfb_linux; targ_extra_emuls=armelfb ;;
+arm*b-*-linux-*)       targ_emul=armelfb_linux; targ_extra_emuls=armelfb ;;
 arm*-*-linux-gnueabi)  targ_emul=armelf_linux_eabi ;;
-arm*-*-linux-gnu*)     targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
+arm*-*-linux-*)                targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
 arm*-*-uclinux*)       targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
 arm-*-vxworks)         targ_emul=armelf_vxworks ;;
 arm*-*-conix*)         targ_emul=armelf ;;
-thumb-*-linux-gnu* | thumb-*-uclinux*) targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
+thumb-*-linux-* | thumb-*-uclinux*)    targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
 strongarm-*-coff)      targ_emul=armcoff ;;
 strongarm-*-elf)       targ_emul=armelf ;;
 strongarm-*-kaos*)     targ_emul=armelf ;;
@@ -376,7 +376,7 @@ m68k-*-linux*aout*) targ_emul=m68klinux
                        targ_extra_emuls=m68kelf
                        tdir_m68kelf=`echo ${targ_alias} | sed -e 's/aout//'`
                        ;;
-m68k-*-linux-gnu*)     targ_emul=m68kelf
+m68k-*-linux-*)        targ_emul=m68kelf
                        targ_extra_emuls=m68klinux
                        tdir_m68klinux=`echo ${targ_alias} | sed -e 's/linux/linuxaout/'`
                        ;;
@@ -392,9 +392,9 @@ m68*-*-netbsdaout* | m68*-*-netbsd*)
 m68*-*-psos*)          targ_emul=m68kpsos ;;
 m68*-*-rtemscoff*)     targ_emul=m68kcoff ;;
 m68*-*-rtems*)         targ_emul=m68kelf ;;
-hppa*64*-*-linux-gnu*) targ_emul=hppa64linux ;;
+hppa*64*-*-linux-*)    targ_emul=hppa64linux ;;
 hppa*64*-*)            targ_emul=elf64hppa ;;
-hppa*-*-linux-gnu*)    targ_emul=hppalinux ;;
+hppa*-*-linux-*)       targ_emul=hppalinux ;;
 hppa*-*-*elf*)         targ_emul=hppaelf ;;
 hppa*-*-lites*)                targ_emul=hppaelf ;;
 hppa*-*-netbsd*)       targ_emul=hppanbsd ;;
@@ -406,7 +406,7 @@ vax-*-netbsdelf*)   targ_emul=elf32vax
 vax-*-netbsdaout* | vax-*-netbsd*)
                        targ_emul=vaxnbsd
                        targ_extra_emuls=elf32vax ;;
-vax-*-linux-gnu*)      targ_emul=elf32vax ;;
+vax-*-linux-*)         targ_emul=elf32vax ;;
 mips*-*-pe)            targ_emul=mipspe ;
                        targ_extra_ofiles="deffilep.o pe-dll.o" ;;
 mips*-dec-ultrix*)     targ_emul=mipslit ;;
@@ -440,18 +440,18 @@ mips*el-*-vxworks*)       targ_emul=elf32elmip ;;
 mips*-*-vxworks*)      targ_emul=elf32ebmip
                        targ_extra_emuls="elf32elmip" ;;
 mips*-*-windiss)       targ_emul=elf32mipswindiss ;;
-mips64*el-*-linux-gnu*)        targ_emul=elf32ltsmipn32
+mips64*el-*-linux-*)   targ_emul=elf32ltsmipn32
                        targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
                        targ_extra_libpath="elf32ltsmip elf64ltsmip"
                        ;;
-mips64*-*-linux-gnu*)  targ_emul=elf32btsmipn32
+mips64*-*-linux-*)     targ_emul=elf32btsmipn32
                        targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
                        targ_extra_libpath="elf32btsmip elf64btsmip"
                        ;;
-mips*el-*-linux-gnu*)  targ_emul=elf32ltsmip
+mips*el-*-linux-*)     targ_emul=elf32ltsmip
                        targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip"
                        ;;
-mips*-*-linux-gnu*)    targ_emul=elf32btsmip
+mips*-*-linux-*)       targ_emul=elf32btsmip
                        targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip"
                        ;;
 mips*-*-lnews*)                targ_emul=mipslnews ;;
@@ -471,7 +471,7 @@ alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
 alpha*-*-linuxecoff*)  targ_emul=alpha targ_extra_emuls=elf64alpha
                        tdir_elf64alpha=`echo ${targ_alias} | sed -e 's/ecoff//'`
                        ;;
-alpha*-*-linux-gnu*)   targ_emul=elf64alpha targ_extra_emuls=alpha
+alpha*-*-linux-*)      targ_emul=elf64alpha targ_extra_emuls=alpha
                        tdir_alpha=`echo ${targ_alias} | sed -e 's/linux/linuxecoff/'`
                        ;;
 alpha*-*-osf*)         targ_emul=alpha ;;

diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index b2d2a7c..ca5eafd 100644 (file)
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -65,7 +65,7 @@ EOF
 
 if [ "x${USE_LIBPATH}" = xyes ] ; then
   case ${target} in
-    *-*-linux-gnu*)
+    *-*-linux-*)
   cat >>e${EMULATION_NAME}.c <<EOF
 #ifdef HAVE_GLOB
 #include <glob.h>
@@ -347,7 +347,7 @@ gld${EMULATION_NAME}_try_needed (struct dt_needed *needed,
 
 EOF
 case ${target} in
-  *-*-linux-gnu*)
+  *-*-linux-*)
     cat >>e${EMULATION_NAME}.c <<EOF
          {
            struct bfd_link_needed_list *l;
@@ -519,7 +519,7 @@ gld${EMULATION_NAME}_add_sysroot (const char *path)
 
 EOF
   case ${target} in
-    *-*-linux-gnu*)
+    *-*-linux-*)
       cat >>e${EMULATION_NAME}.c <<EOF
 /* For a native linker, check the file /etc/ld.so.conf for directories
    in which we may find shared libraries.  /etc/ld.so.conf is really
@@ -922,7 +922,7 @@ cat >>e${EMULATION_NAME}.c <<EOF
 EOF
 if [ "x${USE_LIBPATH}" = xyes ] ; then
   case ${target} in
-    *-*-linux-gnu*)
+    *-*-linux-*)
       cat >>e${EMULATION_NAME}.c <<EOF
          if (gld${EMULATION_NAME}_check_ld_so_conf (l->name, force))
            break;