s/linuxaout/linux*aout/, s/linuxoldld/linux*oldld/

11 files changed, 29 insertions, 10 deletions

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 46355db..0d8d323 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-25  Alan Modra  <amodra@one.net.au>
+
+	* binutils-all/readelf.exp: Replace linuxoldld with linux*oldld
+	and linuxaout with linux*aout.
+	* binutils-all/objcopy.exp: Remove xfail for linuxaout.
+
 2001-05-24  H.J. Lu  <hjl@gnu.org>
 
 	* binutils-all/objdump.exp (cpus_expected): Add s390.
diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
index 30d33f0..972013d 100644
--- a/binutils/testsuite/binutils-all/objcopy.exp
+++ b/binutils/testsuite/binutils-all/objcopy.exp
@@ -73,7 +73,7 @@ if ![string match "" $got] then {
     setup_xfail "sh-*-coff" "sh-*-hms" 
     setup_xfail "m68*-*-hpux*" "m68*-*-sunos*" "m68*-*-coff" "m68*-*-vxworks*"
     setup_xfail "m68*-ericsson-ose" "m68k*-motorola-sysv*"
-    setup_xfail "i*86-*-linuxaout*" "i*86-*-aout*"
+    setup_xfail "i*86-*-aout*"
     setup_xfail "i*86-*-sysv3" "i*86-*-isc*" "i*86-*-sco*" "i*86-*-coff"
     setup_xfail "i*86-*-aix*" "i*86-*-go32*" "i*86-*-msdos*"
     setup_xfail "a29k-*-udi" "a29k-*-coff" "a29k-*-vxworks*"
diff --git a/binutils/testsuite/binutils-all/readelf.exp b/binutils/testsuite/binutils-all/readelf.exp
index bd00da0..66b6e22 100644
--- a/binutils/testsuite/binutils-all/readelf.exp
+++ b/binutils/testsuite/binutils-all/readelf.exp
@@ -230,8 +230,8 @@ if { ![istarget *-*-elf*] \
     return
 }
 
-if { [istarget *-*-linuxoldld*] \
-     || [istarget *-*-linuxaout*] } {
+if { [istarget *-*-linux*oldld*] \
+     || [istarget *-*-linux*aout*] } {
     verbose "$READELF is only intended for ELF targets" 2
     return
 }
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6f5b600..b7e762f 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,8 @@
 2001-05-25  Alan Modra  <amodra@one.net.au>
 
+	* configure.in: Replace linuxoldld with linux*oldld.
+	* configure: Regenerate.
+
 	From 2.11 branch 2001-03-30  Richard Henderson  <rth@redhat.com>
 	* config/tc-i386.c (md_convert_frag): Don't die on local symbols
 	that have been finalized.
diff --git a/gas/configure b/gas/configure
index bd786d0..3cffffc 100755
--- a/gas/configure
+++ b/gas/configure
@@ -2380,7 +2380,7 @@ for this_target in $target $canon_targets ; do
       i386-*-netbsd0.8)     fmt=aout em=386bsd ;;
       i386-*-netbsd*)       fmt=aout em=nbsd bfd_gas=yes;;
       i386-*-openbsd*)      fmt=aout em=nbsd bfd_gas=yes;;
-      i386-*-linux*aout* | i386-*-linuxoldld)   fmt=aout em=linux ;;
+      i386-*-linux*aout* | i386-*-linux*oldld)   fmt=aout em=linux ;;
       i386-*-linux*coff*)   fmt=coff em=linux ;;
       i386-*-linux-gnu*)    fmt=elf em=linux bfd_gas=yes ;;
       x86_64-*-linux-gnu*)  fmt=elf em=linux bfd_gas=yes ;;
diff --git a/gas/configure.in b/gas/configure.in
index 3ce0aa9..4cabe04 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -244,7 +244,7 @@ changequote([,])dnl
       i386-*-netbsd0.8)     fmt=aout em=386bsd ;;
       i386-*-netbsd*)       fmt=aout em=nbsd bfd_gas=yes;;
       i386-*-openbsd*)      fmt=aout em=nbsd bfd_gas=yes;;
-      i386-*-linux*aout* | i386-*-linuxoldld)   fmt=aout em=linux ;;
+      i386-*-linux*aout* | i386-*-linux*oldld)   fmt=aout em=linux ;;
       i386-*-linux*coff*)   fmt=coff em=linux ;;
       i386-*-linux-gnu*)    fmt=elf em=linux bfd_gas=yes ;;
       x86_64-*-linux-gnu*)  fmt=elf em=linux bfd_gas=yes ;;
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 491cd12..53c4d9f 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-25  Alan Modra  <amodra@one.net.au>
+
+	* configure.host: Replace linuxoldld with linux*oldld.
+	* configure.tgt: Likewise.
+
 2001-05-24  H.J. Lu  <hjl@gnu.org>
 
 	* emultempl/stringify.sed: Removed again.
diff --git a/ld/configure.host b/ld/configure.host
index d8d9afa..7936877 100644
--- a/ld/configure.host
+++ b/ld/configure.host
@@ -81,7 +81,7 @@ i[3456]86-*-sco* | i[3456]86-*-isc*)
   HOSTING_LIBS='`if [ -f ../gcc/libgcc.a ] ; then echo ../gcc/libgcc.a ; else ${CC} -print-libgcc-file-name; fi` -lc `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o; else ${CC} -print-file-name=crtend.o; fi` /lib/crtn.o'
   ;;
 
-i[3456]86-*-linux*aout* | i[3456]86-*-linuxoldld)
+i[3456]86-*-linux*aout* | i[3456]86-*-linux*oldld)
   HOSTING_CRT0=/usr/lib/crt0.o
   ;;
 
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 120f832..bc8f7e9 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -134,7 +134,7 @@ i[3456]86-*-linux*aout*)	targ_emul=i386linux
 			targ_extra_emuls=elf_i386
 			tdir_elf_i386=`echo ${targ_alias} | sed -e 's/aout//'`
 			;;
-i[3456]86-*-linuxoldld)	targ_emul=i386linux; targ_extra_emuls=elf_i386 ;;
+i[3456]86-*-linux*oldld)	targ_emul=i386linux; targ_extra_emuls=elf_i386 ;;
 i[3456]86-*-linux-gnu*)	targ_emul=elf_i386
 			targ_extra_emuls=i386linux
 			tdir_i386linux=${targ_alias}aout
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index dadad1e..e590148 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-25  Alan Modra  <amodra@one.net.au>
+
+	* ld-elfvers/vers.exp: Replace linuxoldld with linux*oldld and
+	linuxaout with linux*aout.
+
 2001-05-24  H.J. Lu  <hjl@gnu.org>
 
 	* ld-scripts/phdrs.exp: Add sparc64 to 64 bit platform.
diff --git a/ld/testsuite/ld-elfvers/vers.exp b/ld/testsuite/ld-elfvers/vers.exp
index a986dda..3f1006c 100644
--- a/ld/testsuite/ld-elfvers/vers.exp
+++ b/ld/testsuite/ld-elfvers/vers.exp
@@ -44,9 +44,9 @@ if { ![istarget i?86-*-sysv4*] \
     return
 }
 
-if { [istarget i?86-*-linuxaout*] \
-     || [istarget i?86-*-linuxoldld*] \
-     || [istarget m68k-*-linuxaout*] } {
+if { [istarget i?86-*-linux*aout*] \
+     || [istarget i?86-*-linux*oldld*] \
+     || [istarget m68k-*-linux*aout*] } {
     return
 }