MIPS/GAS: Fix test failures due to jr encoding changes on r6

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 9f966be40b57be3ba89306fdc15c38f998ffd4a7..97f98e78247c0b5a35987479f19f037e08f680e7 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,12 @@
+2023-11-23  YunQiang Su  <yunqiang.su@cipunited.com>
+
+       * testsuite/gas/mips/branch-section-1.d: Allow for r6 encoding of
+       JR instruction.
+       * testsuite/gas/mips/branch-weak-1.d: Likewise.
+       * testsuite/gas/mips/option-pic-1.d: Likewise.
+       * testsuite/gas/mips/option-pic-relax-0.d: Likewise.
+       * testsuite/gas/mips/option-pic-relax-1.d: Likewise.
+
 2023-11-18  Jose E. Marchesi  <jemarch@gnu.org>
 
        * config/tc-bpf.c (parse_bpf_register): Move before

diff --git a/gas/testsuite/gas/mips/branch-section-1.d b/gas/testsuite/gas/mips/branch-section-1.d
index 7782d0c0754fdf664beabe465cd1675afb045241..08c678d27ed86b3a59b6fd06e7dd75e58ea5fd11 100644 (file)
--- a/gas/testsuite/gas/mips/branch-section-1.d
+++ b/gas/testsuite/gas/mips/branch-section-1.d
@@ -12,6 +12,6 @@ Disassembly of section \.text:
        \.\.\.
 
 Disassembly of section \.init:
-[0-9a-f]+ <[^>]*> 03e00008     jr      ra
+[0-9a-f]+ <[^>]*> 03e0000[89]  jr      ra
 [0-9a-f]+ <[^>]*> 00000000     nop
        \.\.\.

diff --git a/gas/testsuite/gas/mips/branch-weak-1.d b/gas/testsuite/gas/mips/branch-weak-1.d
index 859a2ca69fb300a71a33885c2400bd9778ea9382..349b5d96c8d34ce5529d8ab2926c8a23513c1c92 100644 (file)
--- a/gas/testsuite/gas/mips/branch-weak-1.d
+++ b/gas/testsuite/gas/mips/branch-weak-1.d
@@ -10,6 +10,6 @@ Disassembly of section \.text:
 [      ]*[0-9a-f]+: R_MIPS_PC16        bar
 [0-9a-f]+ <[^>]*> 00000000     nop
        \.\.\.
-[0-9a-f]+ <[^>]*> 03e00008     jr      ra
+[0-9a-f]+ <[^>]*> 03e0000[89]  jr      ra
 [0-9a-f]+ <[^>]*> 00000000     nop
        \.\.\.

diff --git a/gas/testsuite/gas/mips/option-pic-1.d b/gas/testsuite/gas/mips/option-pic-1.d
index da32af6a6ceb713aeb5c1cc969859d49e4761a21..612414ae752c11eb5fd1fe39d4c70ddba35a5bb0 100644 (file)
--- a/gas/testsuite/gas/mips/option-pic-1.d
+++ b/gas/testsuite/gas/mips/option-pic-1.d
@@ -13,6 +13,6 @@ Disassembly of section \.text:
 [      ]*[0-9a-f]+: R_MIPS_LO16        bar
 [0-9a-f]+ <[^>]*> 8f820000     lw      v0,0\(gp\)
 [      ]*[0-9a-f]+: R_MIPS_GOT16       bar
-[0-9a-f]+ <[^>]*> 03e00008     jr      ra
+[0-9a-f]+ <[^>]*> 03e0000[89]  jr      ra
 [0-9a-f]+ <[^>]*> 00000000     nop
        \.\.\.

diff --git a/gas/testsuite/gas/mips/option-pic-relax-0.d b/gas/testsuite/gas/mips/option-pic-relax-0.d
index 141cc5dc8ee8ec1e9185c84208b4b577d3599344..5e14b289c2d67d883b7a071184966f7de73e14db 100644 (file)
--- a/gas/testsuite/gas/mips/option-pic-relax-0.d
+++ b/gas/testsuite/gas/mips/option-pic-relax-0.d
@@ -16,6 +16,6 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 0399e021     addu    gp,gp,t9
 [0-9a-f]+ <[^>]*> 8f820000     lw      v0,0\(gp\)
 [      ]*[0-9a-f]+: R_MIPS_GOT16       bar
-[0-9a-f]+ <[^>]*> 03e00008     jr      ra
+[0-9a-f]+ <[^>]*> 03e0000[89]  jr      ra
 [0-9a-f]+ <[^>]*> 00000000     nop
        \.\.\.

diff --git a/gas/testsuite/gas/mips/option-pic-relax-1.d b/gas/testsuite/gas/mips/option-pic-relax-1.d
index dd68fc8c96bf3135b976f9ab012c0359e45e8cd0..717a0990e2a525375f7c37ae79757a40aa84e6b5 100644 (file)
--- a/gas/testsuite/gas/mips/option-pic-relax-1.d
+++ b/gas/testsuite/gas/mips/option-pic-relax-1.d
@@ -13,6 +13,6 @@ Disassembly of section \.text:
 [      ]*[0-9a-f]+: R_MIPS_HI16        bar
 [0-9a-f]+ <[^>]*> 24420000     addiu   v0,v0,0
 [      ]*[0-9a-f]+: R_MIPS_LO16        bar
-[0-9a-f]+ <[^>]*> 03e00008     jr      ra
+[0-9a-f]+ <[^>]*> 03e0000[89]  jr      ra
 [0-9a-f]+ <[^>]*> 00000000     nop
        \.\.\.