aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/testsuite/ChangeLog6
-rw-r--r--gas/testsuite/gas/elf/elf.exp11
-rw-r--r--gas/testsuite/gas/i386/reloc.d14
-rw-r--r--gas/testsuite/gas/vtable/vtable.exp6
4 files changed, 24 insertions, 13 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 54eab17..0cfbf5c 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,11 @@
1999-06-12 Ian Lance Taylor <ian@zembu.com>
+ * gas/elf/elf.exp: Don't run tests on "*-*-linux*aout*" or
+ "*-*-linux*oldld*".
+ * gas/vtable/vtable.exp: Likewise.
+ * gas/i386/reloc.d: Modify expected reloc names to accept a.out
+ names.
+
* gas/i386/amd.s: Add a symbol so a.out tests will work.
* gas/i386/katmai.s: Likewise.
* gas/i386/amd.d: Corresponding change.
diff --git a/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp
index 942a48e..98684dd 100644
--- a/gas/testsuite/gas/elf/elf.exp
+++ b/gas/testsuite/gas/elf/elf.exp
@@ -3,10 +3,13 @@
#
# We're testing bits in obj-elf -- don't run on anything else.
-if { [istarget "*-elf*"]
- || [istarget "*-linux*"]
- || [istarget "sparc*-*-solaris*"]
- || [istarget "mips*-*-irix6*"] } then {
+if { ([istarget "*-*-elf*"]
+ || [istarget "*-*-linux*"]
+ || [istarget "sparc*-*-solaris*"]
+ || [istarget "mips*-*-irix6*"])
+ && ![istarget *-*-linux*aout*]
+ && ![istarget *-*-linux*oldld*]
+} then {
# FIXME: This doesn't work for MIPS targets because of the .reginfo
# and .mdebug sections.
diff --git a/gas/testsuite/gas/i386/reloc.d b/gas/testsuite/gas/i386/reloc.d
index f0354ff..b2968c5 100644
--- a/gas/testsuite/gas/i386/reloc.d
+++ b/gas/testsuite/gas/i386/reloc.d
@@ -6,13 +6,13 @@
Disassembly of section .text:
00000000 <foo>:
- 0: b3 00 [ ]*mov \$0x0,%bl 1: R_386_8 .text
- 2: 68 00 00 00 00 [ ]*push \$0x0 3: R_386_32 .text
- 7: 05 00 00 00 00 [ ]*add \$0x0,%eax 8: R_386_32 .text
- c: 81 c3 00 00 00 00 [ ]*add \$0x0,%ebx e: R_386_32 .text
- 12: 69 d2 00 00 00 00 [ ]*imul \$0x0,%edx,%edx 14: R_386_32 .text
- 18: 9a 00 00 00 00 00 00 [ ]*lcall \$0x0,\$0x0 19: R_386_32 .text
- 1f: 66 68 00 00 [ ]*pushw \$0x0 21: R_386_16 .text
+ 0: b3 00 [ ]*mov \$0x0,%bl 1: (R_386_)?8 .text
+ 2: 68 00 00 00 00 [ ]*push \$0x0 3: (R_386_)?32 .text
+ 7: 05 00 00 00 00 [ ]*add \$0x0,%eax 8: (R_386_)?32 .text
+ c: 81 c3 00 00 00 00 [ ]*add \$0x0,%ebx e: (R_386_)?32 .text
+ 12: 69 d2 00 00 00 00 [ ]*imul \$0x0,%edx,%edx 14: (R_386_)?32 .text
+ 18: 9a 00 00 00 00 00 00 [ ]*lcall \$0x0,\$0x0 19: (R_386_)?32 .text
+ 1f: 66 68 00 00 [ ]*pushw \$0x0 21: (R_386_)?16 .text
23: 90 [ ]*nop
24: 90 [ ]*nop
25: 90 [ ]*nop
diff --git a/gas/testsuite/gas/vtable/vtable.exp b/gas/testsuite/gas/vtable/vtable.exp
index 6ecc973..f970772 100644
--- a/gas/testsuite/gas/vtable/vtable.exp
+++ b/gas/testsuite/gas/vtable/vtable.exp
@@ -15,8 +15,10 @@ proc run_list_test { name opts } {
}
# Vtable bits are only supported by ELF targets.
-if {[istarget "*-*-elf*"] || [istarget "*-*-linux*"]} then {
-
+if { ([istarget "*-*-elf*"]
+ || [istarget "*-*-linux*"])
+ && ![istarget *-*-linux*aout*]
+ && ![istarget *-*-linux*oldld*] } then {
# not supported by D30V
if {[istarget "d30v-*-*"]} {