gas/testsuite/

	* gas/mips/24k-branch-delay-1.d: Allow 64-bit addresses.  Stub out
	function names.
	* gas/mips/24k-triple-stores-1.d: Likewise.
	* gas/mips/24k-triple-stores-2.d: Likewise.
	* gas/mips/24k-triple-stores-3.d: Likewise.
	* gas/mips/24k-triple-stores-4.d: Likewise.
	* gas/mips/24k-triple-stores-5.d: Likewise.
	* gas/mips/24k-triple-stores-7.d: Likewise.
	* gas/mips/24k-triple-stores-8.d: Likewise.
	* gas/mips/24k-triple-stores-9.d: Likewise.
	* gas/mips/24k-triple-stores-10.d: Likewise.
	* gas/mips/24k-triple-stores-11.d: Likewise.
	* gas/mips/24k-triple-stores-6.d: Likewise.  Add -EB.
	* gas/mips/mips.exp: Only run 24k-triple-stores-11.d on ELF targets.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 976209f8ace20a978c9641c37e0fa5398174d7bb..f1ba9896d69c3f2c9cf7b79c889ed87482fcfa01 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,20 @@
+2011-05-11  Richard Sandiford  <rdsandiford@googlemail.com>
+
+       * gas/mips/24k-branch-delay-1.d: Allow 64-bit addresses.  Stub out
+       function names.
+       * gas/mips/24k-triple-stores-1.d: Likewise.
+       * gas/mips/24k-triple-stores-2.d: Likewise.
+       * gas/mips/24k-triple-stores-3.d: Likewise.
+       * gas/mips/24k-triple-stores-4.d: Likewise.
+       * gas/mips/24k-triple-stores-5.d: Likewise.
+       * gas/mips/24k-triple-stores-7.d: Likewise.
+       * gas/mips/24k-triple-stores-8.d: Likewise.
+       * gas/mips/24k-triple-stores-9.d: Likewise.
+       * gas/mips/24k-triple-stores-10.d: Likewise.
+       * gas/mips/24k-triple-stores-11.d: Likewise.
+       * gas/mips/24k-triple-stores-6.d: Likewise.  Add -EB.
+       * gas/mips/mips.exp: Only run 24k-triple-stores-11.d on ELF targets.
+
 2011-05-11  Richard Sandiford  <rdsandiford@googlemail.com>
 
        * gas/mips/24k-branch-delay-1.d: Add -32 to assembler options.

diff --git a/gas/testsuite/gas/mips/24k-branch-delay-1.d b/gas/testsuite/gas/mips/24k-branch-delay-1.d
index eeca55a44f29673c496b583ec40e810733c641dd..66e82c7b1e2d5f5f397686fe64b03eff8d8df75c 100644 (file)
--- a/gas/testsuite/gas/mips/24k-branch-delay-1.d
+++ b/gas/testsuite/gas/mips/24k-branch-delay-1.d
@@ -5,13 +5,13 @@
 .*: +file format .*mips.*
 
 Disassembly of section .text:
-00000000 <func>:
+0+ <.*>:
    0:  24620005        addiu   v0,v1,5
    4:  8c440000        lw      a0,0\(v0\)
    8:  ac430000        sw      v1,0\(v0\)
    c:  ac430008        sw      v1,8\(v0\)
   10:  00000000        nop
-  14:  10600002        beqz    v1,20 <func\+0x20>
+  14:  10600002        beqz    v1,20 <.*>
   18:  ac430010        sw      v1,16\(v0\)
   1c:  8c430008        lw      v1,8\(v0\)
   20:  8c450010        lw      a1,16\(v0\)

diff --git a/gas/testsuite/gas/mips/24k-triple-stores-1.d b/gas/testsuite/gas/mips/24k-triple-stores-1.d
index 177609dfbf60079e006726e7af3f761bdf41fafb..584102eb51d36721ea0b30fb134a30ef920ba490 100644 (file)
--- a/gas/testsuite/gas/mips/24k-triple-stores-1.d
+++ b/gas/testsuite/gas/mips/24k-triple-stores-1.d
@@ -5,7 +5,7 @@
 .*: +file format .*mips.*
 
 Disassembly of section .text:
-00000000 <.text>:
+0+ <.*>:
    0:  a3a20000        sb      v0,0\(sp\)
    4:  00000000        nop
    8:  a3a30008        sb      v1,8\(sp\)

diff --git a/gas/testsuite/gas/mips/24k-triple-stores-10.d b/gas/testsuite/gas/mips/24k-triple-stores-10.d
index 80ab0b5cd714dbafe7a89d4090b5cc43c00ac790..8566ca229d96a7fda802b0004195fe08615e0c78 100644 (file)
--- a/gas/testsuite/gas/mips/24k-triple-stores-10.d
+++ b/gas/testsuite/gas/mips/24k-triple-stores-10.d
@@ -5,7 +5,7 @@
 .*: +file format .*mips.*
 
 Disassembly of section .text:
-00000000 <.text>:
+0+ <.*>:
    0:  a1020000        sb      v0,0\(t0\)
    4:  00000000        nop
    8:  a1030008        sb      v1,8\(t0\)

diff --git a/gas/testsuite/gas/mips/24k-triple-stores-11.d b/gas/testsuite/gas/mips/24k-triple-stores-11.d
index 1721ae9ac55f861d26676fc5d9154042805dd3d4..66c4a9d044594a6c72e7b46fb18a9b8d7c97a4a6 100644 (file)
--- a/gas/testsuite/gas/mips/24k-triple-stores-11.d
+++ b/gas/testsuite/gas/mips/24k-triple-stores-11.d
@@ -5,7 +5,7 @@
 .*: +file format .*mips.*
 
 Disassembly of section .text:
-00000000 <.text>:
+0+ <.*>:
    0:  00842020        add     a0,a0,a0
    4:  00842020        add     a0,a0,a0
    8:  00842020        add     a0,a0,a0

diff --git a/gas/testsuite/gas/mips/24k-triple-stores-2.d b/gas/testsuite/gas/mips/24k-triple-stores-2.d
index fb6988317f536787f8d7a70d95ee1009a618b746..f294631d6a1269e75afd52b858e786d3b264b9b7 100644 (file)
--- a/gas/testsuite/gas/mips/24k-triple-stores-2.d
+++ b/gas/testsuite/gas/mips/24k-triple-stores-2.d
@@ -5,7 +5,7 @@
 .*: +file format .*mips.*
 
 Disassembly of section .text:
-00000000 <.text>:
+0+ <.*>:
    0:  a3a20000        sb      v0,0\(sp\)
    4:  00000000        nop
    8:  a3a3000a        sb      v1,10\(sp\)

diff --git a/gas/testsuite/gas/mips/24k-triple-stores-3.d b/gas/testsuite/gas/mips/24k-triple-stores-3.d
index cc632172fb817bc7cc629ca5914bf7b62e6d4838..831b92764ef59ab1def61553f266f3d2179d2bd8 100644 (file)
--- a/gas/testsuite/gas/mips/24k-triple-stores-3.d
+++ b/gas/testsuite/gas/mips/24k-triple-stores-3.d
@@ -6,7 +6,7 @@
 
 Disassembly of section .text:
 
-00000000 <.text>:
+0+ <.*>:
    0:  a3a2000b        sb      v0,11\(sp\)
    4:  00000000        nop
    8:  a3a3000b        sb      v1,11\(sp\)

diff --git a/gas/testsuite/gas/mips/24k-triple-stores-4.d b/gas/testsuite/gas/mips/24k-triple-stores-4.d
index e7c5170740e62b1ac975a3fa0fa87f5fdd5c88b7..e33ad56d697d6a8b768d73c8dab5854e575d687d 100644 (file)
--- a/gas/testsuite/gas/mips/24k-triple-stores-4.d
+++ b/gas/testsuite/gas/mips/24k-triple-stores-4.d
@@ -5,7 +5,7 @@
 .*: +file format .*mips.*
 
 Disassembly of section .text:
-00000000 <.text>:
+0+ <.*>:
    0:  a113000a        sb      s3,10\(t0\)
    4:  00000000        nop
    8:  a5130001        sh      s3,1\(t0\)

diff --git a/gas/testsuite/gas/mips/24k-triple-stores-5.d b/gas/testsuite/gas/mips/24k-triple-stores-5.d
index 38539b460d5f635bc6446bbcb9ccf8ec94565d5c..8c8bb0bc2bfd97aa3982171e7f18a2e5b4ae82c4 100644 (file)
--- a/gas/testsuite/gas/mips/24k-triple-stores-5.d
+++ b/gas/testsuite/gas/mips/24k-triple-stores-5.d
@@ -5,7 +5,7 @@
 .*: +file format .*mips.*
 
 Disassembly of section .text:
-00000000 <.text>:
+0+ <.*>:
    0:  a5020007        sh      v0,7\(t0\)
    4:  00000000        nop
    8:  a1030000        sb      v1,0\(t0\)

diff --git a/gas/testsuite/gas/mips/24k-triple-stores-6.d b/gas/testsuite/gas/mips/24k-triple-stores-6.d
index f0a5cac756b66acc0b9fc63e987e15203e7ebc7f..553d5ffa7a90832f2bd0702f52a66155f6da2d7a 100644 (file)
--- a/gas/testsuite/gas/mips/24k-triple-stores-6.d
+++ b/gas/testsuite/gas/mips/24k-triple-stores-6.d
@@ -1,11 +1,11 @@
 #objdump: -dr
-#as: -mfix-24k -32
+#as: -mfix-24k -32 -EB
 #name: 24K: Triple Store (Store Macro Check)
 
 .*: +file format .*mips.*
 
 Disassembly of section .text:
-00000000 <.text>:
+0+ <.*>:
    0:  abbf0050        swl     ra,80\(sp\)
    4:  00000000        nop
    8:  bbbf0053        swr     ra,83\(sp\)

diff --git a/gas/testsuite/gas/mips/24k-triple-stores-7.d b/gas/testsuite/gas/mips/24k-triple-stores-7.d
index 1558d9e0168667ec1d77b4cf6b0e10d669f97d27..aa641eb499f285e6e5547f5963da25322d33e4c6 100644 (file)
--- a/gas/testsuite/gas/mips/24k-triple-stores-7.d
+++ b/gas/testsuite/gas/mips/24k-triple-stores-7.d
@@ -5,7 +5,7 @@
 .*: +file format .*mips.*
 
 Disassembly of section .text:
-00000000 <.text>:
+0+ <.*>:
    0:  a1130004        sb      s3,4\(t0\)
    4:  00000000        nop
    8:  ad130008        sw      s3,8\(t0\)

diff --git a/gas/testsuite/gas/mips/24k-triple-stores-8.d b/gas/testsuite/gas/mips/24k-triple-stores-8.d
index 65c3987a608942d8d89baff8b9cfcd4ea5181323..158dd3a18b37715e53a48f0a35d447d3eae0c194 100644 (file)
--- a/gas/testsuite/gas/mips/24k-triple-stores-8.d
+++ b/gas/testsuite/gas/mips/24k-triple-stores-8.d
@@ -5,7 +5,7 @@
 .*: +file format .*mips.*
 
 Disassembly of section .text:
-00000000 <.text>:
+0+ <.*>:
    0:  a1130000        sb      s3,0\(t0\)
    4:  00000000        nop
    8:  a1130001        sb      s3,1\(t0\)

diff --git a/gas/testsuite/gas/mips/24k-triple-stores-9.d b/gas/testsuite/gas/mips/24k-triple-stores-9.d
index f2c15c15e1d115a6fcb6e36a4bbf8a802afe0c37..2ed929f07d478856ef74958ca6565e333e5397a9 100644 (file)
--- a/gas/testsuite/gas/mips/24k-triple-stores-9.d
+++ b/gas/testsuite/gas/mips/24k-triple-stores-9.d
@@ -6,7 +6,7 @@
 
 Disassembly of section .text:
 
-00000000 <.text>:
+0+ <.*>:
    0:  a1020000        sb      v0,0\(t0\)
    4:  00000000        nop
    8:  a1030008        sb      v1,8\(t0\)

diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 6e721bd2ea05e0a6e029180fafc915c017ccb33a..8995518a769dc57f191df88565530e2fcc798886 100644 (file)
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -491,7 +491,10 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test_arches "24k-triple-stores-8" [mips_arch_list_matching mips1]
     run_dump_test_arches "24k-triple-stores-9" [mips_arch_list_matching mips1]
     run_dump_test_arches "24k-triple-stores-10" [mips_arch_list_matching mips1]
-    run_dump_test_arches "24k-triple-stores-11" [mips_arch_list_matching mips1]
+    if $elf {
+       run_dump_test_arches "24k-triple-stores-11" \
+           [mips_arch_list_matching mips1]
+    }
 
     if $elf {
        run_dump_test_arches "jal-svr4pic" \