MIPS/GAS/testsuite: Split `branch-misc-2' tests into two

Move `branch-misc-2' tests for non locally-defined-global symbols into
separate files.  These tests have been introduced with:

commit 6f171daac941741e5fa904f6e462adb75a595495
Author: Alexandre Oliva <aoliva@redhat.com>
Date:   Thu Dec 12 04:40:22 2002 +0000

<https://sourceware.org/ml/binutils/2002-11/msg00631.html>, ("mips:
branches to external labels are broken"), and:

commit d17b874b6c14caa2f2ed1b5544a48de9f39a1a65
Author: Alexandre Oliva <aoliva@redhat.com>
Date:   Wed Mar 12 23:07:22 2003 +0000

<https://sourceware.org/ml/binutils/2003-03/msg00136.html>, ("On
resolving the MIPS gas branch reloc issue"), while the test case served
a different purpose.  With the original intent of the test case brought
back with:

commit bad36eacdad37042c4efb1c5fbf48476b47de82b
Author: Daniel Jacobowitz <drow@false.org>
Date:   Wed Nov 23 14:04:18 2005 +0000

<https://sourceware.org/ml/binutils/2005-11/msg00324.html>,
("R_MIPS_PC16, again"), these stand in the way for linker testing.

	gas/
	* testsuite/gas/mips/branch-misc-2.s: Move non
	locally-defined-global symbol tests...
	* testsuite/gas/mips/branch-misc-5.s: ... to this new test.
	* testsuite/gas/mips/branch-misc-2.d: Update accordingly.
	* testsuite/gas/mips/branch-misc-2-64.d: Likewise.
	* testsuite/gas/mips/branch-misc-2pic.d: Likewise.
	* testsuite/gas/mips/branch-misc-2pic-64.d: Likewise.
	* testsuite/gas/mips/mipsr6@branch-misc-2-64.d: Likewise.
	* testsuite/gas/mips/mipsr6@branch-misc-2pic-64.d: Likewise.
	* testsuite/gas/mips/micromips@branch-misc-2.d: Likewise.
	* testsuite/gas/mips/micromips@branch-misc-2-64.d: Likewise.
	* testsuite/gas/mips/micromips@branch-misc-2pic.d: Likewise.
	* testsuite/gas/mips/micromips@branch-misc-2pic-64.d: Likewise.
	* testsuite/gas/mips/branch-misc-5.d: New test.
	* testsuite/gas/mips/branch-misc-5pic.d: New test.
	* testsuite/gas/mips/branch-misc-5-64.d: New test.
	* testsuite/gas/mips/branch-misc-5pic-64.d: New test.
	* testsuite/gas/mips/mipsr6@branch-misc-5-64.d: New test.
	* testsuite/gas/mips/mipsr6@branch-misc-5pic-64.d: New test.
	* testsuite/gas/mips/micromips@branch-misc-5.d: New test.
	* testsuite/gas/mips/micromips@branch-misc-5pic.d: New test.
	* testsuite/gas/mips/micromips@branch-misc-5-64.d: New test.
	* testsuite/gas/mips/micromips@branch-misc-5pic-64.d: New test.
	* testsuite/gas/mips/mips.exp: Run the new tests.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7ab0b28555f899d25fda2f7537f13a095779eda0..2561c50d0de0f63011666a93b94dca534957759b 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,30 @@
+2016-07-02  Maciej W. Rozycki  <macro@imgtec.com>
+
+       * testsuite/gas/mips/branch-misc-2.s: Move non
+       locally-defined-global symbol tests...
+       * testsuite/gas/mips/branch-misc-5.s: ... to this new test.
+       * testsuite/gas/mips/branch-misc-2.d: Update accordingly.
+       * testsuite/gas/mips/branch-misc-2-64.d: Likewise.
+       * testsuite/gas/mips/branch-misc-2pic.d: Likewise.
+       * testsuite/gas/mips/branch-misc-2pic-64.d: Likewise.
+       * testsuite/gas/mips/mipsr6@branch-misc-2-64.d: Likewise.
+       * testsuite/gas/mips/mipsr6@branch-misc-2pic-64.d: Likewise.
+       * testsuite/gas/mips/micromips@branch-misc-2.d: Likewise.
+       * testsuite/gas/mips/micromips@branch-misc-2-64.d: Likewise.
+       * testsuite/gas/mips/micromips@branch-misc-2pic.d: Likewise.
+       * testsuite/gas/mips/micromips@branch-misc-2pic-64.d: Likewise.
+       * testsuite/gas/mips/branch-misc-5.d: New test.
+       * testsuite/gas/mips/branch-misc-5pic.d: New test.
+       * testsuite/gas/mips/branch-misc-5-64.d: New test.
+       * testsuite/gas/mips/branch-misc-5pic-64.d: New test.
+       * testsuite/gas/mips/mipsr6@branch-misc-5-64.d: New test.
+       * testsuite/gas/mips/mipsr6@branch-misc-5pic-64.d: New test.
+       * testsuite/gas/mips/micromips@branch-misc-5.d: New test.
+       * testsuite/gas/mips/micromips@branch-misc-5pic.d: New test.
+       * testsuite/gas/mips/micromips@branch-misc-5-64.d: New test.
+       * testsuite/gas/mips/micromips@branch-misc-5pic-64.d: New test.
+       * testsuite/gas/mips/mips.exp: Run the new tests.
+
 2016-07-02  Maciej W. Rozycki  <macro@imgtec.com>
 
        * testsuite/gas/mips/beq.s: Uncomment branches to undefined

diff --git a/gas/testsuite/gas/mips/branch-misc-2-64.d b/gas/testsuite/gas/mips/branch-misc-2-64.d
index 3b7791a01a818db293e3c17ea039f4e549eb424f..d299585ea7511962fcc4d975fa3dbb0a93a02d06 100644 (file)
--- a/gas/testsuite/gas/mips/branch-misc-2-64.d
+++ b/gas/testsuite/gas/mips/branch-misc-2-64.d
@@ -3,7 +3,7 @@
 #source: branch-misc-2.s
 #as: -64 -non_shared
 
-# Test the backward branches to globals symbols in current file.
+# Test branches to global symbols in current file.
 
 .*: +file format .*mips.*
 
@@ -44,19 +44,4 @@ Disassembly of section .text:
        \.\.\.
        \.\.\.
        \.\.\.
-0+00a8 <[^>]*> 10000000        b       00000000000000ac <g6\+0x4>
-[      ]*a8: R_MIPS_PC16       x1-0x4
-[      ]*a8: R_MIPS_NONE       \*ABS\*-0x4
-[      ]*a8: R_MIPS_NONE       \*ABS\*-0x4
-0+00ac <[^>]*> 00000000        nop
-0+00b0 <[^>]*> 10000000        b       00000000000000b4 <g6\+0xc>
-[      ]*b0: R_MIPS_PC16       x2-0x4
-[      ]*b0: R_MIPS_NONE       \*ABS\*-0x4
-[      ]*b0: R_MIPS_NONE       \*ABS\*-0x4
-0+00b4 <[^>]*> 00000000        nop
-0+00b8 <[^>]*> 10000000        b       00000000000000bc <g6\+0x14>
-[      ]*b8: R_MIPS_PC16       \.data-0x4
-[      ]*b8: R_MIPS_NONE       \*ABS\*-0x4
-[      ]*b8: R_MIPS_NONE       \*ABS\*-0x4
-0+00bc <[^>]*> 00000000        nop
        \.\.\.

diff --git a/gas/testsuite/gas/mips/branch-misc-2.d b/gas/testsuite/gas/mips/branch-misc-2.d
index ba991656e44bfeeb6eb070f8b9430cddcafd2b97..287364cfc4781accee9cc7dba9d938365f1a33e7 100644 (file)
--- a/gas/testsuite/gas/mips/branch-misc-2.d
+++ b/gas/testsuite/gas/mips/branch-misc-2.d
@@ -2,7 +2,7 @@
 #name: MIPS branch-misc-2
 #as: -32 -non_shared
 
-# Test the backward branches to globals symbols in current file.
+# Test branches to global symbols in current file.
 
 .*: +file format .*mips.*
 
@@ -31,13 +31,4 @@ Disassembly of section .text:
        \.\.\.
        \.\.\.
        \.\.\.
-0+00a8 <[^>]*> 1000ffff        b       000000a8 <g6>
-[      ]*a8: R_MIPS_PC16       x1
-0+00ac <[^>]*> 00000000        nop
-0+00b0 <[^>]*> 1000ffff        b       000000b0 <g6\+0x8>
-[      ]*b0: R_MIPS_PC16       x2
-0+00b4 <[^>]*> 00000000        nop
-0+00b8 <[^>]*> 1000ffff        b       000000b8 <g6\+0x10>
-[      ]*b8: R_MIPS_PC16       \.Ldata
-0+00bc <[^>]*> 00000000        nop
        \.\.\.

diff --git a/gas/testsuite/gas/mips/branch-misc-2.s b/gas/testsuite/gas/mips/branch-misc-2.s
index abf43c5fc3badd1435ae27a3e1064d5b8e2c1a37..4490362a9e5be2aa945f2da4af757f8263555153 100644 (file)
--- a/gas/testsuite/gas/mips/branch-misc-2.s
+++ b/gas/testsuite/gas/mips/branch-misc-2.s
@@ -1,4 +1,4 @@
-# Source file used to test the backward branches to globals in this file.
+# Source file used to test branches to globals in this file.
 
        .globl g1 .text
        .globl g2 .text
@@ -32,13 +32,6 @@ g5:
        .space 20
 g6:
 
-       b       x1
-       b       x2
-       b       .Ldata
-
 # Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
        .align  2
        .space  8
-
-       .data
-.Ldata:

diff --git a/gas/testsuite/gas/mips/branch-misc-2pic-64.d b/gas/testsuite/gas/mips/branch-misc-2pic-64.d
index 7cef9e96c2afaa3cd992fb0774bf3a5611317042..2f64f6b06f7db4d617c3dc2a0a70938f17f7247c 100644 (file)
--- a/gas/testsuite/gas/mips/branch-misc-2pic-64.d
+++ b/gas/testsuite/gas/mips/branch-misc-2pic-64.d
@@ -3,7 +3,7 @@
 #source: branch-misc-2.s
 #as: -64 -call_shared
 
-# Test the backward branches to globals symbols in current file.
+# Test branches to global symbols in current file.
 
 .*: +file format .*mips.*
 
@@ -44,19 +44,4 @@ Disassembly of section .text:
        \.\.\.
        \.\.\.
        \.\.\.
-0+00a8 <[^>]*> 10000000        b       00000000000000ac <g6\+0x4>
-[      ]*a8: R_MIPS_PC16       x1-0x4
-[      ]*a8: R_MIPS_NONE       \*ABS\*-0x4
-[      ]*a8: R_MIPS_NONE       \*ABS\*-0x4
-0+00ac <[^>]*> 00000000        nop
-0+00b0 <[^>]*> 10000000        b       00000000000000b4 <g6\+0xc>
-[      ]*b0: R_MIPS_PC16       x2-0x4
-[      ]*b0: R_MIPS_NONE       \*ABS\*-0x4
-[      ]*b0: R_MIPS_NONE       \*ABS\*-0x4
-0+00b4 <[^>]*> 00000000        nop
-0+00b8 <[^>]*> 10000000        b       00000000000000bc <g6\+0x14>
-[      ]*b8: R_MIPS_PC16       \.data-0x4
-[      ]*b8: R_MIPS_NONE       \*ABS\*-0x4
-[      ]*b8: R_MIPS_NONE       \*ABS\*-0x4
-0+00bc <[^>]*> 00000000        nop
        \.\.\.

diff --git a/gas/testsuite/gas/mips/branch-misc-2pic.d b/gas/testsuite/gas/mips/branch-misc-2pic.d
index a8e93309d4b33f550d73d315e03f35491ec7b9ba..ce8ffc8cfcb3abb97333331a58323e9219ef8f99 100644 (file)
--- a/gas/testsuite/gas/mips/branch-misc-2pic.d
+++ b/gas/testsuite/gas/mips/branch-misc-2pic.d
@@ -3,7 +3,7 @@
 #source: branch-misc-2.s
 #as: -32 -call_shared
 
-# Test the backward branches to globals symbols in current file.
+# Test branches to global symbols in current file.
 
 .*: +file format .*mips.*
 
@@ -32,13 +32,4 @@ Disassembly of section .text:
        \.\.\.
        \.\.\.
        \.\.\.
-0+00a8 <[^>]*> 1000ffff        b       000000a8 <g6>
-[      ]*a8: R_MIPS_PC16       x1
-0+00ac <[^>]*> 00000000        nop
-0+00b0 <[^>]*> 1000ffff        b       000000b0 <g6\+0x8>
-[      ]*b0: R_MIPS_PC16       x2
-0+00b4 <[^>]*> 00000000        nop
-0+00b8 <[^>]*> 1000ffff        b       000000b8 <g6\+0x10>
-[      ]*b8: R_MIPS_PC16       \.Ldata
-0+00bc <[^>]*> 00000000        nop
        \.\.\.

diff --git a/gas/testsuite/gas/mips/branch-misc-5-64.d b/gas/testsuite/gas/mips/branch-misc-5-64.d
new file mode 100644 (file)
index 0000000..619921b
--- /dev/null
+++ b/gas/testsuite/gas/mips/branch-misc-5-64.d
@@ -0,0 +1,27 @@
+#objdump: -dr --prefix-addresses --show-raw-insn
+#name: MIPS branch-misc-5-64
+#source: branch-misc-5.s
+#as: -64 -non_shared
+
+# Test branches to undefined symbols and a defined local symbol
+# in another section.
+
+.*: +file format .*mips.*
+
+Disassembly of section .text:
+0+0000 <[^>]*> 10000000        b       0000000000000004 <g6\+0x4>
+[      ]*0: R_MIPS_PC16        x1-0x4
+[      ]*0: R_MIPS_NONE        \*ABS\*-0x4
+[      ]*0: R_MIPS_NONE        \*ABS\*-0x4
+0+0004 <[^>]*> 00000000        nop
+0+0008 <[^>]*> 10000000        b       000000000000000c <g6\+0xc>
+[      ]*8: R_MIPS_PC16        x2-0x4
+[      ]*8: R_MIPS_NONE        \*ABS\*-0x4
+[      ]*8: R_MIPS_NONE        \*ABS\*-0x4
+0+000c <[^>]*> 00000000        nop
+0+0010 <[^>]*> 10000000        b       0000000000000014 <g6\+0x14>
+[      ]*10: R_MIPS_PC16       \.data-0x4
+[      ]*10: R_MIPS_NONE       \*ABS\*-0x4
+[      ]*10: R_MIPS_NONE       \*ABS\*-0x4
+0+0014 <[^>]*> 00000000        nop
+       \.\.\.

diff --git a/gas/testsuite/gas/mips/branch-misc-5.d b/gas/testsuite/gas/mips/branch-misc-5.d
new file mode 100644 (file)
index 0000000..e9c99cc
--- /dev/null
+++ b/gas/testsuite/gas/mips/branch-misc-5.d
@@ -0,0 +1,20 @@
+#objdump: -dr --prefix-addresses --show-raw-insn
+#name: MIPS branch-misc-5
+#as: -32 -non_shared
+
+# Test branches to undefined symbols and a defined local symbol
+# in another section.
+
+.*: +file format .*mips.*
+
+Disassembly of section \.text:
+0+0000 <[^>]*> 1000ffff        b       00000000 <g6>
+[      ]*0: R_MIPS_PC16        x1
+0+0004 <[^>]*> 00000000        nop
+0+0008 <[^>]*> 1000ffff        b       00000008 <g6\+0x8>
+[      ]*8: R_MIPS_PC16        x2
+0+000c <[^>]*> 00000000        nop
+0+0010 <[^>]*> 1000ffff        b       00000010 <g6\+0x10>
+[      ]*10: R_MIPS_PC16       \.Ldata
+0+0014 <[^>]*> 00000000        nop
+       \.\.\.

diff --git a/gas/testsuite/gas/mips/branch-misc-5.s b/gas/testsuite/gas/mips/branch-misc-5.s
new file mode 100644 (file)
index 0000000..ac307f5
--- /dev/null
+++ b/gas/testsuite/gas/mips/branch-misc-5.s
@@ -0,0 +1,20 @@
+# Source file used to test branches to undefined symbols and a defined
+# local symbol in another section.
+
+       .globl g6 .text
+
+       .globl x1 .text
+
+       .text
+g6:
+
+       b       x1
+       b       x2
+       b       .Ldata
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+       .align  2
+       .space  8
+
+       .data
+.Ldata:

diff --git a/gas/testsuite/gas/mips/branch-misc-5pic-64.d b/gas/testsuite/gas/mips/branch-misc-5pic-64.d
new file mode 100644 (file)
index 0000000..68c82d4
--- /dev/null
+++ b/gas/testsuite/gas/mips/branch-misc-5pic-64.d
@@ -0,0 +1,27 @@
+#objdump: -dr --prefix-addresses --show-raw-insn
+#name: MIPS branch-misc-5pic-64
+#source: branch-misc-5.s
+#as: -64 -call_shared
+
+# Test branches to undefined symbols and a defined local symbol
+# in another section.
+
+.*: +file format .*mips.*
+
+Disassembly of section .text:
+0+0000 <[^>]*> 10000000        b       0000000000000004 <g6\+0x4>
+[      ]*0: R_MIPS_PC16        x1-0x4
+[      ]*0: R_MIPS_NONE        \*ABS\*-0x4
+[      ]*0: R_MIPS_NONE        \*ABS\*-0x4
+0+0004 <[^>]*> 00000000        nop
+0+0008 <[^>]*> 10000000        b       000000000000000c <g6\+0xc>
+[      ]*8: R_MIPS_PC16        x2-0x4
+[      ]*8: R_MIPS_NONE        \*ABS\*-0x4
+[      ]*8: R_MIPS_NONE        \*ABS\*-0x4
+0+000c <[^>]*> 00000000        nop
+0+0010 <[^>]*> 10000000        b       0000000000000014 <g6\+0x14>
+[      ]*10: R_MIPS_PC16       \.data-0x4
+[      ]*10: R_MIPS_NONE       \*ABS\*-0x4
+[      ]*10: R_MIPS_NONE       \*ABS\*-0x4
+0+0014 <[^>]*> 00000000        nop
+       \.\.\.

diff --git a/gas/testsuite/gas/mips/branch-misc-5pic.d b/gas/testsuite/gas/mips/branch-misc-5pic.d
new file mode 100644 (file)
index 0000000..6fba525
--- /dev/null
+++ b/gas/testsuite/gas/mips/branch-misc-5pic.d
@@ -0,0 +1,21 @@
+#objdump: -dr --prefix-addresses --show-raw-insn
+#name: MIPS branch-misc-5pic
+#source: branch-misc-5.s
+#as: -32 -call_shared
+
+# Test branches to undefined symbols and a defined local symbol
+# in another section.
+
+.*: +file format .*mips.*
+
+Disassembly of section .text:
+0+0000 <[^>]*> 1000ffff        b       00000000 <g6>
+[      ]*0: R_MIPS_PC16        x1
+0+0004 <[^>]*> 00000000        nop
+0+0008 <[^>]*> 1000ffff        b       00000008 <g6\+0x8>
+[      ]*8: R_MIPS_PC16        x2
+0+000c <[^>]*> 00000000        nop
+0+0010 <[^>]*> 1000ffff        b       00000010 <g6\+0x10>
+[      ]*10: R_MIPS_PC16       \.Ldata
+0+0014 <[^>]*> 00000000        nop
+       \.\.\.

diff --git a/gas/testsuite/gas/mips/micromips@branch-misc-2-64.d b/gas/testsuite/gas/mips/micromips@branch-misc-2-64.d
index 61f27f726817463097bcd975af834de66d9594b6..2e6bd96bbcc6b0a2523dc5c7ae7c3f04708d5624 100644 (file)
--- a/gas/testsuite/gas/mips/micromips@branch-misc-2-64.d
+++ b/gas/testsuite/gas/mips/micromips@branch-misc-2-64.d
@@ -3,7 +3,7 @@
 #source: branch-misc-2.s
 #as: -64 -non_shared
 
-# Test the backward branches to global symbols in current file (microMIPS).
+# Test branches to global symbols in current file (microMIPS).
 
 .*: +file format .*mips.*
 
@@ -44,20 +44,4 @@ Disassembly of section \.text:
        \.\.\.
        \.\.\.
        \.\.\.
-[0-9a-f]+ <[^>]*> 9400 0000    b       0+00ac <g6\+0x4>
-                       a8: R_MICROMIPS_PC16_S1 x1\-0x4
-                       a8: R_MIPS_NONE \*ABS\*\-0x4
-                       a8: R_MIPS_NONE \*ABS\*\-0x4
-[0-9a-f]+ <[^>]*> 0c00         nop
-[0-9a-f]+ <[^>]*> 9400 0000    b       0+00b2 <g6\+0xa>
-                       ae: R_MICROMIPS_PC16_S1 x2\-0x4
-                       ae: R_MIPS_NONE \*ABS\*\-0x4
-                       ae: R_MIPS_NONE \*ABS\*\-0x4
-[0-9a-f]+ <[^>]*> 0c00         nop
-[0-9a-f]+ <[^>]*> 9400 0000    b       0+00b8 <g6\+0x10>
-                       b4: R_MICROMIPS_PC16_S1 \.data\-0x4
-                       b4: R_MIPS_NONE \*ABS\*\-0x4
-                       b4: R_MIPS_NONE \*ABS\*\-0x4
-[0-9a-f]+ <[^>]*> 0c00         nop
-[0-9a-f]+ <[^>]*> 0c00         nop
        \.\.\.

diff --git a/gas/testsuite/gas/mips/micromips@branch-misc-2.d b/gas/testsuite/gas/mips/micromips@branch-misc-2.d
index 1dcc8db2f7d156c4397cece9f861cc8a040b6e43..02c6b40edac2a62ccb236276e5c973d3ba687ab9 100644 (file)
--- a/gas/testsuite/gas/mips/micromips@branch-misc-2.d
+++ b/gas/testsuite/gas/mips/micromips@branch-misc-2.d
@@ -3,7 +3,7 @@
 #source: branch-misc-2.s
 #as: -32 -non_shared
 
-# Test the backward branches to global symbols in current file (microMIPS).
+# Test branches to global symbols in current file (microMIPS).
 
 .*: +file format .*mips.*
 
@@ -32,14 +32,4 @@ Disassembly of section \.text:
        \.\.\.
        \.\.\.
        \.\.\.
-[0-9a-f]+ <[^>]*> 9400 fffe    b       0+00a8 <g6>
-                       a8: R_MICROMIPS_PC16_S1 x1
-[0-9a-f]+ <[^>]*> 0c00         nop
-[0-9a-f]+ <[^>]*> 9400 fffe    b       0+00ae <g6\+0x6>
-                       ae: R_MICROMIPS_PC16_S1 x2
-[0-9a-f]+ <[^>]*> 0c00         nop
-[0-9a-f]+ <[^>]*> 9400 fffe    b       0+00b4 <g6\+0xc>
-                       b4: R_MICROMIPS_PC16_S1 \.Ldata
-[0-9a-f]+ <[^>]*> 0c00         nop
-[0-9a-f]+ <[^>]*> 0c00         nop
        \.\.\.

diff --git a/gas/testsuite/gas/mips/micromips@branch-misc-2pic-64.d b/gas/testsuite/gas/mips/micromips@branch-misc-2pic-64.d
index 7b8b40a496a9b7cd52c2299ecaa63b6971f6a188..a0b6fcc6fcb853262df3d2ef870d8e2bfb6567c1 100644 (file)
--- a/gas/testsuite/gas/mips/micromips@branch-misc-2pic-64.d
+++ b/gas/testsuite/gas/mips/micromips@branch-misc-2pic-64.d
@@ -3,7 +3,7 @@
 #source: branch-misc-2.s
 #as: -64 -call_shared
 
-# Test the backward branches to global symbols in current file (microMIPS).
+# Test branches to global symbols in current file (microMIPS).
 
 .*: +file format .*mips.*
 
@@ -44,20 +44,4 @@ Disassembly of section \.text:
        \.\.\.
        \.\.\.
        \.\.\.
-[0-9a-f]+ <[^>]*> 9400 0000    b       0+00ac <g6\+0x4>
-                       a8: R_MICROMIPS_PC16_S1 x1\-0x4
-                       a8: R_MIPS_NONE \*ABS\*\-0x4
-                       a8: R_MIPS_NONE \*ABS\*\-0x4
-[0-9a-f]+ <[^>]*> 0c00         nop
-[0-9a-f]+ <[^>]*> 9400 0000    b       0+00b2 <g6\+0xa>
-                       ae: R_MICROMIPS_PC16_S1 x2\-0x4
-                       ae: R_MIPS_NONE \*ABS\*\-0x4
-                       ae: R_MIPS_NONE \*ABS\*\-0x4
-[0-9a-f]+ <[^>]*> 0c00         nop
-[0-9a-f]+ <[^>]*> 9400 0000    b       0+00b8 <g6\+0x10>
-                       b4: R_MICROMIPS_PC16_S1 \.data\-0x4
-                       b4: R_MIPS_NONE \*ABS\*\-0x4
-                       b4: R_MIPS_NONE \*ABS\*\-0x4
-[0-9a-f]+ <[^>]*> 0c00         nop
-[0-9a-f]+ <[^>]*> 0c00         nop
        \.\.\.

diff --git a/gas/testsuite/gas/mips/micromips@branch-misc-2pic.d b/gas/testsuite/gas/mips/micromips@branch-misc-2pic.d
index f9ecd03c1791029f3488cd2b5a9e424450ac0827..6785ac085040e05e0b3c4eb0d3c981bdf57d1aa6 100644 (file)
--- a/gas/testsuite/gas/mips/micromips@branch-misc-2pic.d
+++ b/gas/testsuite/gas/mips/micromips@branch-misc-2pic.d
@@ -3,7 +3,7 @@
 #source: branch-misc-2.s
 #as: -32 -call_shared
 
-# Test the backward branches to global symbols in current file (microMIPS).
+# Test branches to global symbols in current file (microMIPS).
 
 .*: +file format .*mips.*
 
@@ -32,14 +32,4 @@ Disassembly of section \.text:
        \.\.\.
        \.\.\.
        \.\.\.
-[0-9a-f]+ <[^>]*> 9400 fffe    b       0+00a8 <g6>
-                       a8: R_MICROMIPS_PC16_S1 x1
-[0-9a-f]+ <[^>]*> 0c00         nop
-[0-9a-f]+ <[^>]*> 9400 fffe    b       0+00ae <g6\+0x6>
-                       ae: R_MICROMIPS_PC16_S1 x2
-[0-9a-f]+ <[^>]*> 0c00         nop
-[0-9a-f]+ <[^>]*> 9400 fffe    b       0+00b4 <g6\+0xc>
-                       b4: R_MICROMIPS_PC16_S1 \.Ldata
-[0-9a-f]+ <[^>]*> 0c00         nop
-[0-9a-f]+ <[^>]*> 0c00         nop
        \.\.\.

diff --git a/gas/testsuite/gas/mips/micromips@branch-misc-5-64.d b/gas/testsuite/gas/mips/micromips@branch-misc-5-64.d
new file mode 100644 (file)
index 0000000..675752d
--- /dev/null
+++ b/gas/testsuite/gas/mips/micromips@branch-misc-5-64.d
@@ -0,0 +1,28 @@
+#objdump: -dr --prefix-addresses --show-raw-insn
+#name: MIPS branch-misc-5-64
+#source: branch-misc-5.s
+#as: -64 -non_shared
+
+# Test branches to undefined symbols and a defined local symbol
+# in another section (microMIPS).
+
+.*: +file format .*mips.*
+
+Disassembly of section \.text:
+[0-9a-f]+ <[^>]*> 9400 0000    b       0+0004 <g6\+0x4>
+                       0: R_MICROMIPS_PC16_S1  x1\-0x4
+                       0: R_MIPS_NONE  \*ABS\*\-0x4
+                       0: R_MIPS_NONE  \*ABS\*\-0x4
+[0-9a-f]+ <[^>]*> 0c00         nop
+[0-9a-f]+ <[^>]*> 9400 0000    b       0+000a <g6\+0xa>
+                       6: R_MICROMIPS_PC16_S1  x2\-0x4
+                       6: R_MIPS_NONE  \*ABS\*\-0x4
+                       6: R_MIPS_NONE  \*ABS\*\-0x4
+[0-9a-f]+ <[^>]*> 0c00         nop
+[0-9a-f]+ <[^>]*> 9400 0000    b       0+0010 <g6\+0x10>
+                       c: R_MICROMIPS_PC16_S1  \.data\-0x4
+                       c: R_MIPS_NONE  \*ABS\*\-0x4
+                       c: R_MIPS_NONE  \*ABS\*\-0x4
+[0-9a-f]+ <[^>]*> 0c00         nop
+[0-9a-f]+ <[^>]*> 0c00         nop
+       \.\.\.

diff --git a/gas/testsuite/gas/mips/micromips@branch-misc-5.d b/gas/testsuite/gas/mips/micromips@branch-misc-5.d
new file mode 100644 (file)
index 0000000..ef408ad
--- /dev/null
+++ b/gas/testsuite/gas/mips/micromips@branch-misc-5.d
@@ -0,0 +1,22 @@
+#objdump: -dr --prefix-addresses --show-raw-insn
+#name: MIPS branch-misc-5
+#source: branch-misc-5.s
+#as: -32 -non_shared
+
+# Test branches to undefined symbols and a defined local symbol
+# in another section (microMIPS).
+
+.*: +file format .*mips.*
+
+Disassembly of section \.text:
+[0-9a-f]+ <[^>]*> 9400 fffe    b       0+0000 <g6>
+                       0: R_MICROMIPS_PC16_S1  x1
+[0-9a-f]+ <[^>]*> 0c00         nop
+[0-9a-f]+ <[^>]*> 9400 fffe    b       0+0006 <g6\+0x6>
+                       6: R_MICROMIPS_PC16_S1  x2
+[0-9a-f]+ <[^>]*> 0c00         nop
+[0-9a-f]+ <[^>]*> 9400 fffe    b       0+000c <g6\+0xc>
+                       c: R_MICROMIPS_PC16_S1  \.Ldata
+[0-9a-f]+ <[^>]*> 0c00         nop
+[0-9a-f]+ <[^>]*> 0c00         nop
+       \.\.\.

diff --git a/gas/testsuite/gas/mips/micromips@branch-misc-5pic-64.d b/gas/testsuite/gas/mips/micromips@branch-misc-5pic-64.d
new file mode 100644 (file)
index 0000000..90b2143
--- /dev/null
+++ b/gas/testsuite/gas/mips/micromips@branch-misc-5pic-64.d
@@ -0,0 +1,28 @@
+#objdump: -dr --prefix-addresses --show-raw-insn
+#name: MIPS branch-misc-5pic-64
+#source: branch-misc-5.s
+#as: -64 -call_shared
+
+# Test branches to undefined symbols and a defined local symbol
+# in another section (microMIPS).
+
+.*: +file format .*mips.*
+
+Disassembly of section \.text:
+[0-9a-f]+ <[^>]*> 9400 0000    b       0+0004 <g6\+0x4>
+                       0: R_MICROMIPS_PC16_S1  x1\-0x4
+                       0: R_MIPS_NONE  \*ABS\*\-0x4
+                       0: R_MIPS_NONE  \*ABS\*\-0x4
+[0-9a-f]+ <[^>]*> 0c00         nop
+[0-9a-f]+ <[^>]*> 9400 0000    b       0+000a <g6\+0xa>
+                       6: R_MICROMIPS_PC16_S1  x2\-0x4
+                       6: R_MIPS_NONE  \*ABS\*\-0x4
+                       6: R_MIPS_NONE  \*ABS\*\-0x4
+[0-9a-f]+ <[^>]*> 0c00         nop
+[0-9a-f]+ <[^>]*> 9400 0000    b       0+0010 <g6\+0x10>
+                       c: R_MICROMIPS_PC16_S1  \.data\-0x4
+                       c: R_MIPS_NONE  \*ABS\*\-0x4
+                       c: R_MIPS_NONE  \*ABS\*\-0x4
+[0-9a-f]+ <[^>]*> 0c00         nop
+[0-9a-f]+ <[^>]*> 0c00         nop
+       \.\.\.

diff --git a/gas/testsuite/gas/mips/micromips@branch-misc-5pic.d b/gas/testsuite/gas/mips/micromips@branch-misc-5pic.d
new file mode 100644 (file)
index 0000000..730b037
--- /dev/null
+++ b/gas/testsuite/gas/mips/micromips@branch-misc-5pic.d
@@ -0,0 +1,22 @@
+#objdump: -dr --prefix-addresses --show-raw-insn
+#name: MIPS branch-misc-5pic
+#source: branch-misc-5.s
+#as: -32 -call_shared
+
+# Test branches to undefined symbols and a defined local symbol
+# in another section (microMIPS).
+
+.*: +file format .*mips.*
+
+Disassembly of section \.text:
+[0-9a-f]+ <[^>]*> 9400 fffe    b       0+0000 <g6>
+                       0: R_MICROMIPS_PC16_S1  x1
+[0-9a-f]+ <[^>]*> 0c00         nop
+[0-9a-f]+ <[^>]*> 9400 fffe    b       0+0006 <g6\+0x6>
+                       6: R_MICROMIPS_PC16_S1  x2
+[0-9a-f]+ <[^>]*> 0c00         nop
+[0-9a-f]+ <[^>]*> 9400 fffe    b       0+000c <g6\+0xc>
+                       c: R_MICROMIPS_PC16_S1  \.Ldata
+[0-9a-f]+ <[^>]*> 0c00         nop
+[0-9a-f]+ <[^>]*> 0c00         nop
+       \.\.\.

diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index e20905e1b1f763dc1ceb8548c07bd8db8f6e96c4..731afd27fcf899ba7e9b5fb15d3fb79ed54bfc20 100644 (file)
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -561,6 +561,8 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test_arches "branch-misc-2pic" [mips_arch_list_matching mips1]
     run_dump_test "branch-misc-3"
     run_dump_test_arches "branch-misc-4" [mips_arch_list_matching mips1]
+    run_dump_test_arches "branch-misc-5" [mips_arch_list_matching mips1]
+    run_dump_test_arches "branch-misc-5pic" [mips_arch_list_matching mips1]
     if $has_newabi {
        run_dump_test_arches "branch-misc-2-64" \
                                        [mips_arch_list_matching mips3]
@@ -568,6 +570,10 @@ if { [istarget mips*-*-vxworks*] } {
                                        [mips_arch_list_matching mips3]
        run_dump_test_arches "branch-misc-4-64" \
                                        [mips_arch_list_matching mips3]
+       run_dump_test_arches "branch-misc-5-64" \
+                                       [mips_arch_list_matching mips3]
+       run_dump_test_arches "branch-misc-5pic-64" \
+                                       [mips_arch_list_matching mips3]
     }
     run_dump_test "branch-swap"
 

diff --git a/gas/testsuite/gas/mips/mipsr6@branch-misc-2-64.d b/gas/testsuite/gas/mips/mipsr6@branch-misc-2-64.d
index 44ffa7ca69672b4165ea765df37d5810c59b0c09..a46bf30ccb7958ba74763bd80fc9000a3d64bfd5 100644 (file)
--- a/gas/testsuite/gas/mips/mipsr6@branch-misc-2-64.d
+++ b/gas/testsuite/gas/mips/mipsr6@branch-misc-2-64.d
@@ -3,7 +3,7 @@
 #source: branch-misc-2.s
 #as: -64 -non_shared
 
-# Test the backward branches to globals symbols in current file.
+# Test branches to global symbols in current file (MIPSr6).
 
 .*: +file format .*mips.*
 
@@ -44,19 +44,4 @@ Disassembly of section .text:
        \.\.\.
        \.\.\.
        \.\.\.
-0+00a8 <[^>]*> 10000000        b       00000000000000ac <g6\+0x4>
-[      ]*a8: R_MIPS_PC16       x1-0x4
-[      ]*a8: R_MIPS_NONE       \*ABS\*-0x4
-[      ]*a8: R_MIPS_NONE       \*ABS\*-0x4
-0+00ac <[^>]*> 00000000        nop
-0+00b0 <[^>]*> 10000000        b       00000000000000b4 <g6\+0xc>
-[      ]*b0: R_MIPS_PC16       x2-0x4
-[      ]*b0: R_MIPS_NONE       \*ABS\*-0x4
-[      ]*b0: R_MIPS_NONE       \*ABS\*-0x4
-0+00b4 <[^>]*> 00000000        nop
-0+00b8 <[^>]*> 10000000        b       00000000000000bc <g6\+0x14>
-[      ]*b8: R_MIPS_PC16       \.Ldata-0x4
-[      ]*b8: R_MIPS_NONE       \*ABS\*-0x4
-[      ]*b8: R_MIPS_NONE       \*ABS\*-0x4
-0+00bc <[^>]*> 00000000        nop
        \.\.\.

diff --git a/gas/testsuite/gas/mips/mipsr6@branch-misc-2pic-64.d b/gas/testsuite/gas/mips/mipsr6@branch-misc-2pic-64.d
index 5ff980e776fc119b87cd59e355e06026be55f3fd..f2217dbbe9e18588acffb67de04f369f9d56f95d 100644 (file)
--- a/gas/testsuite/gas/mips/mipsr6@branch-misc-2pic-64.d
+++ b/gas/testsuite/gas/mips/mipsr6@branch-misc-2pic-64.d
@@ -3,7 +3,7 @@
 #source: branch-misc-2.s
 #as: -64 -call_shared
 
-# Test the backward branches to globals symbols in current file.
+# Test branches to global symbols in current file (MIPSr6).
 
 .*: +file format .*mips.*
 
@@ -44,19 +44,4 @@ Disassembly of section .text:
        \.\.\.
        \.\.\.
        \.\.\.
-0+00a8 <[^>]*> 10000000        b       00000000000000ac <g6\+0x4>
-[      ]*a8: R_MIPS_PC16       x1-0x4
-[      ]*a8: R_MIPS_NONE       \*ABS\*-0x4
-[      ]*a8: R_MIPS_NONE       \*ABS\*-0x4
-0+00ac <[^>]*> 00000000        nop
-0+00b0 <[^>]*> 10000000        b       00000000000000b4 <g6\+0xc>
-[      ]*b0: R_MIPS_PC16       x2-0x4
-[      ]*b0: R_MIPS_NONE       \*ABS\*-0x4
-[      ]*b0: R_MIPS_NONE       \*ABS\*-0x4
-0+00b4 <[^>]*> 00000000        nop
-0+00b8 <[^>]*> 10000000        b       00000000000000bc <g6\+0x14>
-[      ]*b8: R_MIPS_PC16       \.Ldata-0x4
-[      ]*b8: R_MIPS_NONE       \*ABS\*-0x4
-[      ]*b8: R_MIPS_NONE       \*ABS\*-0x4
-0+00bc <[^>]*> 00000000        nop
        \.\.\.

diff --git a/gas/testsuite/gas/mips/mipsr6@branch-misc-5-64.d b/gas/testsuite/gas/mips/mipsr6@branch-misc-5-64.d
new file mode 100644 (file)
index 0000000..153bb0d
--- /dev/null
+++ b/gas/testsuite/gas/mips/mipsr6@branch-misc-5-64.d
@@ -0,0 +1,27 @@
+#objdump: -dr --prefix-addresses --show-raw-insn
+#name: MIPS branch-misc-5-64
+#source: branch-misc-5.s
+#as: -64 -non_shared
+
+# Test branches to undefined symbols and a defined local symbol
+# in another section (MIPSr6).
+
+.*: +file format .*mips.*
+
+Disassembly of section .text:
+0+0000 <[^>]*> 10000000        b       0000000000000004 <g6\+0x4>
+[      ]*0: R_MIPS_PC16        x1-0x4
+[      ]*0: R_MIPS_NONE        \*ABS\*-0x4
+[      ]*0: R_MIPS_NONE        \*ABS\*-0x4
+0+0004 <[^>]*> 00000000        nop
+0+0008 <[^>]*> 10000000        b       000000000000000c <g6\+0xc>
+[      ]*8: R_MIPS_PC16        x2-0x4
+[      ]*8: R_MIPS_NONE        \*ABS\*-0x4
+[      ]*8: R_MIPS_NONE        \*ABS\*-0x4
+0+000c <[^>]*> 00000000        nop
+0+0010 <[^>]*> 10000000        b       0000000000000014 <g6\+0x14>
+[      ]*10: R_MIPS_PC16       \.Ldata-0x4
+[      ]*10: R_MIPS_NONE       \*ABS\*-0x4
+[      ]*10: R_MIPS_NONE       \*ABS\*-0x4
+0+0014 <[^>]*> 00000000        nop
+       \.\.\.

diff --git a/gas/testsuite/gas/mips/mipsr6@branch-misc-5pic-64.d b/gas/testsuite/gas/mips/mipsr6@branch-misc-5pic-64.d
new file mode 100644 (file)
index 0000000..a5fdfbe
--- /dev/null
+++ b/gas/testsuite/gas/mips/mipsr6@branch-misc-5pic-64.d
@@ -0,0 +1,27 @@
+#objdump: -dr --prefix-addresses --show-raw-insn
+#name: MIPS branch-misc-5pic-64
+#source: branch-misc-5.s
+#as: -64 -call_shared
+
+# Test branches to undefined symbols and a defined local symbol
+# in another section (MIPSr6).
+
+.*: +file format .*mips.*
+
+Disassembly of section .text:
+0+0000 <[^>]*> 10000000        b       0000000000000004 <g6\+0x4>
+[      ]*0: R_MIPS_PC16        x1-0x4
+[      ]*0: R_MIPS_NONE        \*ABS\*-0x4
+[      ]*0: R_MIPS_NONE        \*ABS\*-0x4
+0+0004 <[^>]*> 00000000        nop
+0+0008 <[^>]*> 10000000        b       000000000000000c <g6\+0xc>
+[      ]*8: R_MIPS_PC16        x2-0x4
+[      ]*8: R_MIPS_NONE        \*ABS\*-0x4
+[      ]*8: R_MIPS_NONE        \*ABS\*-0x4
+0+000c <[^>]*> 00000000        nop
+0+0010 <[^>]*> 10000000        b       0000000000000014 <g6\+0x14>
+[      ]*10: R_MIPS_PC16       \.Ldata-0x4
+[      ]*10: R_MIPS_NONE       \*ABS\*-0x4
+[      ]*10: R_MIPS_NONE       \*ABS\*-0x4
+0+0014 <[^>]*> 00000000        nop
+       \.\.\.