[MIPS] Map 'move' to 'or'.

The MIPS assembly idiom 'move' now maps to the 'or' machine instruction. This
change affects microMIPS, MIPS32, MIPS64.

2015-08-12  Simon Dardis  <simon.dardis@imgtec.com>

opcodes/

	* micromips-opc.c (micromips_opcodes): Re-order table so that move
	based on 'or' is first.
	* mips-opc.c (mips_builtin_opcodes): Ditto.

bfd/

	* elfxx-mips.c (STUB_MOVE): Change to use 'or' only.
	(mips_o32_exec_plt0_entry, mips_n32_exec_plt0_entry,
	mips_n64_exec_plt0_entry, micromips_insn32_o32_exec_plt0_entry):
	Update to use 'or' instead of 'addu/daddu'.
	(_bfd_mips_elf_finish_dynamic_symbol): Update usage of STUB_MOVE.
	(move_insns_32): Reorder table.

gas/

	* config/tc-mips.c (move_register): Change to use 'or' only.
	(s_cpload, s_cpsetup, s_cprestore, s_cpreturn): Update to
	use or for move.

gas/testsuite/

	* gas/mips/elf-rel23.d: Update test.
	* gas/mips/elf-rel23.d: Ditto.
	* gas/mips/elf-rel23a.d: Ditto.
	* gas/mips/elf-rel23b.d: Ditto.
	* gas/mips/elf_e_flags1.d: Ditto.
	* gas/mips/elf_e_flags2.d: Ditto.
	* gas/mips/elf_e_flags3.d: Ditto.
	* gas/mips/elf_e_flags4.d: Ditto.
	* gas/mips/loc-swap-dis.d: Ditto.
	* gas/mips/micromips-insn32.d: Ditto.
	* gas/mips/micromips-noinsn32.d: Ditto.
	* gas/mips/micromips-trap.d: Ditto.
	* gas/mips/micromips.d: Ditto.
	* gas/mips/mips-abi32-pic.d: Ditto.
	* gas/mips/mips-abi32.d: Ditto.
	* gas/mips/mips-gp32-fp32-pic.d: Ditto.
	* gas/mips/mips-gp32-fp32.d: Ditto.
	* gas/mips/mips-gp32-fp64-pic.d: Ditto.
	* gas/mips/mips-gp32-fp64.d: Ditto.
	* gas/mips/mips-gp64-fp32-pic.d: Ditto.
	* gas/mips/mips-gp64-fp32.d: Ditto.
	* gas/mips/mips-gp64-fp64-pic.d: Ditto.
	* gas/mips/mips-gp64-fp64.d: Ditto.
	* gas/mips/mipsr6@loc-swap-dis.d: Ditto.
	* gas/mips/tls-o32.d: Ditto.
	* gas/mips/uld2-eb.d: Ditto.
	* gas/mips/uld2-el.d: Ditto.
	* gas/mips/ulw2-eb-ilocks.d: Ditto.
	* gas/mips/ulw2-eb.d: Ditto.
	* gas/mips/ulw2-el-ilocks.d: Ditto.
	* gas/mips/ulw2-el.d: Ditto.
	* gas/mips/move.d: New test.
	* gas/mips/move.s: Ditto.
	* gas/mips/micromips32-move.d: Ditto.
	* gas/mips/micromips32-move.s: Ditto.
	* gas/mips/mips.exp: Run the new tests.

gold/

	* mips.cc (plt0_entry_o32, plt0_entry_n32, plt0_entry_n64,
	lazy_stub_normal_1, lazy_stub_normal_1_n64,
	lazy_stub_normal_2, lazy_stub_normal_2_n64, lazy_stub_big,
	lazy_stub_big_n64, lazy_stub_micromips32_normal_1_n64,
	lazy_stub_micromips32_normal_2_n64, lazy_stub_micromips32_big,
	lazy_stub_micromips32_big_n64): Update to use 'or' for move instead
	of 'addu/daddu'.

ld/testsuite/

	* ld-mips-elf/compressed-plt-1-n32-mips16.od: Update test.
	* ld-mips-elf/compressed-plt-1-n32-umips.od: Ditto.
	* ld-mips-elf/compressed-plt-1-o32-mips16-got.od: Ditto.
	* ld-mips-elf/compressed-plt-1-o32-mips16-only.od: Ditto.
	* ld-mips-elf/compressed-plt-1-o32-mips16-word.od: Ditto.
	* ld-mips-elf/compressed-plt-1-o32-mips16.od: Ditto.
	* ld-mips-elf/compressed-plt-1-o32-se.od: Ditto.
	* ld-mips-elf/compressed-plt-1-o32-umips-got.od: Ditto.
	* ld-mips-elf/compressed-plt-1-o32-umips-word.od: Ditto.
	* ld-mips-elf/compressed-plt-1-o32-umips.od: Ditto.
	* ld-mips-elf/jalx-2.dd: Ditto.
	* ld-mips-elf/mips16-pic-3.dd: Ditto.
	* ld-mips-elf/pic-and-nonpic-3a.dd: Ditto.
	* ld-mips-elf/pic-and-nonpic-3b.dd: Ditto.
	* ld-mips-elf/pic-and-nonpic-5b.dd: Ditto.
	* ld-mips-elf/pic-and-nonpic-6-n32.dd: Ditto.
	* ld-mips-elf/pic-and-nonpic-6-o32.dd: Ditto.
	* ld-mips-elf/stub-dynsym-1-10000.d: Ditto.
	* ld-mips-elf/stub-dynsym-1-2fe80.d: Ditto.
	* ld-mips-elf/stub-dynsym-1-7fff.d: Ditto.
	* ld-mips-elf/stub-dynsym-1-8000.d: Ditto.
	* ld-mips-elf/stub-dynsym-1-fff0.d: Ditto.
	* ld-mips-elf/tlsbin-o32.d: Ditto.
	* ld-mips-elf/tlsdyn-o32-1.d: Ditto.
	* ld-mips-elf/tlsdyn-o32-2.d: Ditto.
	* ld-mips-elf/tlsdyn-o32-3.d: Ditto.
	* ld-mips-elf/tlsdyn-o32.d: Ditto.
	* ld-mips-elf/tlslib-o32.d: Ditto.

30 files changed, 102 insertions, 71 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index a2d7bb7..cecbfa6 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,34 @@
+2015-08-12  Simon Dardis  <simon.dardis@imgtec.com>
+
+	* ld-mips-elf/compressed-plt-1-n32-mips16.od: Update test.
+	* ld-mips-elf/compressed-plt-1-n32-umips.od: Ditto.
+	* ld-mips-elf/compressed-plt-1-o32-mips16-got.od: Ditto.
+	* ld-mips-elf/compressed-plt-1-o32-mips16-only.od: Ditto.
+	* ld-mips-elf/compressed-plt-1-o32-mips16-word.od: Ditto.
+	* ld-mips-elf/compressed-plt-1-o32-mips16.od: Ditto.
+	* ld-mips-elf/compressed-plt-1-o32-se.od: Ditto.
+	* ld-mips-elf/compressed-plt-1-o32-umips-got.od: Ditto.
+	* ld-mips-elf/compressed-plt-1-o32-umips-word.od: Ditto.
+	* ld-mips-elf/compressed-plt-1-o32-umips.od: Ditto.
+	* ld-mips-elf/jalx-2.dd: Ditto.
+	* ld-mips-elf/mips16-pic-3.dd: Ditto.
+	* ld-mips-elf/pic-and-nonpic-3a.dd: Ditto.
+	* ld-mips-elf/pic-and-nonpic-3b.dd: Ditto.
+	* ld-mips-elf/pic-and-nonpic-5b.dd: Ditto.
+	* ld-mips-elf/pic-and-nonpic-6-n32.dd: Ditto.
+	* ld-mips-elf/pic-and-nonpic-6-o32.dd: Ditto.
+	* ld-mips-elf/stub-dynsym-1-10000.d: Ditto.
+	* ld-mips-elf/stub-dynsym-1-2fe80.d: Ditto.
+	* ld-mips-elf/stub-dynsym-1-7fff.d: Ditto.
+	* ld-mips-elf/stub-dynsym-1-8000.d: Ditto.
+	* ld-mips-elf/stub-dynsym-1-fff0.d: Ditto.
+	* ld-mips-elf/tlsbin-o32.d: Ditto.
+	* ld-mips-elf/tlsdyn-o32-1.d: Ditto.
+	* ld-mips-elf/tlsdyn-o32-2.d: Ditto.
+	* ld-mips-elf/tlsdyn-o32-3.d: Ditto.
+	* ld-mips-elf/tlsdyn-o32.d: Ditto.
+	* ld-mips-elf/tlslib-o32.d: Ditto.
+
 2015-08-12  Jiong Wang  <jiong.wang@arm.com>
 
 	* ld-aarch64/aarch64-elf.exp (aarch64_choose_ilp32_emul): Support all
diff --git a/ld/testsuite/ld-mips-elf/compressed-plt-1-n32-mips16.od b/ld/testsuite/ld-mips-elf/compressed-plt-1-n32-mips16.od
index c17dacb..95024db 100644
--- a/ld/testsuite/ld-mips-elf/compressed-plt-1-n32-mips16.od
+++ b/ld/testsuite/ld-mips-elf/compressed-plt-1-n32-mips16.od
@@ -10,7 +10,7 @@ Disassembly of section \.plt:
 .*:	8dd90000 	lw	\$25,0\(\$14\)
 .*:	25ce0000 	addiu	\$14,\$14,0
 .*:	030ec023 	subu	\$24,\$24,\$14
-.*:	03e07821 	move	\$15,\$31
+.*:	03e07825 	move	\$15,\$31
 .*:	0018c082 	srl	\$24,\$24,0x2
 .*:	0320f809 	jalr	\$25
 .*:	2718fffe 	addiu	\$24,\$24,-2
@@ -188,17 +188,17 @@ Disassembly of section \.MIPS\.stubs:
 10101000 <_MIPS_STUBS_>:
 # Lazy-binding stub for f_iu.
 .*:	8f998010 	lw	\$25,-32752\(\$28\)
-.*:	03e07821 	move	\$15,\$31
+.*:	03e07825 	move	\$15,\$31
 .*:	0320f809 	jalr	\$25
 .*:	24180021 	li	\$24,33
 # Lazy-binding stub for f_ic.
 .*:	8f998010 	lw	\$25,-32752\(\$28\)
-.*:	03e07821 	move	\$15,\$31
+.*:	03e07825 	move	\$15,\$31
 .*:	0320f809 	jalr	\$25
 .*:	24180020 	li	\$24,32
 # Lazy-binding stub for f_iu_ic.
 .*:	8f998010 	lw	\$25,-32752\(\$28\)
-.*:	03e07821 	move	\$15,\$31
+.*:	03e07825 	move	\$15,\$31
 .*:	0320f809 	jalr	\$25
 .*:	2418001f 	li	\$24,31
 	\.\.\.
diff --git a/ld/testsuite/ld-mips-elf/compressed-plt-1-n32-umips.od b/ld/testsuite/ld-mips-elf/compressed-plt-1-n32-umips.od
index fc0d4ea..cc7d355 100644
--- a/ld/testsuite/ld-mips-elf/compressed-plt-1-n32-umips.od
+++ b/ld/testsuite/ld-mips-elf/compressed-plt-1-n32-umips.od
@@ -10,7 +10,7 @@ Disassembly of section \.plt:
 .*:	8dd90000 	lw	\$25,0\(\$14\)
 .*:	25ce0000 	addiu	\$14,\$14,0
 .*:	030ec023 	subu	\$24,\$24,\$14
-.*:	03e07821 	move	\$15,\$31
+.*:	03e07825 	move	\$15,\$31
 .*:	0018c082 	srl	\$24,\$24,0x2
 .*:	0320f809 	jalr	\$25
 .*:	2718fffe 	addiu	\$24,\$24,-2
diff --git a/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-mips16-got.od b/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-mips16-got.od
index c48ef7f..1e486ac 100644
--- a/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-mips16-got.od
+++ b/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-mips16-got.od
@@ -12,7 +12,7 @@ Disassembly of section \.plt:
 .*:	8f990000 	lw	\$25,0\(\$28\)
 .*:	279c0000 	addiu	\$28,\$28,0
 .*:	031cc023 	subu	\$24,\$24,\$28
-.*:	03e07821 	move	\$15,\$31
+.*:	03e07825 	move	\$15,\$31
 .*:	0018c082 	srl	\$24,\$24,0x2
 .*:	0320f809 	jalr	\$25
 .*:	2718fffe 	addiu	\$24,\$24,-2
diff --git a/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-mips16-only.od b/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-mips16-only.od
index e76ca4f..0ce3634 100644
--- a/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-mips16-only.od
+++ b/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-mips16-only.od
@@ -12,7 +12,7 @@ Disassembly of section \.plt:
 .*:	8f990000 	lw	\$25,0\(\$28\)
 .*:	279c0000 	addiu	\$28,\$28,0
 .*:	031cc023 	subu	\$24,\$24,\$28
-.*:	03e07821 	move	\$15,\$31
+.*:	03e07825 	move	\$15,\$31
 .*:	0018c082 	srl	\$24,\$24,0x2
 .*:	0320f809 	jalr	\$25
 .*:	2718fffe 	addiu	\$24,\$24,-2
@@ -70,7 +70,7 @@ Disassembly of section \.MIPS\.stubs:
 10101000 <_MIPS_STUBS_>:
 # Lazy-binding stub for f_ic.
 .*:	8f998010 	lw	\$25,-32752\(\$28\)
-.*:	03e07821 	move	\$15,\$31
+.*:	03e07825 	move	\$15,\$31
 .*:	0320f809 	jalr	\$25
 .*:	24180009 	li	\$24,9
 	\.\.\.
diff --git a/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-mips16-word.od b/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-mips16-word.od
index 7fc547b..75a2f57 100644
--- a/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-mips16-word.od
+++ b/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-mips16-word.od
@@ -12,7 +12,7 @@ Disassembly of section \.plt:
 .*:	8f990000 	lw	\$25,0\(\$28\)
 .*:	279c0000 	addiu	\$28,\$28,0
 .*:	031cc023 	subu	\$24,\$24,\$28
-.*:	03e07821 	move	\$15,\$31
+.*:	03e07825 	move	\$15,\$31
 .*:	0018c082 	srl	\$24,\$24,0x2
 .*:	0320f809 	jalr	\$25
 .*:	2718fffe 	addiu	\$24,\$24,-2
diff --git a/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-mips16.od b/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-mips16.od
index 712e651..0660bc8 100644
--- a/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-mips16.od
+++ b/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-mips16.od
@@ -12,7 +12,7 @@ Disassembly of section \.plt:
 .*:	8f990000 	lw	\$25,0\(\$28\)
 .*:	279c0000 	addiu	\$28,\$28,0
 .*:	031cc023 	subu	\$24,\$24,\$28
-.*:	03e07821 	move	\$15,\$31
+.*:	03e07825 	move	\$15,\$31
 .*:	0018c082 	srl	\$24,\$24,0x2
 .*:	0320f809 	jalr	\$25
 .*:	2718fffe 	addiu	\$24,\$24,-2
@@ -286,17 +286,17 @@ Disassembly of section \.MIPS\.stubs:
 10101000 <_MIPS_STUBS_>:
 # Lazy-binding stub for f_iu.
 .*:	8f998010 	lw	\$25,-32752\(\$28\)
-.*:	03e07821 	move	\$15,\$31
+.*:	03e07825 	move	\$15,\$31
 .*:	0320f809 	jalr	\$25
 .*:	24180021 	li	\$24,33
 # Lazy-binding stub for f_ic.
 .*:	8f998010 	lw	\$25,-32752\(\$28\)
-.*:	03e07821 	move	\$15,\$31
+.*:	03e07825 	move	\$15,\$31
 .*:	0320f809 	jalr	\$25
 .*:	24180020 	li	\$24,32
 # Lazy-binding stub for f_iu_ic.
 .*:	8f998010 	lw	\$25,-32752\(\$28\)
-.*:	03e07821 	move	\$15,\$31
+.*:	03e07825 	move	\$15,\$31
 .*:	0320f809 	jalr	\$25
 .*:	2418001f 	li	\$24,31
 	\.\.\.
diff --git a/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-se.od b/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-se.od
index 6e0d15a..1b17d46 100644
--- a/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-se.od
+++ b/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-se.od
@@ -9,7 +9,7 @@ Disassembly of section \.plt:
 .*:	8f990000 	lw	\$25,0\(\$28\)
 .*:	279c0000 	addiu	\$28,\$28,0
 .*:	031cc023 	subu	\$24,\$24,\$28
-.*:	03e07821 	move	\$15,\$31
+.*:	03e07825 	move	\$15,\$31
 .*:	0018c082 	srl	\$24,\$24,0x2
 .*:	0320f809 	jalr	\$25
 .*:	2718fffe 	addiu	\$24,\$24,-2
@@ -55,7 +55,7 @@ Disassembly of section \.MIPS\.stubs:
 10101000 <_MIPS_STUBS_>:
 # Lazy-binding stub for f_iu.
 .*:	8f998010 	lw	\$25,-32752\(\$28\)
-.*:	03e07821 	move	\$15,\$31
+.*:	03e07825 	move	\$15,\$31
 .*:	0320f809 	jalr	\$25
 .*:	24180009 	li	\$24,9
 	\.\.\.
diff --git a/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-umips-got.od b/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-umips-got.od
index 2d7b513..45a0df4 100644
--- a/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-umips-got.od
+++ b/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-umips-got.od
@@ -11,7 +11,7 @@ Disassembly of section \.plt:
 .*:	8f990000 	lw	\$25,0\(\$28\)
 .*:	279c0000 	addiu	\$28,\$28,0
 .*:	031cc023 	subu	\$24,\$24,\$28
-.*:	03e07821 	move	\$15,\$31
+.*:	03e07825 	move	\$15,\$31
 .*:	0018c082 	srl	\$24,\$24,0x2
 .*:	0320f809 	jalr	\$25
 .*:	2718fffe 	addiu	\$24,\$24,-2
diff --git a/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-umips-word.od b/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-umips-word.od
index 4d0572b..ae884f0 100644
--- a/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-umips-word.od
+++ b/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-umips-word.od
@@ -11,7 +11,7 @@ Disassembly of section \.plt:
 .*:	8f990000 	lw	\$25,0\(\$28\)
 .*:	279c0000 	addiu	\$28,\$28,0
 .*:	031cc023 	subu	\$24,\$24,\$28
-.*:	03e07821 	move	\$15,\$31
+.*:	03e07825 	move	\$15,\$31
 .*:	0018c082 	srl	\$24,\$24,0x2
 .*:	0320f809 	jalr	\$25
 .*:	2718fffe 	addiu	\$24,\$24,-2
diff --git a/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-umips.od b/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-umips.od
index 416509f..a18ecc5 100644
--- a/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-umips.od
+++ b/ld/testsuite/ld-mips-elf/compressed-plt-1-o32-umips.od
@@ -11,7 +11,7 @@ Disassembly of section \.plt:
 .*:	8f990000 	lw	\$25,0\(\$28\)
 .*:	279c0000 	addiu	\$28,\$28,0
 .*:	031cc023 	subu	\$24,\$24,\$28
-.*:	03e07821 	move	\$15,\$31
+.*:	03e07825 	move	\$15,\$31
 .*:	0018c082 	srl	\$24,\$24,0x2
 .*:	0320f809 	jalr	\$25
 .*:	2718fffe 	addiu	\$24,\$24,-2
diff --git a/ld/testsuite/ld-mips-elf/jalx-2.dd b/ld/testsuite/ld-mips-elf/jalx-2.dd
index 69985f6..3a7c1e1 100644
--- a/ld/testsuite/ld-mips-elf/jalx-2.dd
+++ b/ld/testsuite/ld-mips-elf/jalx-2.dd
@@ -5,8 +5,8 @@ Disassembly of section \.text:
 04400000 <external_function>:
  4400000:	27bdfff8 	addiu	sp,sp,-8
  4400004:	afbe0004 	sw	s8,4\(sp\)
- 4400008:	03a0f021 	move	s8,sp
- 440000c:	03c0e821 	move	sp,s8
+ 4400008:	03a0f025 	move	s8,sp
+ 440000c:	03c0e825 	move	sp,s8
  4400010:	8fbe0004 	lw	s8,4\(sp\)
  4400014:	27bd0008 	addiu	sp,sp,8
  4400018:	03e00008 	jr	ra
diff --git a/ld/testsuite/ld-mips-elf/mips16-pic-3.dd b/ld/testsuite/ld-mips-elf/mips16-pic-3.dd
index 93ba085..2c276ab 100644
--- a/ld/testsuite/ld-mips-elf/mips16-pic-3.dd
+++ b/ld/testsuite/ld-mips-elf/mips16-pic-3.dd
@@ -140,7 +140,7 @@ Disassembly of section \.text:
 .*:	44846000 	mtc1	a0,\$f12
 
 000404f0 <__call_fp_used2>:
-.*:	03e09021 	move	s2,ra
+.*:	03e09025 	move	s2,ra
 .*:	3c190004 	lui	t9,.*
 .*:	27390418 	addiu	t9,t9,.*
 .*:	0320f809 	jalr	t9
@@ -150,7 +150,7 @@ Disassembly of section \.text:
 .*:	00000000 	nop
 
 00040510 <__call_fp_used4>:
-.*:	03e09021 	move	s2,ra
+.*:	03e09025 	move	s2,ra
 .*:	3c190004 	lui	t9,.*
 .*:	27390428 	addiu	t9,t9,.*
 .*:	0320f809 	jalr	t9
@@ -160,7 +160,7 @@ Disassembly of section \.text:
 .*:	00000000 	nop
 
 00040530 <__call_fp_used8>:
-.*:	03e09021 	move	s2,ra
+.*:	03e09025 	move	s2,ra
 .*:	3c190004 	lui	t9,.*
 .*:	27390448 	addiu	t9,t9,.*
 .*:	0320f809 	jalr	t9
@@ -170,7 +170,7 @@ Disassembly of section \.text:
 .*:	00000000 	nop
 
 00040550 <__call_fp_extern2>:
-.*:	03e09021 	move	s2,ra
+.*:	03e09025 	move	s2,ra
 .*:	3c190004 	lui	t9,.*
 .*:	27390630 	addiu	t9,t9,.*
 .*:	0320f809 	jalr	t9
@@ -198,7 +198,7 @@ Disassembly of section \.text:
 .*:	44846000 	mtc1	a0,\$f12
 
 000405a0 <__call_fp_used6>:
-.*:	03e09021 	move	s2,ra
+.*:	03e09025 	move	s2,ra
 .*:	3c190004 	lui	t9,.*
 .*:	27390438 	addiu	t9,t9,.*
 .*:	0320f809 	jalr	t9
@@ -208,7 +208,7 @@ Disassembly of section \.text:
 .*:	00000000 	nop
 
 000405c0 <__call_fp_used10>:
-.*:	03e09021 	move	s2,ra
+.*:	03e09025 	move	s2,ra
 .*:	3c190004 	lui	t9,.*
 .*:	27390458 	addiu	t9,t9,.*
 .*:	0320f809 	jalr	t9
@@ -218,7 +218,7 @@ Disassembly of section \.text:
 .*:	00000000 	nop
 
 000405e0 <__call_fp_extern4>:
-.*:	03e09021 	move	s2,ra
+.*:	03e09025 	move	s2,ra
 .*:	3c190004 	lui	t9,.*
 .*:	27390640 	addiu	t9,t9,.*
 .*:	0320f809 	jalr	t9
@@ -234,7 +234,7 @@ Disassembly of section \.plt:
 .*:	8f990400 	lw	t9,1024\(gp\)
 .*:	279c0400 	addiu	gp,gp,1024
 .*:	031cc023 	subu	t8,t8,gp
-.*:	03e07821 	move	t7,ra
+.*:	03e07825 	move	t7,ra
 .*:	0018c082 	srl	t8,t8,0x2
 .*:	0320f809 	jalr	t9
 .*:	2718fffe 	addiu	t8,t8,-2
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.dd
index dfb4b27..3dcfe12 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.dd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.dd
@@ -33,7 +33,7 @@ Disassembly of section \.MIPS\.stubs:
 
 00000c00 <_MIPS_STUBS_>:
  c00:	8f998010 	lw	t9,-32752\(gp\)
- c04:	03e07821 	move	t7,ra
+ c04:	03e07825 	move	t7,ra
  c08:	0320f809 	jalr	t9
  c0c:	24180005 	li	t8,5
 	\.\.\.
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.dd
index 151b4d2..9f7e078 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.dd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.dd
@@ -14,7 +14,7 @@ Disassembly of section \.plt:
 .*:	8f991000 	lw	t9,4096\(gp\)
 .*:	279c1000 	addiu	gp,gp,4096
 .*:	031cc023 	subu	t8,t8,gp
-.*:	03e07821 	move	t7,ra
+.*:	03e07825 	move	t7,ra
 .*:	0018c082 	srl	t8,t8,0x2
 .*:	0320f809 	jalr	t9
 .*:	2718fffe 	addiu	t8,t8,-2
@@ -47,7 +47,7 @@ Disassembly of section \.MIPS\.stubs:
 
 00044030 <_MIPS_STUBS_>:
 .*:	8f998010 	lw	t9,-32752\(gp\)
-.*:	03e07821 	move	t7,ra
+.*:	03e07825 	move	t7,ra
 .*:	0320f809 	jalr	t9
 .*:	24180005 	li	t8,5
 	\.\.\.
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.dd
index 9adfb31..23b2040 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.dd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.dd
@@ -8,7 +8,7 @@ Disassembly of section \.plt:
 .*:	8f991000 	lw	t9,4096\(gp\)
 .*:	279c1000 	addiu	gp,gp,4096
 .*:	031cc023 	subu	t8,t8,gp
-.*:	03e07821 	move	t7,ra
+.*:	03e07825 	move	t7,ra
 .*:	0018c082 	srl	t8,t8,0x2
 .*:	0320f809 	jalr	t9
 .*:	2718fffe 	addiu	t8,t8,-2
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.dd
index 276d874..4242eac 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.dd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.dd
@@ -19,7 +19,7 @@ Disassembly of section \.plt:
 .*:	8dd91000 	lw	t9,4096\(t2\)
 .*:	25ce1000 	addiu	t2,t2,4096
 .*:	030ec023 	subu	t8,t8,t2
-.*:	03e07821 	move	t3,ra
+.*:	03e07825 	move	t3,ra
 .*:	0018c082 	srl	t8,t8,0x2
 .*:	0320f809 	jalr	t9
 .*:	2718fffe 	addiu	t8,t8,-2
@@ -96,7 +96,7 @@ Disassembly of section \.MIPS\.stubs:
 
 000440a0 <_MIPS_STUBS_>:
    440a0:	8f998010 	lw	t9,-32752\(gp\)
-   440a4:	03e07821 	move	t3,ra
+   440a4:	03e07825 	move	t3,ra
    440a8:	0320f809 	jalr	t9
    440ac:	24180009 	li	t8,9
 	\.\.\.
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.dd
index fbb3615..c98be4b 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.dd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.dd
@@ -19,7 +19,7 @@ Disassembly of section \.plt:
 .*:	ddd91000 	ld	t9,4096\(t2\)
 .*:	25ce1000 	addiu	t2,t2,4096
 .*:	030ec023 	subu	t8,t8,t2
-.*:	03e0782d 	move	t3,ra
+.*:	03e07825 	move	t3,ra
 .*:	0018c0c2 	srl	t8,t8,0x3
 .*:	0320f809 	jalr	t9
 .*:	2718fffe 	addiu	t8,t8,-2
@@ -96,7 +96,7 @@ Disassembly of section \.MIPS\.stubs:
 
 0+440a0 <_MIPS_STUBS_>:
    440a0:	df998010 	ld	t9,-32752\(gp\)
-   440a4:	03e0782d 	move	t3,ra
+   440a4:	03e07825 	move	t3,ra
    440a8:	0320f809 	jalr	t9
    440ac:	64180009 	daddiu	t8,zero,9
 	\.\.\.
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.dd
index e10a0af..e96e255 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.dd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.dd
@@ -19,7 +19,7 @@ Disassembly of section \.plt:
 .*:	8f991000 	lw	t9,4096\(gp\)
 .*:	279c1000 	addiu	gp,gp,4096
 .*:	031cc023 	subu	t8,t8,gp
-.*:	03e07821 	move	t7,ra
+.*:	03e07825 	move	t7,ra
 .*:	0018c082 	srl	t8,t8,0x2
 .*:	0320f809 	jalr	t9
 .*:	2718fffe 	addiu	t8,t8,-2
@@ -96,7 +96,7 @@ Disassembly of section \.MIPS\.stubs:
 
 000440a0 <_MIPS_STUBS_>:
    440a0:	8f998010 	lw	t9,-32752\(gp\)
-   440a4:	03e07821 	move	t7,ra
+   440a4:	03e07825 	move	t7,ra
    440a8:	0320f809 	jalr	t9
    440ac:	24180009 	li	t8,9
 	\.\.\.
diff --git a/ld/testsuite/ld-mips-elf/stub-dynsym-1-10000.d b/ld/testsuite/ld-mips-elf/stub-dynsym-1-10000.d
index e2d375b..df32fb1 100644
--- a/ld/testsuite/ld-mips-elf/stub-dynsym-1-10000.d
+++ b/ld/testsuite/ld-mips-elf/stub-dynsym-1-10000.d
@@ -5,7 +5,7 @@ Disassembly of section \.MIPS\.stubs:
 
 .* <_MIPS_STUBS_>:
 .*:	8f998010 	lw	t9,-32752\(gp\)
-.*:	03e07821 	move	t7,ra
+.*:	03e07825 	move	t7,ra
 .*:	3c180001 	lui	t8,0x1
 .*:	0320f809 	jalr	t9
 .*:	37180000 	ori	t8,t8,0x0
diff --git a/ld/testsuite/ld-mips-elf/stub-dynsym-1-2fe80.d b/ld/testsuite/ld-mips-elf/stub-dynsym-1-2fe80.d
index d428f3d..8ff9686 100644
--- a/ld/testsuite/ld-mips-elf/stub-dynsym-1-2fe80.d
+++ b/ld/testsuite/ld-mips-elf/stub-dynsym-1-2fe80.d
@@ -5,7 +5,7 @@ Disassembly of section \.MIPS\.stubs:
 
 .* <_MIPS_STUBS_>:
 .*:	8f998010 	lw	t9,-32752\(gp\)
-.*:	03e07821 	move	t7,ra
+.*:	03e07825 	move	t7,ra
 .*:	3c180002 	lui	t8,0x2
 .*:	0320f809 	jalr	t9
 .*:	3718fe80 	ori	t8,t8,0xfe80
diff --git a/ld/testsuite/ld-mips-elf/stub-dynsym-1-7fff.d b/ld/testsuite/ld-mips-elf/stub-dynsym-1-7fff.d
index e2b961f6..3ebb23d 100644
--- a/ld/testsuite/ld-mips-elf/stub-dynsym-1-7fff.d
+++ b/ld/testsuite/ld-mips-elf/stub-dynsym-1-7fff.d
@@ -5,7 +5,7 @@ Disassembly of section \.MIPS\.stubs:
 
 .* <_MIPS_STUBS_>:
 .*:	8f998010 	lw	t9,-32752\(gp\)
-.*:	03e07821 	move	t7,ra
+.*:	03e07825 	move	t7,ra
 .*:	0320f809 	jalr	t9
 .*:	24187fff 	li	t8,32767
 .*:	00000000 	nop
diff --git a/ld/testsuite/ld-mips-elf/stub-dynsym-1-8000.d b/ld/testsuite/ld-mips-elf/stub-dynsym-1-8000.d
index b1b1980..294d60a 100644
--- a/ld/testsuite/ld-mips-elf/stub-dynsym-1-8000.d
+++ b/ld/testsuite/ld-mips-elf/stub-dynsym-1-8000.d
@@ -5,7 +5,7 @@ Disassembly of section \.MIPS\.stubs:
 
 .* <_MIPS_STUBS_>:
 .*:	8f998010 	lw	t9,-32752\(gp\)
-.*:	03e07821 	move	t7,ra
+.*:	03e07825 	move	t7,ra
 .*:	0320f809 	jalr	t9
 .*:	34188000 	li	t8,0x8000
 .*:	00000000 	nop
diff --git a/ld/testsuite/ld-mips-elf/stub-dynsym-1-fff0.d b/ld/testsuite/ld-mips-elf/stub-dynsym-1-fff0.d
index 99ca9b2..7646c4d 100644
--- a/ld/testsuite/ld-mips-elf/stub-dynsym-1-fff0.d
+++ b/ld/testsuite/ld-mips-elf/stub-dynsym-1-fff0.d
@@ -5,7 +5,7 @@ Disassembly of section \.MIPS\.stubs:
 
 .* <_MIPS_STUBS_>:
 .*:	8f998010 	lw	t9,-32752\(gp\)
-.*:	03e07821 	move	t7,ra
+.*:	03e07825 	move	t7,ra
 .*:	0320f809 	jalr	t9
 .*:	3418fff0 	li	t8,0xfff0
 .*:	00000000 	nop
diff --git a/ld/testsuite/ld-mips-elf/tlsbin-o32.d b/ld/testsuite/ld-mips-elf/tlsbin-o32.d
index dbf3ef3..769a890 100644
--- a/ld/testsuite/ld-mips-elf/tlsbin-o32.d
+++ b/ld/testsuite/ld-mips-elf/tlsbin-o32.d
@@ -8,7 +8,7 @@ Disassembly of section .text:
   4000d8:	0399e021 	addu	gp,gp,t9
   4000dc:	27bdfff0 	addiu	sp,sp,-16
   4000e0:	afbe0008 	sw	s8,8\(sp\)
-  4000e4:	03a0f021 	move	s8,sp
+  4000e4:	03a0f025 	move	s8,sp
   4000e8:	afbc0000 	sw	gp,0\(sp\)
   4000ec:	8f998018 	lw	t9,-32744\(gp\)
   4000f0:	27848020 	addiu	a0,gp,-32736
@@ -21,7 +21,7 @@ Disassembly of section .text:
   40010c:	0320f809 	jalr	t9
   400110:	00000000 	nop
   400114:	8fdc0000 	lw	gp,0\(s8\)
-  400118:	00401021 	move	v0,v0
+  400118:	00401025 	move	v0,v0
   40011c:	3c030000 	lui	v1,0x0
   400120:	24638000 	addiu	v1,v1,-32768
   400124:	00621821 	addu	v1,v1,v0
@@ -33,7 +33,7 @@ Disassembly of section .text:
   40013c:	3c030000 	lui	v1,0x0
   400140:	24639004 	addiu	v1,v1,-28668
   400144:	00621821 	addu	v1,v1,v0
-  400148:	03c0e821 	move	sp,s8
+  400148:	03c0e825 	move	sp,s8
   40014c:	8fbe0008 	lw	s8,8\(sp\)
   400150:	03e00008 	jr	ra
   400154:	27bd0010 	addiu	sp,sp,16
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.d b/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.d
index 6b8f96c..011df6c 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.d
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.d
@@ -9,7 +9,7 @@ Disassembly of section .text:
   .*:	0399e021 	addu	gp,gp,t9
   .*:	27bdfff0 	addiu	sp,sp,-16
   .*:	afbe0008 	sw	s8,8\(sp\)
-  .*:	03a0f021 	move	s8,sp
+  .*:	03a0f025 	move	s8,sp
   .*:	afbc0000 	sw	gp,0\(sp\)
   .*:	8f998018 	lw	t9,-32744\(gp\)
   .*:	27848028 	addiu	a0,gp,-32728
@@ -28,7 +28,7 @@ Disassembly of section .text:
   .*:	0320f809 	jalr	t9
   .*:	00000000 	nop
   .*:	8fdc0000 	lw	gp,0\(s8\)
-  .*:	00401021 	move	v0,v0
+  .*:	00401025 	move	v0,v0
   .*:	3c030000 	lui	v1,0x0
   .*:	24638000 	addiu	v1,v1,-32768
   .*:	00621821 	addu	v1,v1,v0
@@ -43,7 +43,7 @@ Disassembly of section .text:
   .*:	3c030000 	lui	v1,0x0
   .*:	24639004 	addiu	v1,v1,-28668
   .*:	00621821 	addu	v1,v1,v0
-  .*:	03c0e821 	move	sp,s8
+  .*:	03c0e825 	move	sp,s8
   .*:	8fbe0008 	lw	s8,8\(sp\)
   .*:	03e00008 	jr	ra
   .*:	27bd0010 	addiu	sp,sp,16
@@ -59,7 +59,7 @@ Disassembly of section .text:
   .*:	0399e021 	addu	gp,gp,t9
   .*:	27bdfff0 	addiu	sp,sp,-16
   .*:	afbe0008 	sw	s8,8\(sp\)
-  .*:	03a0f021 	move	s8,sp
+  .*:	03a0f025 	move	s8,sp
   .*:	afbc0000 	sw	gp,0\(sp\)
   .*:	8f998018 	lw	t9,-32744\(gp\)
   .*:	27848028 	addiu	a0,gp,-32728
@@ -78,7 +78,7 @@ Disassembly of section .text:
   .*:	0320f809 	jalr	t9
   .*:	00000000 	nop
   .*:	8fdc0000 	lw	gp,0\(s8\)
-  .*:	00401021 	move	v0,v0
+  .*:	00401025 	move	v0,v0
   .*:	3c030000 	lui	v1,0x0
   .*:	24638000 	addiu	v1,v1,-32768
   .*:	00621821 	addu	v1,v1,v0
@@ -93,7 +93,7 @@ Disassembly of section .text:
   .*:	3c030000 	lui	v1,0x0
   .*:	24639004 	addiu	v1,v1,-28668
   .*:	00621821 	addu	v1,v1,v0
-  .*:	03c0e821 	move	sp,s8
+  .*:	03c0e825 	move	sp,s8
   .*:	8fbe0008 	lw	s8,8\(sp\)
   .*:	03e00008 	jr	ra
   .*:	27bd0010 	addiu	sp,sp,16
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.d b/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.d
index 6b8f96c..011df6c 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.d
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.d
@@ -9,7 +9,7 @@ Disassembly of section .text:
   .*:	0399e021 	addu	gp,gp,t9
   .*:	27bdfff0 	addiu	sp,sp,-16
   .*:	afbe0008 	sw	s8,8\(sp\)
-  .*:	03a0f021 	move	s8,sp
+  .*:	03a0f025 	move	s8,sp
   .*:	afbc0000 	sw	gp,0\(sp\)
   .*:	8f998018 	lw	t9,-32744\(gp\)
   .*:	27848028 	addiu	a0,gp,-32728
@@ -28,7 +28,7 @@ Disassembly of section .text:
   .*:	0320f809 	jalr	t9
   .*:	00000000 	nop
   .*:	8fdc0000 	lw	gp,0\(s8\)
-  .*:	00401021 	move	v0,v0
+  .*:	00401025 	move	v0,v0
   .*:	3c030000 	lui	v1,0x0
   .*:	24638000 	addiu	v1,v1,-32768
   .*:	00621821 	addu	v1,v1,v0
@@ -43,7 +43,7 @@ Disassembly of section .text:
   .*:	3c030000 	lui	v1,0x0
   .*:	24639004 	addiu	v1,v1,-28668
   .*:	00621821 	addu	v1,v1,v0
-  .*:	03c0e821 	move	sp,s8
+  .*:	03c0e825 	move	sp,s8
   .*:	8fbe0008 	lw	s8,8\(sp\)
   .*:	03e00008 	jr	ra
   .*:	27bd0010 	addiu	sp,sp,16
@@ -59,7 +59,7 @@ Disassembly of section .text:
   .*:	0399e021 	addu	gp,gp,t9
   .*:	27bdfff0 	addiu	sp,sp,-16
   .*:	afbe0008 	sw	s8,8\(sp\)
-  .*:	03a0f021 	move	s8,sp
+  .*:	03a0f025 	move	s8,sp
   .*:	afbc0000 	sw	gp,0\(sp\)
   .*:	8f998018 	lw	t9,-32744\(gp\)
   .*:	27848028 	addiu	a0,gp,-32728
@@ -78,7 +78,7 @@ Disassembly of section .text:
   .*:	0320f809 	jalr	t9
   .*:	00000000 	nop
   .*:	8fdc0000 	lw	gp,0\(s8\)
-  .*:	00401021 	move	v0,v0
+  .*:	00401025 	move	v0,v0
   .*:	3c030000 	lui	v1,0x0
   .*:	24638000 	addiu	v1,v1,-32768
   .*:	00621821 	addu	v1,v1,v0
@@ -93,7 +93,7 @@ Disassembly of section .text:
   .*:	3c030000 	lui	v1,0x0
   .*:	24639004 	addiu	v1,v1,-28668
   .*:	00621821 	addu	v1,v1,v0
-  .*:	03c0e821 	move	sp,s8
+  .*:	03c0e825 	move	sp,s8
   .*:	8fbe0008 	lw	s8,8\(sp\)
   .*:	03e00008 	jr	ra
   .*:	27bd0010 	addiu	sp,sp,16
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.d b/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.d
index 758a4f2..3828aca 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.d
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.d
@@ -9,7 +9,7 @@ Disassembly of section .text:
   .*:	0399e021 	addu	gp,gp,t9
   .*:	27bdfff0 	addiu	sp,sp,-16
   .*:	afbe0008 	sw	s8,8\(sp\)
-  .*:	03a0f021 	move	s8,sp
+  .*:	03a0f025 	move	s8,sp
   .*:	afbc0000 	sw	gp,0\(sp\)
   .*:	8f998018 	lw	t9,-32744\(gp\)
   .*:	27848028 	addiu	a0,gp,-32728
@@ -28,7 +28,7 @@ Disassembly of section .text:
   .*:	0320f809 	jalr	t9
   .*:	00000000 	nop
   .*:	8fdc0000 	lw	gp,0\(s8\)
-  .*:	00401021 	move	v0,v0
+  .*:	00401025 	move	v0,v0
   .*:	3c030000 	lui	v1,0x0
   .*:	24638000 	addiu	v1,v1,-32768
   .*:	00621821 	addu	v1,v1,v0
@@ -43,7 +43,7 @@ Disassembly of section .text:
   .*:	3c030000 	lui	v1,0x0
   .*:	24639004 	addiu	v1,v1,-28668
   .*:	00621821 	addu	v1,v1,v0
-  .*:	03c0e821 	move	sp,s8
+  .*:	03c0e825 	move	sp,s8
   .*:	8fbe0008 	lw	s8,8\(sp\)
   .*:	03e00008 	jr	ra
   .*:	27bd0010 	addiu	sp,sp,16
@@ -55,7 +55,7 @@ Disassembly of section .text:
   .*:	0399e021 	addu	gp,gp,t9
   .*:	27bdfff0 	addiu	sp,sp,-16
   .*:	afbe0008 	sw	s8,8\(sp\)
-  .*:	03a0f021 	move	s8,sp
+  .*:	03a0f025 	move	s8,sp
   .*:	afbc0000 	sw	gp,0\(sp\)
   .*:	8f998018 	lw	t9,-32744\(gp\)
   .*:	27848028 	addiu	a0,gp,-32728
@@ -74,7 +74,7 @@ Disassembly of section .text:
   .*:	0320f809 	jalr	t9
   .*:	00000000 	nop
   .*:	8fdc0000 	lw	gp,0\(s8\)
-  .*:	00401021 	move	v0,v0
+  .*:	00401025 	move	v0,v0
   .*:	3c030000 	lui	v1,0x0
   .*:	24638000 	addiu	v1,v1,-32768
   .*:	00621821 	addu	v1,v1,v0
@@ -89,7 +89,7 @@ Disassembly of section .text:
   .*:	3c030000 	lui	v1,0x0
   .*:	24639004 	addiu	v1,v1,-28668
   .*:	00621821 	addu	v1,v1,v0
-  .*:	03c0e821 	move	sp,s8
+  .*:	03c0e825 	move	sp,s8
   .*:	8fbe0008 	lw	s8,8\(sp\)
   .*:	03e00008 	jr	ra
   .*:	27bd0010 	addiu	sp,sp,16
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32.d b/ld/testsuite/ld-mips-elf/tlsdyn-o32.d
index ea50960..e3f9ccb 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32.d
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32.d
@@ -9,7 +9,7 @@ Disassembly of section .text:
   .*:	0399e021 	addu	gp,gp,t9
   .*:	27bdfff0 	addiu	sp,sp,-16
   .*:	afbe0008 	sw	s8,8\(sp\)
-  .*:	03a0f021 	move	s8,sp
+  .*:	03a0f025 	move	s8,sp
   .*:	afbc0000 	sw	gp,0\(sp\)
   .*:	8f998018 	lw	t9,-32744\(gp\)
   .*:	27848034 	addiu	a0,gp,-32716
@@ -28,7 +28,7 @@ Disassembly of section .text:
   .*:	0320f809 	jalr	t9
   .*:	00000000 	nop
   .*:	8fdc0000 	lw	gp,0\(s8\)
-  .*:	00401021 	move	v0,v0
+  .*:	00401025 	move	v0,v0
   .*:	3c030000 	lui	v1,0x0
   .*:	24638000 	addiu	v1,v1,-32768
   .*:	00621821 	addu	v1,v1,v0
@@ -43,7 +43,7 @@ Disassembly of section .text:
   .*:	3c030000 	lui	v1,0x0
   .*:	24639004 	addiu	v1,v1,-28668
   .*:	00621821 	addu	v1,v1,v0
-  .*:	03c0e821 	move	sp,s8
+  .*:	03c0e825 	move	sp,s8
   .*:	8fbe0008 	lw	s8,8\(sp\)
   .*:	03e00008 	jr	ra
   .*:	27bd0010 	addiu	sp,sp,16
diff --git a/ld/testsuite/ld-mips-elf/tlslib-o32.d b/ld/testsuite/ld-mips-elf/tlslib-o32.d
index 066f284..9ac943b 100644
--- a/ld/testsuite/ld-mips-elf/tlslib-o32.d
+++ b/ld/testsuite/ld-mips-elf/tlslib-o32.d
@@ -9,7 +9,7 @@ Disassembly of section .text:
  .*:	0399e021 	addu	gp,gp,t9
  .*:	27bdfff0 	addiu	sp,sp,-16
  .*:	afbe0008 	sw	s8,8\(sp\)
- .*:	03a0f021 	move	s8,sp
+ .*:	03a0f025 	move	s8,sp
  .*:	afbc0000 	sw	gp,0\(sp\)
  .*:	8f998018 	lw	t9,-32744\(gp\)
  .*:	27848020 	addiu	a0,gp,-32736
@@ -22,7 +22,7 @@ Disassembly of section .text:
  .*:	0320f809 	jalr	t9
  .*:	00000000 	nop
  .*:	8fdc0000 	lw	gp,0\(s8\)
- .*:	00401021 	move	v0,v0
+ .*:	00401025 	move	v0,v0
  .*:	3c030000 	lui	v1,0x0
  .*:	24638000 	addiu	v1,v1,-32768
  .*:	00621821 	addu	v1,v1,v0
@@ -30,7 +30,7 @@ Disassembly of section .text:
  .*:	8f83801c 	lw	v1,-32740\(gp\)
  .*:	00000000 	nop
  .*:	00621821 	addu	v1,v1,v0
- .*:	03c0e821 	move	sp,s8
+ .*:	03c0e825 	move	sp,s8
  .*:	8fbe0008 	lw	s8,8\(sp\)
  .*:	03e00008 	jr	ra
  .*:	27bd0010 	addiu	sp,sp,16
@@ -40,7 +40,7 @@ Disassembly of section .MIPS.stubs:
 
 .* <_MIPS_STUBS_>:
  .*:	8f998010 	lw	t9,-32752\(gp\)
- .*:	03e07821 	move	t7,ra
+ .*:	03e07825 	move	t7,ra
  .*:	0320f809 	jalr	t9
  .*:	241800.* 	li	t8,.*
 	...