aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYunQiang Su <yunqiang.su@cipunited.com>2023-11-23 12:53:56 +0000
committerNick Clifton <nickc@redhat.com>2023-11-23 12:53:56 +0000
commit469b3b3c0026121921dad41c4a551ba335e1c4b4 (patch)
treeedb9da59eddd2d4357e7788eb28fbd8d8ca19662
parentdd5516bf98fdb8acf242dbeabe8f6b20aafd842f (diff)
downloadbinutils-469b3b3c0026121921dad41c4a551ba335e1c4b4.zip
binutils-469b3b3c0026121921dad41c4a551ba335e1c4b4.tar.gz
binutils-469b3b3c0026121921dad41c4a551ba335e1c4b4.tar.bz2
MIPS/GAS: Fix test failures due to jr encoding changes on r6
-rw-r--r--gas/ChangeLog9
-rw-r--r--gas/testsuite/gas/mips/branch-section-1.d2
-rw-r--r--gas/testsuite/gas/mips/branch-weak-1.d2
-rw-r--r--gas/testsuite/gas/mips/option-pic-1.d2
-rw-r--r--gas/testsuite/gas/mips/option-pic-relax-0.d2
-rw-r--r--gas/testsuite/gas/mips/option-pic-relax-1.d2
6 files changed, 14 insertions, 5 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 9f966be..97f98e7 100644
--- 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 7782d0c..08c678d 100644
--- 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 859a2ca..349b5d9 100644
--- 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 da32af6..612414a 100644
--- 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 141cc5d..5e14b28 100644
--- 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 dd68fc8..717a099 100644
--- 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
\.\.\.