17 files changed, 2467 insertions, 848 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 4695e1d..a321e78 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,30 @@
+2012-08-06  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* lib/ld-lib.exp (run_dump_test): Implement the EXTRA_OPTIONS
+	argument and the "dump" keyword.
+	* ld-mips-elf/emit-relocs-1a.s: Make section alignment uniform
+	across targets.
+	* ld-mips-elf/emit-relocs-1b.s: Likewise.
+	* ld-mips-elf/jalbal.s: Adjust padding.
+	* ld-mips-elf/elf-rel-got-n32-embed.d: New test.
+	* ld-mips-elf/elf-rel-got-n64-embed.d: New test.
+	* ld-mips-elf/elf-rel-xgot-n32-embed.d: New test.
+	* ld-mips-elf/elf-rel-xgot-n64-embed.d: New test.
+	* ld-mips-elf/elf-rel-got-n32.d: Remove -melf32btsmipn32.
+	* ld-mips-elf/elf-rel-got-n64.d: Remove -melf64btsmip.  Adjust
+	output.
+	* ld-mips-elf/elf-rel-got-n64-linux.d: Remove -melf64btsmip.
+	* ld-mips-elf/elf-rel-xgot-n32.d: Remove -melf32btsmipn32.
+	Adjust output.
+	* ld-mips-elf/elf-rel-xgot-n64.d: Remove -melf64btsmip.  Adjust
+	output.
+	* ld-mips-elf/elf-rel-xgot-n64-linux.d: Likewise.
+	* ld-mips-elf/reloc-1-n64.d: Remove -melf64btsmip.
+	* ld-mips-elf/mips-elf.exp: Set has_newabi for mips*-sde-elf*
+	too.  Move tool flags from o32_as_flags and o32_ld_flags
+	variables into abi_asflags and abi_ldflags arrays.  Adjust test
+	cases run to use them.  Run the new tests.
+
 2012-08-05  Maciej W. Rozycki  <macro@linux-mips.org>
 
 	* ld-vax-elf: New directory.
diff --git a/ld/testsuite/ld-mips-elf/elf-rel-got-n32-embed.d b/ld/testsuite/ld-mips-elf/elf-rel-got-n32-embed.d
new file mode 100644
index 0000000..69c8b7f
--- /dev/null
+++ b/ld/testsuite/ld-mips-elf/elf-rel-got-n32-embed.d
@@ -0,0 +1,311 @@
+#name: MIPS ELF got reloc n32
+#as: -EB -n32 -KPIC
+#source: ../../../gas/testsuite/gas/mips/elf-rel-got-n32.s
+#ld:
+#objdump: -D --show-raw-insn
+
+.*: +file format elf32-n.*mips.*
+
+Disassembly of section \.reginfo:
+
+10000078 <\.reginfo>:
+10000078:	92020022 	.*
+	\.\.\.
+1000008c:	10018560 	.*
+
+Disassembly of section \.text:
+
+10000074 <fn>:
+10000074:	8f858018 	lw	a1,-32744\(gp\)
+10000078:	8f858018 	lw	a1,-32744\(gp\)
+1000007c:	24a5000c 	addiu	a1,a1,12
+10000080:	8f858018 	lw	a1,-32744\(gp\)
+10000084:	3c010001 	lui	at,0x1
+10000088:	3421e240 	ori	at,at,0xe240
+1000008c:	00a12821 	addu	a1,a1,at
+10000090:	8f858018 	lw	a1,-32744\(gp\)
+10000094:	00b12821 	addu	a1,a1,s1
+10000098:	8f858018 	lw	a1,-32744\(gp\)
+1000009c:	24a5000c 	addiu	a1,a1,12
+100000a0:	00b12821 	addu	a1,a1,s1
+100000a4:	8f858018 	lw	a1,-32744\(gp\)
+100000a8:	3c010001 	lui	at,0x1
+100000ac:	3421e240 	ori	at,at,0xe240
+100000b0:	00a12821 	addu	a1,a1,at
+100000b4:	00b12821 	addu	a1,a1,s1
+100000b8:	8f85801c 	lw	a1,-32740\(gp\)
+100000bc:	8ca504bc 	lw	a1,1212\(a1\)
+100000c0:	8f85801c 	lw	a1,-32740\(gp\)
+100000c4:	8ca504c8 	lw	a1,1224\(a1\)
+100000c8:	8f85801c 	lw	a1,-32740\(gp\)
+100000cc:	00b12821 	addu	a1,a1,s1
+100000d0:	8ca504bc 	lw	a1,1212\(a1\)
+100000d4:	8f85801c 	lw	a1,-32740\(gp\)
+100000d8:	00b12821 	addu	a1,a1,s1
+100000dc:	8ca504c8 	lw	a1,1224\(a1\)
+100000e0:	8f81801c 	lw	at,-32740\(gp\)
+100000e4:	00250821 	addu	at,at,a1
+100000e8:	8c2504de 	lw	a1,1246\(at\)
+100000ec:	8f81801c 	lw	at,-32740\(gp\)
+100000f0:	00250821 	addu	at,at,a1
+100000f4:	ac2504f4 	sw	a1,1268\(at\)
+100000f8:	8f818018 	lw	at,-32744\(gp\)
+100000fc:	88250000 	lwl	a1,0\(at\)
+10000100:	98250003 	lwr	a1,3\(at\)
+10000104:	8f818018 	lw	at,-32744\(gp\)
+10000108:	2421000c 	addiu	at,at,12
+1000010c:	88250000 	lwl	a1,0\(at\)
+10000110:	98250003 	lwr	a1,3\(at\)
+10000114:	8f818018 	lw	at,-32744\(gp\)
+10000118:	00310821 	addu	at,at,s1
+1000011c:	88250000 	lwl	a1,0\(at\)
+10000120:	98250003 	lwr	a1,3\(at\)
+10000124:	8f818018 	lw	at,-32744\(gp\)
+10000128:	2421000c 	addiu	at,at,12
+1000012c:	00310821 	addu	at,at,s1
+10000130:	88250000 	lwl	a1,0\(at\)
+10000134:	98250003 	lwr	a1,3\(at\)
+10000138:	8f818018 	lw	at,-32744\(gp\)
+1000013c:	24210022 	addiu	at,at,34
+10000140:	00250821 	addu	at,at,a1
+10000144:	88250000 	lwl	a1,0\(at\)
+10000148:	98250003 	lwr	a1,3\(at\)
+1000014c:	8f818018 	lw	at,-32744\(gp\)
+10000150:	24210038 	addiu	at,at,56
+10000154:	00250821 	addu	at,at,a1
+10000158:	a8250000 	swl	a1,0\(at\)
+1000015c:	b8250003 	swr	a1,3\(at\)
+10000160:	8f858018 	lw	a1,-32744\(gp\)
+10000164:	8f858020 	lw	a1,-32736\(gp\)
+10000168:	8f858024 	lw	a1,-32732\(gp\)
+1000016c:	8f858018 	lw	a1,-32744\(gp\)
+10000170:	00b12821 	addu	a1,a1,s1
+10000174:	8f858020 	lw	a1,-32736\(gp\)
+10000178:	00b12821 	addu	a1,a1,s1
+1000017c:	8f858024 	lw	a1,-32732\(gp\)
+10000180:	00b12821 	addu	a1,a1,s1
+10000184:	8f85801c 	lw	a1,-32740\(gp\)
+10000188:	8ca504bc 	lw	a1,1212\(a1\)
+1000018c:	8f85801c 	lw	a1,-32740\(gp\)
+10000190:	8ca504c8 	lw	a1,1224\(a1\)
+10000194:	8f85801c 	lw	a1,-32740\(gp\)
+10000198:	00b12821 	addu	a1,a1,s1
+1000019c:	8ca504bc 	lw	a1,1212\(a1\)
+100001a0:	8f85801c 	lw	a1,-32740\(gp\)
+100001a4:	00b12821 	addu	a1,a1,s1
+100001a8:	8ca504c8 	lw	a1,1224\(a1\)
+100001ac:	8f81801c 	lw	at,-32740\(gp\)
+100001b0:	00250821 	addu	at,at,a1
+100001b4:	8c2504de 	lw	a1,1246\(at\)
+100001b8:	8f81801c 	lw	at,-32740\(gp\)
+100001bc:	00250821 	addu	at,at,a1
+100001c0:	ac2504f4 	sw	a1,1268\(at\)
+100001c4:	8f818018 	lw	at,-32744\(gp\)
+100001c8:	88250000 	lwl	a1,0\(at\)
+100001cc:	98250003 	lwr	a1,3\(at\)
+100001d0:	8f818020 	lw	at,-32736\(gp\)
+100001d4:	88250000 	lwl	a1,0\(at\)
+100001d8:	98250003 	lwr	a1,3\(at\)
+100001dc:	8f818018 	lw	at,-32744\(gp\)
+100001e0:	00310821 	addu	at,at,s1
+100001e4:	88250000 	lwl	a1,0\(at\)
+100001e8:	98250003 	lwr	a1,3\(at\)
+100001ec:	8f818020 	lw	at,-32736\(gp\)
+100001f0:	00310821 	addu	at,at,s1
+100001f4:	88250000 	lwl	a1,0\(at\)
+100001f8:	98250003 	lwr	a1,3\(at\)
+100001fc:	8f818028 	lw	at,-32728\(gp\)
+10000200:	00250821 	addu	at,at,a1
+10000204:	88250000 	lwl	a1,0\(at\)
+10000208:	98250003 	lwr	a1,3\(at\)
+1000020c:	8f81802c 	lw	at,-32724\(gp\)
+10000210:	00250821 	addu	at,at,a1
+10000214:	a8250000 	swl	a1,0\(at\)
+10000218:	b8250003 	swr	a1,3\(at\)
+1000021c:	8f858030 	lw	a1,-32720\(gp\)
+10000220:	8f858030 	lw	a1,-32720\(gp\)
+10000224:	8f998030 	lw	t9,-32720\(gp\)
+10000228:	8f998030 	lw	t9,-32720\(gp\)
+1000022c:	8f998030 	lw	t9,-32720\(gp\)
+10000230:	0411ff90 	bal	10000074 <fn>
+10000234:	00000000 	nop
+10000238:	8f998030 	lw	t9,-32720\(gp\)
+1000023c:	0411ff8d 	bal	10000074 <fn>
+10000240:	00000000 	nop
+10000244:	8f858034 	lw	a1,-32716\(gp\)
+10000248:	8f858034 	lw	a1,-32716\(gp\)
+1000024c:	24a5000c 	addiu	a1,a1,12
+10000250:	8f858034 	lw	a1,-32716\(gp\)
+10000254:	3c010001 	lui	at,0x1
+10000258:	3421e240 	ori	at,at,0xe240
+1000025c:	00a12821 	addu	a1,a1,at
+10000260:	8f858034 	lw	a1,-32716\(gp\)
+10000264:	00b12821 	addu	a1,a1,s1
+10000268:	8f858034 	lw	a1,-32716\(gp\)
+1000026c:	24a5000c 	addiu	a1,a1,12
+10000270:	00b12821 	addu	a1,a1,s1
+10000274:	8f858034 	lw	a1,-32716\(gp\)
+10000278:	3c010001 	lui	at,0x1
+1000027c:	3421e240 	ori	at,at,0xe240
+10000280:	00a12821 	addu	a1,a1,at
+10000284:	00b12821 	addu	a1,a1,s1
+10000288:	8f85801c 	lw	a1,-32740\(gp\)
+1000028c:	8ca50534 	lw	a1,1332\(a1\)
+10000290:	8f85801c 	lw	a1,-32740\(gp\)
+10000294:	8ca50540 	lw	a1,1344\(a1\)
+10000298:	8f85801c 	lw	a1,-32740\(gp\)
+1000029c:	00b12821 	addu	a1,a1,s1
+100002a0:	8ca50534 	lw	a1,1332\(a1\)
+100002a4:	8f85801c 	lw	a1,-32740\(gp\)
+100002a8:	00b12821 	addu	a1,a1,s1
+100002ac:	8ca50540 	lw	a1,1344\(a1\)
+100002b0:	8f81801c 	lw	at,-32740\(gp\)
+100002b4:	00250821 	addu	at,at,a1
+100002b8:	8c250556 	lw	a1,1366\(at\)
+100002bc:	8f81801c 	lw	at,-32740\(gp\)
+100002c0:	00250821 	addu	at,at,a1
+100002c4:	ac25056c 	sw	a1,1388\(at\)
+100002c8:	8f818034 	lw	at,-32716\(gp\)
+100002cc:	88250000 	lwl	a1,0\(at\)
+100002d0:	98250003 	lwr	a1,3\(at\)
+100002d4:	8f818034 	lw	at,-32716\(gp\)
+100002d8:	2421000c 	addiu	at,at,12
+100002dc:	88250000 	lwl	a1,0\(at\)
+100002e0:	98250003 	lwr	a1,3\(at\)
+100002e4:	8f818034 	lw	at,-32716\(gp\)
+100002e8:	00310821 	addu	at,at,s1
+100002ec:	88250000 	lwl	a1,0\(at\)
+100002f0:	98250003 	lwr	a1,3\(at\)
+100002f4:	8f818034 	lw	at,-32716\(gp\)
+100002f8:	2421000c 	addiu	at,at,12
+100002fc:	00310821 	addu	at,at,s1
+10000300:	88250000 	lwl	a1,0\(at\)
+10000304:	98250003 	lwr	a1,3\(at\)
+10000308:	8f818034 	lw	at,-32716\(gp\)
+1000030c:	24210022 	addiu	at,at,34
+10000310:	00250821 	addu	at,at,a1
+10000314:	88250000 	lwl	a1,0\(at\)
+10000318:	98250003 	lwr	a1,3\(at\)
+1000031c:	8f818034 	lw	at,-32716\(gp\)
+10000320:	24210038 	addiu	at,at,56
+10000324:	00250821 	addu	at,at,a1
+10000328:	a8250000 	swl	a1,0\(at\)
+1000032c:	b8250003 	swr	a1,3\(at\)
+10000330:	8f858034 	lw	a1,-32716\(gp\)
+10000334:	8f858038 	lw	a1,-32712\(gp\)
+10000338:	8f85803c 	lw	a1,-32708\(gp\)
+1000033c:	8f858034 	lw	a1,-32716\(gp\)
+10000340:	00b12821 	addu	a1,a1,s1
+10000344:	8f858038 	lw	a1,-32712\(gp\)
+10000348:	00b12821 	addu	a1,a1,s1
+1000034c:	8f85803c 	lw	a1,-32708\(gp\)
+10000350:	00b12821 	addu	a1,a1,s1
+10000354:	8f85801c 	lw	a1,-32740\(gp\)
+10000358:	8ca50534 	lw	a1,1332\(a1\)
+1000035c:	8f85801c 	lw	a1,-32740\(gp\)
+10000360:	8ca50540 	lw	a1,1344\(a1\)
+10000364:	8f85801c 	lw	a1,-32740\(gp\)
+10000368:	00b12821 	addu	a1,a1,s1
+1000036c:	8ca50534 	lw	a1,1332\(a1\)
+10000370:	8f85801c 	lw	a1,-32740\(gp\)
+10000374:	00b12821 	addu	a1,a1,s1
+10000378:	8ca50540 	lw	a1,1344\(a1\)
+1000037c:	8f81801c 	lw	at,-32740\(gp\)
+10000380:	00250821 	addu	at,at,a1
+10000384:	8c250556 	lw	a1,1366\(at\)
+10000388:	8f81801c 	lw	at,-32740\(gp\)
+1000038c:	00250821 	addu	at,at,a1
+10000390:	ac25056c 	sw	a1,1388\(at\)
+10000394:	8f818034 	lw	at,-32716\(gp\)
+10000398:	88250000 	lwl	a1,0\(at\)
+1000039c:	98250003 	lwr	a1,3\(at\)
+100003a0:	8f818038 	lw	at,-32712\(gp\)
+100003a4:	88250000 	lwl	a1,0\(at\)
+100003a8:	98250003 	lwr	a1,3\(at\)
+100003ac:	8f818034 	lw	at,-32716\(gp\)
+100003b0:	00310821 	addu	at,at,s1
+100003b4:	88250000 	lwl	a1,0\(at\)
+100003b8:	98250003 	lwr	a1,3\(at\)
+100003bc:	8f818038 	lw	at,-32712\(gp\)
+100003c0:	00310821 	addu	at,at,s1
+100003c4:	88250000 	lwl	a1,0\(at\)
+100003c8:	98250003 	lwr	a1,3\(at\)
+100003cc:	8f818040 	lw	at,-32704\(gp\)
+100003d0:	00250821 	addu	at,at,a1
+100003d4:	88250000 	lwl	a1,0\(at\)
+100003d8:	98250003 	lwr	a1,3\(at\)
+100003dc:	8f818044 	lw	at,-32700\(gp\)
+100003e0:	00250821 	addu	at,at,a1
+100003e4:	a8250000 	swl	a1,0\(at\)
+100003e8:	b8250003 	swr	a1,3\(at\)
+100003ec:	8f858048 	lw	a1,-32696\(gp\)
+100003f0:	8f858048 	lw	a1,-32696\(gp\)
+100003f4:	8f998048 	lw	t9,-32696\(gp\)
+100003f8:	8f998048 	lw	t9,-32696\(gp\)
+100003fc:	8f998048 	lw	t9,-32696\(gp\)
+10000400:	0411001d 	bal	10000478 <fn2>
+10000404:	00000000 	nop
+10000408:	8f998048 	lw	t9,-32696\(gp\)
+1000040c:	0411001a 	bal	10000478 <fn2>
+10000410:	00000000 	nop
+10000414:	1000ff17 	b	10000074 <fn>
+10000418:	8f858018 	lw	a1,-32744\(gp\)
+1000041c:	8f85801c 	lw	a1,-32740\(gp\)
+10000420:	10000015 	b	10000478 <fn2>
+10000424:	8ca50534 	lw	a1,1332\(a1\)
+10000428:	1000ff12 	b	10000074 <fn>
+1000042c:	8f858018 	lw	a1,-32744\(gp\)
+10000430:	8f858038 	lw	a1,-32712\(gp\)
+10000434:	10000010 	b	10000478 <fn2>
+10000438:	00000000 	nop
+1000043c:	8f858024 	lw	a1,-32732\(gp\)
+10000440:	1000ff0c 	b	10000074 <fn>
+10000444:	00000000 	nop
+10000448:	8f85801c 	lw	a1,-32740\(gp\)
+1000044c:	1000000a 	b	10000478 <fn2>
+10000450:	8ca50534 	lw	a1,1332\(a1\)
+10000454:	8f85801c 	lw	a1,-32740\(gp\)
+10000458:	1000ff06 	b	10000074 <fn>
+1000045c:	8ca504c8 	lw	a1,1224\(a1\)
+10000460:	8f81801c 	lw	at,-32740\(gp\)
+10000464:	00250821 	addu	at,at,a1
+10000468:	10000003 	b	10000478 <fn2>
+1000046c:	8c250556 	lw	a1,1366\(at\)
+	\.\.\.
+
+10000478 <fn2>:
+	\.\.\.
+Disassembly of section \.data:
+
+10010480 <_fdata>:
+	\.\.\.
+
+100104bc <dg1>:
+	\.\.\.
+
+100104f8 <sp2>:
+	\.\.\.
+
+10010534 <dg2>:
+	\.\.\.
+Disassembly of section \.got:
+
+10010570 <_GLOBAL_OFFSET_TABLE_>:
+10010570:	00000000 	.*
+10010574:	80000000 	.*
+10010578:	100104bc 	.*
+1001057c:	10010000 	.*
+10010580:	100104c8 	.*
+10010584:	1002e6fc 	.*
+10010588:	100104de 	.*
+1001058c:	100104f4 	.*
+10010590:	10000074 	.*
+10010594:	10010534 	.*
+10010598:	10010540 	.*
+1001059c:	1002e774 	.*
+100105a0:	10010556 	.*
+100105a4:	1001056c 	.*
+100105a8:	10000478 	.*
+100105ac:	00000000 	.*
+	\.\.\.
+#pass
diff --git a/ld/testsuite/ld-mips-elf/elf-rel-got-n32.d b/ld/testsuite/ld-mips-elf/elf-rel-got-n32.d
index a209aa5..1b21726 100644
--- a/ld/testsuite/ld-mips-elf/elf-rel-got-n32.d
+++ b/ld/testsuite/ld-mips-elf/elf-rel-got-n32.d
@@ -1,7 +1,7 @@
 #name: MIPS ELF got reloc n32
 #as: -EB -n32 -KPIC
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n32.s
-#ld: -melf32btsmipn32
+#ld:
 #objdump: -D --show-raw-insn
 
 .*: +file format elf32-n.*mips.*
diff --git a/ld/testsuite/ld-mips-elf/elf-rel-got-n64-embed.d b/ld/testsuite/ld-mips-elf/elf-rel-got-n64-embed.d
new file mode 100644
index 0000000..07a97f9
--- /dev/null
+++ b/ld/testsuite/ld-mips-elf/elf-rel-got-n64-embed.d
@@ -0,0 +1,326 @@
+#name: MIPS ELF got reloc n64
+#as: -EB -64 -KPIC
+#source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s
+#ld:
+#objdump: -D --show-raw-insn
+
+.*: +file format elf64-.*mips.*
+
+Disassembly of section \.MIPS\.options:
+
+00000001200000b0 <\.MIPS\.options>:
+   1200000b0:	01280000 	.*
+   1200000b4:	00000000 	.*
+   1200000b8:	92020022 	.*
+	\.\.\.
+   1200000d0:	00000001 	.*
+   1200000d4:	200185a0 	.*
+Disassembly of section \.text:
+
+00000001200000b0 <fn>:
+   1200000b0:	df858020 	ld	a1,-32736\(gp\)
+   1200000b4:	df858020 	ld	a1,-32736\(gp\)
+   1200000b8:	64a5000c 	daddiu	a1,a1,12
+   1200000bc:	df858020 	ld	a1,-32736\(gp\)
+   1200000c0:	3c010001 	lui	at,0x1
+   1200000c4:	3421e240 	ori	at,at,0xe240
+   1200000c8:	00a1282d 	daddu	a1,a1,at
+   1200000cc:	df858020 	ld	a1,-32736\(gp\)
+   1200000d0:	00b1282d 	daddu	a1,a1,s1
+   1200000d4:	df858020 	ld	a1,-32736\(gp\)
+   1200000d8:	64a5000c 	daddiu	a1,a1,12
+   1200000dc:	00b1282d 	daddu	a1,a1,s1
+   1200000e0:	df858020 	ld	a1,-32736\(gp\)
+   1200000e4:	3c010001 	lui	at,0x1
+   1200000e8:	3421e240 	ori	at,at,0xe240
+   1200000ec:	00a1282d 	daddu	a1,a1,at
+   1200000f0:	00b1282d 	daddu	a1,a1,s1
+   1200000f4:	df858028 	ld	a1,-32728\(gp\)
+   1200000f8:	dca504fc 	ld	a1,1276\(a1\)
+   1200000fc:	df858028 	ld	a1,-32728\(gp\)
+   120000100:	dca50508 	ld	a1,1288\(a1\)
+   120000104:	df858028 	ld	a1,-32728\(gp\)
+   120000108:	00b1282d 	daddu	a1,a1,s1
+   12000010c:	dca504fc 	ld	a1,1276\(a1\)
+   120000110:	df858028 	ld	a1,-32728\(gp\)
+   120000114:	00b1282d 	daddu	a1,a1,s1
+   120000118:	dca50508 	ld	a1,1288\(a1\)
+   12000011c:	df818028 	ld	at,-32728\(gp\)
+   120000120:	0025082d 	daddu	at,at,a1
+   120000124:	dc25051e 	ld	a1,1310\(at\)
+   120000128:	df818028 	ld	at,-32728\(gp\)
+   12000012c:	0025082d 	daddu	at,at,a1
+   120000130:	fc250534 	sd	a1,1332\(at\)
+   120000134:	df818020 	ld	at,-32736\(gp\)
+   120000138:	88250000 	lwl	a1,0\(at\)
+   12000013c:	98250003 	lwr	a1,3\(at\)
+   120000140:	df818020 	ld	at,-32736\(gp\)
+   120000144:	6421000c 	daddiu	at,at,12
+   120000148:	88250000 	lwl	a1,0\(at\)
+   12000014c:	98250003 	lwr	a1,3\(at\)
+   120000150:	df818020 	ld	at,-32736\(gp\)
+   120000154:	0031082d 	daddu	at,at,s1
+   120000158:	88250000 	lwl	a1,0\(at\)
+   12000015c:	98250003 	lwr	a1,3\(at\)
+   120000160:	df818020 	ld	at,-32736\(gp\)
+   120000164:	6421000c 	daddiu	at,at,12
+   120000168:	0031082d 	daddu	at,at,s1
+   12000016c:	88250000 	lwl	a1,0\(at\)
+   120000170:	98250003 	lwr	a1,3\(at\)
+   120000174:	df818020 	ld	at,-32736\(gp\)
+   120000178:	64210022 	daddiu	at,at,34
+   12000017c:	0025082d 	daddu	at,at,a1
+   120000180:	88250000 	lwl	a1,0\(at\)
+   120000184:	98250003 	lwr	a1,3\(at\)
+   120000188:	df818020 	ld	at,-32736\(gp\)
+   12000018c:	64210038 	daddiu	at,at,56
+   120000190:	0025082d 	daddu	at,at,a1
+   120000194:	a8250000 	swl	a1,0\(at\)
+   120000198:	b8250003 	swr	a1,3\(at\)
+   12000019c:	df858020 	ld	a1,-32736\(gp\)
+   1200001a0:	df858030 	ld	a1,-32720\(gp\)
+   1200001a4:	df858038 	ld	a1,-32712\(gp\)
+   1200001a8:	df858020 	ld	a1,-32736\(gp\)
+   1200001ac:	00b1282d 	daddu	a1,a1,s1
+   1200001b0:	df858030 	ld	a1,-32720\(gp\)
+   1200001b4:	00b1282d 	daddu	a1,a1,s1
+   1200001b8:	df858038 	ld	a1,-32712\(gp\)
+   1200001bc:	00b1282d 	daddu	a1,a1,s1
+   1200001c0:	df858028 	ld	a1,-32728\(gp\)
+   1200001c4:	dca504fc 	ld	a1,1276\(a1\)
+   1200001c8:	df858028 	ld	a1,-32728\(gp\)
+   1200001cc:	dca50508 	ld	a1,1288\(a1\)
+   1200001d0:	df858028 	ld	a1,-32728\(gp\)
+   1200001d4:	00b1282d 	daddu	a1,a1,s1
+   1200001d8:	dca504fc 	ld	a1,1276\(a1\)
+   1200001dc:	df858028 	ld	a1,-32728\(gp\)
+   1200001e0:	00b1282d 	daddu	a1,a1,s1
+   1200001e4:	dca50508 	ld	a1,1288\(a1\)
+   1200001e8:	df818028 	ld	at,-32728\(gp\)
+   1200001ec:	0025082d 	daddu	at,at,a1
+   1200001f0:	dc25051e 	ld	a1,1310\(at\)
+   1200001f4:	df818028 	ld	at,-32728\(gp\)
+   1200001f8:	0025082d 	daddu	at,at,a1
+   1200001fc:	fc250534 	sd	a1,1332\(at\)
+   120000200:	df818020 	ld	at,-32736\(gp\)
+   120000204:	88250000 	lwl	a1,0\(at\)
+   120000208:	98250003 	lwr	a1,3\(at\)
+   12000020c:	df818030 	ld	at,-32720\(gp\)
+   120000210:	88250000 	lwl	a1,0\(at\)
+   120000214:	98250003 	lwr	a1,3\(at\)
+   120000218:	df818020 	ld	at,-32736\(gp\)
+   12000021c:	0031082d 	daddu	at,at,s1
+   120000220:	88250000 	lwl	a1,0\(at\)
+   120000224:	98250003 	lwr	a1,3\(at\)
+   120000228:	df818030 	ld	at,-32720\(gp\)
+   12000022c:	0031082d 	daddu	at,at,s1
+   120000230:	88250000 	lwl	a1,0\(at\)
+   120000234:	98250003 	lwr	a1,3\(at\)
+   120000238:	df818040 	ld	at,-32704\(gp\)
+   12000023c:	0025082d 	daddu	at,at,a1
+   120000240:	88250000 	lwl	a1,0\(at\)
+   120000244:	98250003 	lwr	a1,3\(at\)
+   120000248:	df818048 	ld	at,-32696\(gp\)
+   12000024c:	0025082d 	daddu	at,at,a1
+   120000250:	a8250000 	swl	a1,0\(at\)
+   120000254:	b8250003 	swr	a1,3\(at\)
+   120000258:	df858050 	ld	a1,-32688\(gp\)
+   12000025c:	df858050 	ld	a1,-32688\(gp\)
+   120000260:	df998050 	ld	t9,-32688\(gp\)
+   120000264:	df998050 	ld	t9,-32688\(gp\)
+   120000268:	df998050 	ld	t9,-32688\(gp\)
+   12000026c:	0411ff90 	bal	1200000b0 <fn>
+   120000270:	00000000 	nop
+   120000274:	df998050 	ld	t9,-32688\(gp\)
+   120000278:	0411ff8d 	bal	1200000b0 <fn>
+   12000027c:	00000000 	nop
+   120000280:	df858058 	ld	a1,-32680\(gp\)
+   120000284:	df858058 	ld	a1,-32680\(gp\)
+   120000288:	64a5000c 	daddiu	a1,a1,12
+   12000028c:	df858058 	ld	a1,-32680\(gp\)
+   120000290:	3c010001 	lui	at,0x1
+   120000294:	3421e240 	ori	at,at,0xe240
+   120000298:	00a1282d 	daddu	a1,a1,at
+   12000029c:	df858058 	ld	a1,-32680\(gp\)
+   1200002a0:	00b1282d 	daddu	a1,a1,s1
+   1200002a4:	df858058 	ld	a1,-32680\(gp\)
+   1200002a8:	64a5000c 	daddiu	a1,a1,12
+   1200002ac:	00b1282d 	daddu	a1,a1,s1
+   1200002b0:	df858058 	ld	a1,-32680\(gp\)
+   1200002b4:	3c010001 	lui	at,0x1
+   1200002b8:	3421e240 	ori	at,at,0xe240
+   1200002bc:	00a1282d 	daddu	a1,a1,at
+   1200002c0:	00b1282d 	daddu	a1,a1,s1
+   1200002c4:	df858028 	ld	a1,-32728\(gp\)
+   1200002c8:	dca50574 	ld	a1,1396\(a1\)
+   1200002cc:	df858028 	ld	a1,-32728\(gp\)
+   1200002d0:	dca50580 	ld	a1,1408\(a1\)
+   1200002d4:	df858028 	ld	a1,-32728\(gp\)
+   1200002d8:	00b1282d 	daddu	a1,a1,s1
+   1200002dc:	dca50574 	ld	a1,1396\(a1\)
+   1200002e0:	df858028 	ld	a1,-32728\(gp\)
+   1200002e4:	00b1282d 	daddu	a1,a1,s1
+   1200002e8:	dca50580 	ld	a1,1408\(a1\)
+   1200002ec:	df818028 	ld	at,-32728\(gp\)
+   1200002f0:	0025082d 	daddu	at,at,a1
+   1200002f4:	dc250596 	ld	a1,1430\(at\)
+   1200002f8:	df818028 	ld	at,-32728\(gp\)
+   1200002fc:	0025082d 	daddu	at,at,a1
+   120000300:	fc2505ac 	sd	a1,1452\(at\)
+   120000304:	df818058 	ld	at,-32680\(gp\)
+   120000308:	88250000 	lwl	a1,0\(at\)
+   12000030c:	98250003 	lwr	a1,3\(at\)
+   120000310:	df818058 	ld	at,-32680\(gp\)
+   120000314:	6421000c 	daddiu	at,at,12
+   120000318:	88250000 	lwl	a1,0\(at\)
+   12000031c:	98250003 	lwr	a1,3\(at\)
+   120000320:	df818058 	ld	at,-32680\(gp\)
+   120000324:	0031082d 	daddu	at,at,s1
+   120000328:	88250000 	lwl	a1,0\(at\)
+   12000032c:	98250003 	lwr	a1,3\(at\)
+   120000330:	df818058 	ld	at,-32680\(gp\)
+   120000334:	6421000c 	daddiu	at,at,12
+   120000338:	0031082d 	daddu	at,at,s1
+   12000033c:	88250000 	lwl	a1,0\(at\)
+   120000340:	98250003 	lwr	a1,3\(at\)
+   120000344:	df818058 	ld	at,-32680\(gp\)
+   120000348:	64210022 	daddiu	at,at,34
+   12000034c:	0025082d 	daddu	at,at,a1
+   120000350:	88250000 	lwl	a1,0\(at\)
+   120000354:	98250003 	lwr	a1,3\(at\)
+   120000358:	df818058 	ld	at,-32680\(gp\)
+   12000035c:	64210038 	daddiu	at,at,56
+   120000360:	0025082d 	daddu	at,at,a1
+   120000364:	a8250000 	swl	a1,0\(at\)
+   120000368:	b8250003 	swr	a1,3\(at\)
+   12000036c:	df858058 	ld	a1,-32680\(gp\)
+   120000370:	df858060 	ld	a1,-32672\(gp\)
+   120000374:	df858068 	ld	a1,-32664\(gp\)
+   120000378:	df858058 	ld	a1,-32680\(gp\)
+   12000037c:	00b1282d 	daddu	a1,a1,s1
+   120000380:	df858060 	ld	a1,-32672\(gp\)
+   120000384:	00b1282d 	daddu	a1,a1,s1
+   120000388:	df858068 	ld	a1,-32664\(gp\)
+   12000038c:	00b1282d 	daddu	a1,a1,s1
+   120000390:	df858028 	ld	a1,-32728\(gp\)
+   120000394:	dca50574 	ld	a1,1396\(a1\)
+   120000398:	df858028 	ld	a1,-32728\(gp\)
+   12000039c:	dca50580 	ld	a1,1408\(a1\)
+   1200003a0:	df858028 	ld	a1,-32728\(gp\)
+   1200003a4:	00b1282d 	daddu	a1,a1,s1
+   1200003a8:	dca50574 	ld	a1,1396\(a1\)
+   1200003ac:	df858028 	ld	a1,-32728\(gp\)
+   1200003b0:	00b1282d 	daddu	a1,a1,s1
+   1200003b4:	dca50580 	ld	a1,1408\(a1\)
+   1200003b8:	df818028 	ld	at,-32728\(gp\)
+   1200003bc:	0025082d 	daddu	at,at,a1
+   1200003c0:	dc250596 	ld	a1,1430\(at\)
+   1200003c4:	df818028 	ld	at,-32728\(gp\)
+   1200003c8:	0025082d 	daddu	at,at,a1
+   1200003cc:	fc2505ac 	sd	a1,1452\(at\)
+   1200003d0:	df818058 	ld	at,-32680\(gp\)
+   1200003d4:	88250000 	lwl	a1,0\(at\)
+   1200003d8:	98250003 	lwr	a1,3\(at\)
+   1200003dc:	df818060 	ld	at,-32672\(gp\)
+   1200003e0:	88250000 	lwl	a1,0\(at\)
+   1200003e4:	98250003 	lwr	a1,3\(at\)
+   1200003e8:	df818058 	ld	at,-32680\(gp\)
+   1200003ec:	0031082d 	daddu	at,at,s1
+   1200003f0:	88250000 	lwl	a1,0\(at\)
+   1200003f4:	98250003 	lwr	a1,3\(at\)
+   1200003f8:	df818060 	ld	at,-32672\(gp\)
+   1200003fc:	0031082d 	daddu	at,at,s1
+   120000400:	88250000 	lwl	a1,0\(at\)
+   120000404:	98250003 	lwr	a1,3\(at\)
+   120000408:	df818070 	ld	at,-32656\(gp\)
+   12000040c:	0025082d 	daddu	at,at,a1
+   120000410:	88250000 	lwl	a1,0\(at\)
+   120000414:	98250003 	lwr	a1,3\(at\)
+   120000418:	df818078 	ld	at,-32648\(gp\)
+   12000041c:	0025082d 	daddu	at,at,a1
+   120000420:	a8250000 	swl	a1,0\(at\)
+   120000424:	b8250003 	swr	a1,3\(at\)
+   120000428:	df858080 	ld	a1,-32640\(gp\)
+   12000042c:	df858080 	ld	a1,-32640\(gp\)
+   120000430:	df998080 	ld	t9,-32640\(gp\)
+   120000434:	df998080 	ld	t9,-32640\(gp\)
+   120000438:	df998080 	ld	t9,-32640\(gp\)
+   12000043c:	0411001d 	bal	1200004b4 <fn2>
+   120000440:	00000000 	nop
+   120000444:	df998080 	ld	t9,-32640\(gp\)
+   120000448:	0411001a 	bal	1200004b4 <fn2>
+   12000044c:	00000000 	nop
+   120000450:	1000ff17 	b	1200000b0 <fn>
+   120000454:	df858020 	ld	a1,-32736\(gp\)
+   120000458:	df858028 	ld	a1,-32728\(gp\)
+   12000045c:	10000015 	b	1200004b4 <fn2>
+   120000460:	dca50574 	ld	a1,1396\(a1\)
+   120000464:	1000ff12 	b	1200000b0 <fn>
+   120000468:	df858020 	ld	a1,-32736\(gp\)
+   12000046c:	df858060 	ld	a1,-32672\(gp\)
+   120000470:	10000010 	b	1200004b4 <fn2>
+   120000474:	00000000 	nop
+   120000478:	df858038 	ld	a1,-32712\(gp\)
+   12000047c:	1000ff0c 	b	1200000b0 <fn>
+   120000480:	00000000 	nop
+   120000484:	df858028 	ld	a1,-32728\(gp\)
+   120000488:	1000000a 	b	1200004b4 <fn2>
+   12000048c:	dca50574 	ld	a1,1396\(a1\)
+   120000490:	df858028 	ld	a1,-32728\(gp\)
+   120000494:	1000ff06 	b	1200000b0 <fn>
+   120000498:	dca50508 	ld	a1,1288\(a1\)
+   12000049c:	df818028 	ld	at,-32728\(gp\)
+   1200004a0:	0025082d 	daddu	at,at,a1
+   1200004a4:	10000003 	b	1200004b4 <fn2>
+   1200004a8:	dc250596 	ld	a1,1430\(at\)
+	\.\.\.
+
+00000001200004b4 <fn2>:
+	\.\.\.
+Disassembly of section \.data:
+
+00000001200104c0 <_fdata>:
+	\.\.\.
+
+00000001200104fc <dg1>:
+	\.\.\.
+
+0000000120010538 <sp2>:
+	\.\.\.
+
+0000000120010574 <dg2>:
+	\.\.\.
+Disassembly of section \.got:
+
+00000001200105b0 <_GLOBAL_OFFSET_TABLE_>:
+	\.\.\.
+   1200105b8:	80000000 	.*
+   1200105bc:	00000000 	.*
+   1200105c0:	00000001 	.*
+   1200105c4:	200104fc 	.*
+   1200105c8:	00000001 	.*
+   1200105cc:	20010000 	.*
+   1200105d0:	00000001 	.*
+   1200105d4:	20010508 	.*
+   1200105d8:	00000001 	.*
+   1200105dc:	2002e73c 	.*
+   1200105e0:	00000001 	.*
+   1200105e4:	2001051e 	.*
+   1200105e8:	00000001 	.*
+   1200105ec:	20010534 	.*
+   1200105f0:	00000001 	.*
+   1200105f4:	200000b0 	.*
+   1200105f8:	00000001 	.*
+   1200105fc:	20010574 	.*
+   120010600:	00000001 	.*
+   120010604:	20010580 	.*
+   120010608:	00000001 	.*
+   12001060c:	2002e7b4 	.*
+   120010610:	00000001 	.*
+   120010614:	20010596 	.*
+   120010618:	00000001 	.*
+   12001061c:	200105ac 	.*
+   120010620:	00000001 	.*
+   120010624:	200004b4 	.*
+	\.\.\.
+#pass
diff --git a/ld/testsuite/ld-mips-elf/elf-rel-got-n64-linux.d b/ld/testsuite/ld-mips-elf/elf-rel-got-n64-linux.d
index b5a7ab8..c8d5909 100644
--- a/ld/testsuite/ld-mips-elf/elf-rel-got-n64-linux.d
+++ b/ld/testsuite/ld-mips-elf/elf-rel-got-n64-linux.d
@@ -1,7 +1,7 @@
 #name: MIPS ELF got reloc n64
 #as: -EB -64 -KPIC
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s
-#ld: -melf64btsmip
+#ld:
 #objdump: -D --show-raw-insn
 
 .*: +file format elf64-.*mips.*
diff --git a/ld/testsuite/ld-mips-elf/elf-rel-got-n64.d b/ld/testsuite/ld-mips-elf/elf-rel-got-n64.d
index 8ebfdf8..32589fb 100644
--- a/ld/testsuite/ld-mips-elf/elf-rel-got-n64.d
+++ b/ld/testsuite/ld-mips-elf/elf-rel-got-n64.d
@@ -1,332 +1,324 @@
 #name: MIPS ELF got reloc n64
 #as: -EB -64 -KPIC
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s
-#ld: -melf64btsmip
+#ld:
 #objdump: -D --show-raw-insn
 
 .*: +file format elf64-.*mips.*
 
 Disassembly of section \.MIPS\.options:
 
-00000000100000b0 <\.MIPS\.options>:
-    100000b0:	01280000 	.*
-    100000b4:	00000000 	.*
-    100000b8:	92020022 	.*
+00000000100000e8 <\.MIPS\.options>:
+    100000e8:	01280000 	.*
+    100000ec:	00000000 	.*
+    100000f0:	92020022 	.*
 	\.\.\.
-    100000d4:	101085d0 	.*
+    1000010c:	10018600 	.*
 Disassembly of section \.text:
 
-00000000100000e0 <fn>:
-    100000e0:	df8580b8 	ld	a1,-32584\(gp\)
-    100000e4:	df8580b8 	ld	a1,-32584\(gp\)
-    100000e8:	64a5000c 	daddiu	a1,a1,12
-    100000ec:	df8580b8 	ld	a1,-32584\(gp\)
-    100000f0:	3c010002 	lui	at,0x2
-    100000f4:	6421e240 	daddiu	at,at,-7616
-    100000f8:	00a1282d 	daddu	a1,a1,at
-    100000fc:	df8580b8 	ld	a1,-32584\(gp\)
-    10000100:	00b1282d 	daddu	a1,a1,s1
-    10000104:	df8580b8 	ld	a1,-32584\(gp\)
-    10000108:	64a5000c 	daddiu	a1,a1,12
-    1000010c:	00b1282d 	daddu	a1,a1,s1
-    10000110:	df8580b8 	ld	a1,-32584\(gp\)
-    10000114:	3c010002 	lui	at,0x2
-    10000118:	6421e240 	daddiu	at,at,-7616
-    1000011c:	00a1282d 	daddu	a1,a1,at
-    10000120:	00b1282d 	daddu	a1,a1,s1
-    10000124:	df8580b8 	ld	a1,-32584\(gp\)
-    10000128:	dca50000 	ld	a1,0\(a1\)
-    1000012c:	df8580b8 	ld	a1,-32584\(gp\)
-    10000130:	dca5000c 	ld	a1,12\(a1\)
-    10000134:	df8580b8 	ld	a1,-32584\(gp\)
-    10000138:	00b1282d 	daddu	a1,a1,s1
-    1000013c:	dca50000 	ld	a1,0\(a1\)
-    10000140:	df8580b8 	ld	a1,-32584\(gp\)
-    10000144:	00b1282d 	daddu	a1,a1,s1
-    10000148:	dca5000c 	ld	a1,12\(a1\)
-    1000014c:	df8180b8 	ld	at,-32584\(gp\)
-    10000150:	0025082d 	daddu	at,at,a1
-    10000154:	dc250022 	ld	a1,34\(at\)
-    10000158:	df8180b8 	ld	at,-32584\(gp\)
-    1000015c:	0025082d 	daddu	at,at,a1
-    10000160:	fc250038 	sd	a1,56\(at\)
-    10000164:	df8180b8 	ld	at,-32584\(gp\)
-    10000168:	88250000 	lwl	a1,0\(at\)
-    1000016c:	98250003 	lwr	a1,3\(at\)
-    10000170:	df8180b8 	ld	at,-32584\(gp\)
-    10000174:	6421000c 	daddiu	at,at,12
-    10000178:	88250000 	lwl	a1,0\(at\)
-    1000017c:	98250003 	lwr	a1,3\(at\)
-    10000180:	df8180b8 	ld	at,-32584\(gp\)
-    10000184:	0031082d 	daddu	at,at,s1
-    10000188:	88250000 	lwl	a1,0\(at\)
-    1000018c:	98250003 	lwr	a1,3\(at\)
-    10000190:	df8180b8 	ld	at,-32584\(gp\)
-    10000194:	6421000c 	daddiu	at,at,12
-    10000198:	0031082d 	daddu	at,at,s1
-    1000019c:	88250000 	lwl	a1,0\(at\)
-    100001a0:	98250003 	lwr	a1,3\(at\)
-    100001a4:	df8180b8 	ld	at,-32584\(gp\)
-    100001a8:	64210022 	daddiu	at,at,34
-    100001ac:	0025082d 	daddu	at,at,a1
-    100001b0:	88250000 	lwl	a1,0\(at\)
-    100001b4:	98250003 	lwr	a1,3\(at\)
-    100001b8:	df8180b8 	ld	at,-32584\(gp\)
-    100001bc:	64210038 	daddiu	at,at,56
-    100001c0:	0025082d 	daddu	at,at,a1
-    100001c4:	a8250000 	swl	a1,0\(at\)
-    100001c8:	b8250003 	swr	a1,3\(at\)
-    100001cc:	df858020 	ld	a1,-32736\(gp\)
-    100001d0:	df858028 	ld	a1,-32728\(gp\)
-    100001d4:	df858030 	ld	a1,-32720\(gp\)
-    100001d8:	df858020 	ld	a1,-32736\(gp\)
-    100001dc:	00b1282d 	daddu	a1,a1,s1
-    100001e0:	df858028 	ld	a1,-32728\(gp\)
-    100001e4:	00b1282d 	daddu	a1,a1,s1
-    100001e8:	df858030 	ld	a1,-32720\(gp\)
-    100001ec:	00b1282d 	daddu	a1,a1,s1
-    100001f0:	df858038 	ld	a1,-32712\(gp\)
-    100001f4:	dca5052c 	ld	a1,1324\(a1\)
-    100001f8:	df858038 	ld	a1,-32712\(gp\)
-    100001fc:	dca50538 	ld	a1,1336\(a1\)
-    10000200:	df858038 	ld	a1,-32712\(gp\)
-    10000204:	00b1282d 	daddu	a1,a1,s1
-    10000208:	dca5052c 	ld	a1,1324\(a1\)
-    1000020c:	df858038 	ld	a1,-32712\(gp\)
-    10000210:	00b1282d 	daddu	a1,a1,s1
-    10000214:	dca50538 	ld	a1,1336\(a1\)
-    10000218:	df818038 	ld	at,-32712\(gp\)
-    1000021c:	0025082d 	daddu	at,at,a1
-    10000220:	dc25054e 	ld	a1,1358\(at\)
-    10000224:	df818038 	ld	at,-32712\(gp\)
-    10000228:	0025082d 	daddu	at,at,a1
-    1000022c:	fc250564 	sd	a1,1380\(at\)
-    10000230:	df818020 	ld	at,-32736\(gp\)
-    10000234:	88250000 	lwl	a1,0\(at\)
-    10000238:	98250003 	lwr	a1,3\(at\)
-    1000023c:	df818028 	ld	at,-32728\(gp\)
-    10000240:	88250000 	lwl	a1,0\(at\)
-    10000244:	98250003 	lwr	a1,3\(at\)
-    10000248:	df818020 	ld	at,-32736\(gp\)
-    1000024c:	0031082d 	daddu	at,at,s1
-    10000250:	88250000 	lwl	a1,0\(at\)
-    10000254:	98250003 	lwr	a1,3\(at\)
-    10000258:	df818028 	ld	at,-32728\(gp\)
-    1000025c:	0031082d 	daddu	at,at,s1
-    10000260:	88250000 	lwl	a1,0\(at\)
-    10000264:	98250003 	lwr	a1,3\(at\)
-    10000268:	df818040 	ld	at,-32704\(gp\)
-    1000026c:	0025082d 	daddu	at,at,a1
+0000000010000110 <fn>:
+    10000110:	df858020 	ld	a1,-32736\(gp\)
+    10000114:	df858020 	ld	a1,-32736\(gp\)
+    10000118:	64a5000c 	daddiu	a1,a1,12
+    1000011c:	df858020 	ld	a1,-32736\(gp\)
+    10000120:	3c010001 	lui	at,0x1
+    10000124:	3421e240 	ori	at,at,0xe240
+    10000128:	00a1282d 	daddu	a1,a1,at
+    1000012c:	df858020 	ld	a1,-32736\(gp\)
+    10000130:	00b1282d 	daddu	a1,a1,s1
+    10000134:	df858020 	ld	a1,-32736\(gp\)
+    10000138:	64a5000c 	daddiu	a1,a1,12
+    1000013c:	00b1282d 	daddu	a1,a1,s1
+    10000140:	df858020 	ld	a1,-32736\(gp\)
+    10000144:	3c010001 	lui	at,0x1
+    10000148:	3421e240 	ori	at,at,0xe240
+    1000014c:	00a1282d 	daddu	a1,a1,at
+    10000150:	00b1282d 	daddu	a1,a1,s1
+    10000154:	df858028 	ld	a1,-32728\(gp\)
+    10000158:	dca5055c 	ld	a1,1372\(a1\)
+    1000015c:	df858028 	ld	a1,-32728\(gp\)
+    10000160:	dca50568 	ld	a1,1384\(a1\)
+    10000164:	df858028 	ld	a1,-32728\(gp\)
+    10000168:	00b1282d 	daddu	a1,a1,s1
+    1000016c:	dca5055c 	ld	a1,1372\(a1\)
+    10000170:	df858028 	ld	a1,-32728\(gp\)
+    10000174:	00b1282d 	daddu	a1,a1,s1
+    10000178:	dca50568 	ld	a1,1384\(a1\)
+    1000017c:	df818028 	ld	at,-32728\(gp\)
+    10000180:	0025082d 	daddu	at,at,a1
+    10000184:	dc25057e 	ld	a1,1406\(at\)
+    10000188:	df818028 	ld	at,-32728\(gp\)
+    1000018c:	0025082d 	daddu	at,at,a1
+    10000190:	fc250594 	sd	a1,1428\(at\)
+    10000194:	df818020 	ld	at,-32736\(gp\)
+    10000198:	88250000 	lwl	a1,0\(at\)
+    1000019c:	98250003 	lwr	a1,3\(at\)
+    100001a0:	df818020 	ld	at,-32736\(gp\)
+    100001a4:	6421000c 	daddiu	at,at,12
+    100001a8:	88250000 	lwl	a1,0\(at\)
+    100001ac:	98250003 	lwr	a1,3\(at\)
+    100001b0:	df818020 	ld	at,-32736\(gp\)
+    100001b4:	0031082d 	daddu	at,at,s1
+    100001b8:	88250000 	lwl	a1,0\(at\)
+    100001bc:	98250003 	lwr	a1,3\(at\)
+    100001c0:	df818020 	ld	at,-32736\(gp\)
+    100001c4:	6421000c 	daddiu	at,at,12
+    100001c8:	0031082d 	daddu	at,at,s1
+    100001cc:	88250000 	lwl	a1,0\(at\)
+    100001d0:	98250003 	lwr	a1,3\(at\)
+    100001d4:	df818020 	ld	at,-32736\(gp\)
+    100001d8:	64210022 	daddiu	at,at,34
+    100001dc:	0025082d 	daddu	at,at,a1
+    100001e0:	88250000 	lwl	a1,0\(at\)
+    100001e4:	98250003 	lwr	a1,3\(at\)
+    100001e8:	df818020 	ld	at,-32736\(gp\)
+    100001ec:	64210038 	daddiu	at,at,56
+    100001f0:	0025082d 	daddu	at,at,a1
+    100001f4:	a8250000 	swl	a1,0\(at\)
+    100001f8:	b8250003 	swr	a1,3\(at\)
+    100001fc:	df858020 	ld	a1,-32736\(gp\)
+    10000200:	df858030 	ld	a1,-32720\(gp\)
+    10000204:	df858038 	ld	a1,-32712\(gp\)
+    10000208:	df858020 	ld	a1,-32736\(gp\)
+    1000020c:	00b1282d 	daddu	a1,a1,s1
+    10000210:	df858030 	ld	a1,-32720\(gp\)
+    10000214:	00b1282d 	daddu	a1,a1,s1
+    10000218:	df858038 	ld	a1,-32712\(gp\)
+    1000021c:	00b1282d 	daddu	a1,a1,s1
+    10000220:	df858028 	ld	a1,-32728\(gp\)
+    10000224:	dca5055c 	ld	a1,1372\(a1\)
+    10000228:	df858028 	ld	a1,-32728\(gp\)
+    1000022c:	dca50568 	ld	a1,1384\(a1\)
+    10000230:	df858028 	ld	a1,-32728\(gp\)
+    10000234:	00b1282d 	daddu	a1,a1,s1
+    10000238:	dca5055c 	ld	a1,1372\(a1\)
+    1000023c:	df858028 	ld	a1,-32728\(gp\)
+    10000240:	00b1282d 	daddu	a1,a1,s1
+    10000244:	dca50568 	ld	a1,1384\(a1\)
+    10000248:	df818028 	ld	at,-32728\(gp\)
+    1000024c:	0025082d 	daddu	at,at,a1
+    10000250:	dc25057e 	ld	a1,1406\(at\)
+    10000254:	df818028 	ld	at,-32728\(gp\)
+    10000258:	0025082d 	daddu	at,at,a1
+    1000025c:	fc250594 	sd	a1,1428\(at\)
+    10000260:	df818020 	ld	at,-32736\(gp\)
+    10000264:	88250000 	lwl	a1,0\(at\)
+    10000268:	98250003 	lwr	a1,3\(at\)
+    1000026c:	df818030 	ld	at,-32720\(gp\)
     10000270:	88250000 	lwl	a1,0\(at\)
     10000274:	98250003 	lwr	a1,3\(at\)
-    10000278:	df818048 	ld	at,-32696\(gp\)
-    1000027c:	0025082d 	daddu	at,at,a1
-    10000280:	a8250000 	swl	a1,0\(at\)
-    10000284:	b8250003 	swr	a1,3\(at\)
-    10000288:	df8580a8 	ld	a1,-32600\(gp\)
-    1000028c:	df858050 	ld	a1,-32688\(gp\)
-    10000290:	df9980a8 	ld	t9,-32600\(gp\)
-    10000294:	df998050 	ld	t9,-32688\(gp\)
-    10000298:	df9980a8 	ld	t9,-32600\(gp\)
-    1000029c:	0320f809 	jalr	t9
-    100002a0:	00000000 	nop
-    100002a4:	df998050 	ld	t9,-32688\(gp\)
-    100002a8:	0320f809 	jalr	t9
-    100002ac:	00000000 	nop
-    100002b0:	df8580c0 	ld	a1,-32576\(gp\)
-    100002b4:	df8580c0 	ld	a1,-32576\(gp\)
-    100002b8:	64a5000c 	daddiu	a1,a1,12
-    100002bc:	df8580c0 	ld	a1,-32576\(gp\)
-    100002c0:	3c010002 	lui	at,0x2
-    100002c4:	6421e240 	daddiu	at,at,-7616
-    100002c8:	00a1282d 	daddu	a1,a1,at
-    100002cc:	df8580c0 	ld	a1,-32576\(gp\)
-    100002d0:	00b1282d 	daddu	a1,a1,s1
-    100002d4:	df8580c0 	ld	a1,-32576\(gp\)
-    100002d8:	64a5000c 	daddiu	a1,a1,12
-    100002dc:	00b1282d 	daddu	a1,a1,s1
-    100002e0:	df8580c0 	ld	a1,-32576\(gp\)
-    100002e4:	3c010002 	lui	at,0x2
-    100002e8:	6421e240 	daddiu	at,at,-7616
-    100002ec:	00a1282d 	daddu	a1,a1,at
-    100002f0:	00b1282d 	daddu	a1,a1,s1
-    100002f4:	df8580c0 	ld	a1,-32576\(gp\)
-    100002f8:	dca50000 	ld	a1,0\(a1\)
-    100002fc:	df8580c0 	ld	a1,-32576\(gp\)
-    10000300:	dca5000c 	ld	a1,12\(a1\)
-    10000304:	df8580c0 	ld	a1,-32576\(gp\)
-    10000308:	00b1282d 	daddu	a1,a1,s1
-    1000030c:	dca50000 	ld	a1,0\(a1\)
-    10000310:	df8580c0 	ld	a1,-32576\(gp\)
-    10000314:	00b1282d 	daddu	a1,a1,s1
-    10000318:	dca5000c 	ld	a1,12\(a1\)
-    1000031c:	df8180c0 	ld	at,-32576\(gp\)
-    10000320:	0025082d 	daddu	at,at,a1
-    10000324:	dc250022 	ld	a1,34\(at\)
-    10000328:	df8180c0 	ld	at,-32576\(gp\)
-    1000032c:	0025082d 	daddu	at,at,a1
-    10000330:	fc250038 	sd	a1,56\(at\)
-    10000334:	df8180c0 	ld	at,-32576\(gp\)
-    10000338:	88250000 	lwl	a1,0\(at\)
-    1000033c:	98250003 	lwr	a1,3\(at\)
-    10000340:	df8180c0 	ld	at,-32576\(gp\)
-    10000344:	6421000c 	daddiu	at,at,12
-    10000348:	88250000 	lwl	a1,0\(at\)
-    1000034c:	98250003 	lwr	a1,3\(at\)
-    10000350:	df8180c0 	ld	at,-32576\(gp\)
-    10000354:	0031082d 	daddu	at,at,s1
-    10000358:	88250000 	lwl	a1,0\(at\)
-    1000035c:	98250003 	lwr	a1,3\(at\)
-    10000360:	df8180c0 	ld	at,-32576\(gp\)
-    10000364:	6421000c 	daddiu	at,at,12
-    10000368:	0031082d 	daddu	at,at,s1
-    1000036c:	88250000 	lwl	a1,0\(at\)
-    10000370:	98250003 	lwr	a1,3\(at\)
-    10000374:	df8180c0 	ld	at,-32576\(gp\)
-    10000378:	64210022 	daddiu	at,at,34
-    1000037c:	0025082d 	daddu	at,at,a1
-    10000380:	88250000 	lwl	a1,0\(at\)
-    10000384:	98250003 	lwr	a1,3\(at\)
-    10000388:	df8180c0 	ld	at,-32576\(gp\)
-    1000038c:	64210038 	daddiu	at,at,56
-    10000390:	0025082d 	daddu	at,at,a1
-    10000394:	a8250000 	swl	a1,0\(at\)
-    10000398:	b8250003 	swr	a1,3\(at\)
-    1000039c:	df858058 	ld	a1,-32680\(gp\)
-    100003a0:	df858060 	ld	a1,-32672\(gp\)
-    100003a4:	df858068 	ld	a1,-32664\(gp\)
-    100003a8:	df858058 	ld	a1,-32680\(gp\)
-    100003ac:	00b1282d 	daddu	a1,a1,s1
-    100003b0:	df858060 	ld	a1,-32672\(gp\)
-    100003b4:	00b1282d 	daddu	a1,a1,s1
-    100003b8:	df858068 	ld	a1,-32664\(gp\)
-    100003bc:	00b1282d 	daddu	a1,a1,s1
-    100003c0:	df858038 	ld	a1,-32712\(gp\)
-    100003c4:	dca505a4 	ld	a1,1444\(a1\)
-    100003c8:	df858038 	ld	a1,-32712\(gp\)
-    100003cc:	dca505b0 	ld	a1,1456\(a1\)
-    100003d0:	df858038 	ld	a1,-32712\(gp\)
-    100003d4:	00b1282d 	daddu	a1,a1,s1
-    100003d8:	dca505a4 	ld	a1,1444\(a1\)
-    100003dc:	df858038 	ld	a1,-32712\(gp\)
-    100003e0:	00b1282d 	daddu	a1,a1,s1
-    100003e4:	dca505b0 	ld	a1,1456\(a1\)
-    100003e8:	df818038 	ld	at,-32712\(gp\)
-    100003ec:	0025082d 	daddu	at,at,a1
-    100003f0:	dc2505c6 	ld	a1,1478\(at\)
-    100003f4:	df818038 	ld	at,-32712\(gp\)
-    100003f8:	0025082d 	daddu	at,at,a1
-    100003fc:	fc2505dc 	sd	a1,1500\(at\)
-    10000400:	df818058 	ld	at,-32680\(gp\)
-    10000404:	88250000 	lwl	a1,0\(at\)
-    10000408:	98250003 	lwr	a1,3\(at\)
-    1000040c:	df818060 	ld	at,-32672\(gp\)
-    10000410:	88250000 	lwl	a1,0\(at\)
-    10000414:	98250003 	lwr	a1,3\(at\)
-    10000418:	df818058 	ld	at,-32680\(gp\)
-    1000041c:	0031082d 	daddu	at,at,s1
-    10000420:	88250000 	lwl	a1,0\(at\)
-    10000424:	98250003 	lwr	a1,3\(at\)
-    10000428:	df818060 	ld	at,-32672\(gp\)
-    1000042c:	0031082d 	daddu	at,at,s1
-    10000430:	88250000 	lwl	a1,0\(at\)
-    10000434:	98250003 	lwr	a1,3\(at\)
-    10000438:	df818070 	ld	at,-32656\(gp\)
-    1000043c:	0025082d 	daddu	at,at,a1
+    10000278:	df818020 	ld	at,-32736\(gp\)
+    1000027c:	0031082d 	daddu	at,at,s1
+    10000280:	88250000 	lwl	a1,0\(at\)
+    10000284:	98250003 	lwr	a1,3\(at\)
+    10000288:	df818030 	ld	at,-32720\(gp\)
+    1000028c:	0031082d 	daddu	at,at,s1
+    10000290:	88250000 	lwl	a1,0\(at\)
+    10000294:	98250003 	lwr	a1,3\(at\)
+    10000298:	df818040 	ld	at,-32704\(gp\)
+    1000029c:	0025082d 	daddu	at,at,a1
+    100002a0:	88250000 	lwl	a1,0\(at\)
+    100002a4:	98250003 	lwr	a1,3\(at\)
+    100002a8:	df818048 	ld	at,-32696\(gp\)
+    100002ac:	0025082d 	daddu	at,at,a1
+    100002b0:	a8250000 	swl	a1,0\(at\)
+    100002b4:	b8250003 	swr	a1,3\(at\)
+    100002b8:	df858050 	ld	a1,-32688\(gp\)
+    100002bc:	df858050 	ld	a1,-32688\(gp\)
+    100002c0:	df998050 	ld	t9,-32688\(gp\)
+    100002c4:	df998050 	ld	t9,-32688\(gp\)
+    100002c8:	df998050 	ld	t9,-32688\(gp\)
+    100002cc:	0411ff90 	bal	10000110 <fn>
+    100002d0:	00000000 	nop
+    100002d4:	df998050 	ld	t9,-32688\(gp\)
+    100002d8:	0411ff8d 	bal	10000110 <fn>
+    100002dc:	00000000 	nop
+    100002e0:	df858058 	ld	a1,-32680\(gp\)
+    100002e4:	df858058 	ld	a1,-32680\(gp\)
+    100002e8:	64a5000c 	daddiu	a1,a1,12
+    100002ec:	df858058 	ld	a1,-32680\(gp\)
+    100002f0:	3c010001 	lui	at,0x1
+    100002f4:	3421e240 	ori	at,at,0xe240
+    100002f8:	00a1282d 	daddu	a1,a1,at
+    100002fc:	df858058 	ld	a1,-32680\(gp\)
+    10000300:	00b1282d 	daddu	a1,a1,s1
+    10000304:	df858058 	ld	a1,-32680\(gp\)
+    10000308:	64a5000c 	daddiu	a1,a1,12
+    1000030c:	00b1282d 	daddu	a1,a1,s1
+    10000310:	df858058 	ld	a1,-32680\(gp\)
+    10000314:	3c010001 	lui	at,0x1
+    10000318:	3421e240 	ori	at,at,0xe240
+    1000031c:	00a1282d 	daddu	a1,a1,at
+    10000320:	00b1282d 	daddu	a1,a1,s1
+    10000324:	df858028 	ld	a1,-32728\(gp\)
+    10000328:	dca505d4 	ld	a1,1492\(a1\)
+    1000032c:	df858028 	ld	a1,-32728\(gp\)
+    10000330:	dca505e0 	ld	a1,1504\(a1\)
+    10000334:	df858028 	ld	a1,-32728\(gp\)
+    10000338:	00b1282d 	daddu	a1,a1,s1
+    1000033c:	dca505d4 	ld	a1,1492\(a1\)
+    10000340:	df858028 	ld	a1,-32728\(gp\)
+    10000344:	00b1282d 	daddu	a1,a1,s1
+    10000348:	dca505e0 	ld	a1,1504\(a1\)
+    1000034c:	df818028 	ld	at,-32728\(gp\)
+    10000350:	0025082d 	daddu	at,at,a1
+    10000354:	dc2505f6 	ld	a1,1526\(at\)
+    10000358:	df818028 	ld	at,-32728\(gp\)
+    1000035c:	0025082d 	daddu	at,at,a1
+    10000360:	fc25060c 	sd	a1,1548\(at\)
+    10000364:	df818058 	ld	at,-32680\(gp\)
+    10000368:	88250000 	lwl	a1,0\(at\)
+    1000036c:	98250003 	lwr	a1,3\(at\)
+    10000370:	df818058 	ld	at,-32680\(gp\)
+    10000374:	6421000c 	daddiu	at,at,12
+    10000378:	88250000 	lwl	a1,0\(at\)
+    1000037c:	98250003 	lwr	a1,3\(at\)
+    10000380:	df818058 	ld	at,-32680\(gp\)
+    10000384:	0031082d 	daddu	at,at,s1
+    10000388:	88250000 	lwl	a1,0\(at\)
+    1000038c:	98250003 	lwr	a1,3\(at\)
+    10000390:	df818058 	ld	at,-32680\(gp\)
+    10000394:	6421000c 	daddiu	at,at,12
+    10000398:	0031082d 	daddu	at,at,s1
+    1000039c:	88250000 	lwl	a1,0\(at\)
+    100003a0:	98250003 	lwr	a1,3\(at\)
+    100003a4:	df818058 	ld	at,-32680\(gp\)
+    100003a8:	64210022 	daddiu	at,at,34
+    100003ac:	0025082d 	daddu	at,at,a1
+    100003b0:	88250000 	lwl	a1,0\(at\)
+    100003b4:	98250003 	lwr	a1,3\(at\)
+    100003b8:	df818058 	ld	at,-32680\(gp\)
+    100003bc:	64210038 	daddiu	at,at,56
+    100003c0:	0025082d 	daddu	at,at,a1
+    100003c4:	a8250000 	swl	a1,0\(at\)
+    100003c8:	b8250003 	swr	a1,3\(at\)
+    100003cc:	df858058 	ld	a1,-32680\(gp\)
+    100003d0:	df858060 	ld	a1,-32672\(gp\)
+    100003d4:	df858068 	ld	a1,-32664\(gp\)
+    100003d8:	df858058 	ld	a1,-32680\(gp\)
+    100003dc:	00b1282d 	daddu	a1,a1,s1
+    100003e0:	df858060 	ld	a1,-32672\(gp\)
+    100003e4:	00b1282d 	daddu	a1,a1,s1
+    100003e8:	df858068 	ld	a1,-32664\(gp\)
+    100003ec:	00b1282d 	daddu	a1,a1,s1
+    100003f0:	df858028 	ld	a1,-32728\(gp\)
+    100003f4:	dca505d4 	ld	a1,1492\(a1\)
+    100003f8:	df858028 	ld	a1,-32728\(gp\)
+    100003fc:	dca505e0 	ld	a1,1504\(a1\)
+    10000400:	df858028 	ld	a1,-32728\(gp\)
+    10000404:	00b1282d 	daddu	a1,a1,s1
+    10000408:	dca505d4 	ld	a1,1492\(a1\)
+    1000040c:	df858028 	ld	a1,-32728\(gp\)
+    10000410:	00b1282d 	daddu	a1,a1,s1
+    10000414:	dca505e0 	ld	a1,1504\(a1\)
+    10000418:	df818028 	ld	at,-32728\(gp\)
+    1000041c:	0025082d 	daddu	at,at,a1
+    10000420:	dc2505f6 	ld	a1,1526\(at\)
+    10000424:	df818028 	ld	at,-32728\(gp\)
+    10000428:	0025082d 	daddu	at,at,a1
+    1000042c:	fc25060c 	sd	a1,1548\(at\)
+    10000430:	df818058 	ld	at,-32680\(gp\)
+    10000434:	88250000 	lwl	a1,0\(at\)
+    10000438:	98250003 	lwr	a1,3\(at\)
+    1000043c:	df818060 	ld	at,-32672\(gp\)
     10000440:	88250000 	lwl	a1,0\(at\)
     10000444:	98250003 	lwr	a1,3\(at\)
-    10000448:	df818078 	ld	at,-32648\(gp\)
-    1000044c:	0025082d 	daddu	at,at,a1
-    10000450:	a8250000 	swl	a1,0\(at\)
-    10000454:	b8250003 	swr	a1,3\(at\)
-    10000458:	df8580b0 	ld	a1,-32592\(gp\)
-    1000045c:	df858080 	ld	a1,-32640\(gp\)
-    10000460:	df9980b0 	ld	t9,-32592\(gp\)
-    10000464:	df998080 	ld	t9,-32640\(gp\)
-    10000468:	df9980b0 	ld	t9,-32592\(gp\)
-    1000046c:	0320f809 	jalr	t9
-    10000470:	00000000 	nop
-    10000474:	df998080 	ld	t9,-32640\(gp\)
-    10000478:	0320f809 	jalr	t9
-    1000047c:	00000000 	nop
-    10000480:	1000ff17 	b	100000e0 <fn>
-    10000484:	df8580b8 	ld	a1,-32584\(gp\)
-    10000488:	df8580c0 	ld	a1,-32576\(gp\)
-    1000048c:	10000015 	b	100004e4 <fn2>
-    10000490:	dca50000 	ld	a1,0\(a1\)
-    10000494:	1000ff12 	b	100000e0 <fn>
-    10000498:	df858020 	ld	a1,-32736\(gp\)
-    1000049c:	df858060 	ld	a1,-32672\(gp\)
-    100004a0:	10000010 	b	100004e4 <fn2>
-    100004a4:	00000000 	nop
-    100004a8:	df858030 	ld	a1,-32720\(gp\)
-    100004ac:	1000ff0c 	b	100000e0 <fn>
-    100004b0:	00000000 	nop
-    100004b4:	df858038 	ld	a1,-32712\(gp\)
-    100004b8:	1000000a 	b	100004e4 <fn2>
-    100004bc:	dca505a4 	ld	a1,1444\(a1\)
-    100004c0:	df858038 	ld	a1,-32712\(gp\)
-    100004c4:	1000ff06 	b	100000e0 <fn>
-    100004c8:	dca50538 	ld	a1,1336\(a1\)
-    100004cc:	df818038 	ld	at,-32712\(gp\)
-    100004d0:	0025082d 	daddu	at,at,a1
-    100004d4:	10000003 	b	100004e4 <fn2>
-    100004d8:	dc2505c6 	ld	a1,1478\(at\)
+    10000448:	df818058 	ld	at,-32680\(gp\)
+    1000044c:	0031082d 	daddu	at,at,s1
+    10000450:	88250000 	lwl	a1,0\(at\)
+    10000454:	98250003 	lwr	a1,3\(at\)
+    10000458:	df818060 	ld	at,-32672\(gp\)
+    1000045c:	0031082d 	daddu	at,at,s1
+    10000460:	88250000 	lwl	a1,0\(at\)
+    10000464:	98250003 	lwr	a1,3\(at\)
+    10000468:	df818070 	ld	at,-32656\(gp\)
+    1000046c:	0025082d 	daddu	at,at,a1
+    10000470:	88250000 	lwl	a1,0\(at\)
+    10000474:	98250003 	lwr	a1,3\(at\)
+    10000478:	df818078 	ld	at,-32648\(gp\)
+    1000047c:	0025082d 	daddu	at,at,a1
+    10000480:	a8250000 	swl	a1,0\(at\)
+    10000484:	b8250003 	swr	a1,3\(at\)
+    10000488:	df858080 	ld	a1,-32640\(gp\)
+    1000048c:	df858080 	ld	a1,-32640\(gp\)
+    10000490:	df998080 	ld	t9,-32640\(gp\)
+    10000494:	df998080 	ld	t9,-32640\(gp\)
+    10000498:	df998080 	ld	t9,-32640\(gp\)
+    1000049c:	0411001d 	bal	10000514 <fn2>
+    100004a0:	00000000 	nop
+    100004a4:	df998080 	ld	t9,-32640\(gp\)
+    100004a8:	0411001a 	bal	10000514 <fn2>
+    100004ac:	00000000 	nop
+    100004b0:	1000ff17 	b	10000110 <fn>
+    100004b4:	df858020 	ld	a1,-32736\(gp\)
+    100004b8:	df858028 	ld	a1,-32728\(gp\)
+    100004bc:	10000015 	b	10000514 <fn2>
+    100004c0:	dca505d4 	ld	a1,1492\(a1\)
+    100004c4:	1000ff12 	b	10000110 <fn>
+    100004c8:	df858020 	ld	a1,-32736\(gp\)
+    100004cc:	df858060 	ld	a1,-32672\(gp\)
+    100004d0:	10000010 	b	10000514 <fn2>
+    100004d4:	00000000 	nop
+    100004d8:	df858038 	ld	a1,-32712\(gp\)
+    100004dc:	1000ff0c 	b	10000110 <fn>
+    100004e0:	00000000 	nop
+    100004e4:	df858028 	ld	a1,-32728\(gp\)
+    100004e8:	1000000a 	b	10000514 <fn2>
+    100004ec:	dca505d4 	ld	a1,1492\(a1\)
+    100004f0:	df858028 	ld	a1,-32728\(gp\)
+    100004f4:	1000ff06 	b	10000110 <fn>
+    100004f8:	dca50568 	ld	a1,1384\(a1\)
+    100004fc:	df818028 	ld	at,-32728\(gp\)
+    10000500:	0025082d 	daddu	at,at,a1
+    10000504:	10000003 	b	10000514 <fn2>
+    10000508:	dc2505f6 	ld	a1,1526\(at\)
 	\.\.\.
 
-00000000100004e4 <fn2>:
+0000000010000514 <fn2>:
 	\.\.\.
 Disassembly of section \.data:
 
-00000000101004f0 <_fdata>:
+0000000010010520 <_fdata>:
 	\.\.\.
 
-000000001010052c <dg1>:
+000000001001055c <dg1>:
 	\.\.\.
 
-0000000010100568 <sp2>:
+0000000010010598 <sp2>:
 	\.\.\.
 
-00000000101005a4 <dg2>:
+00000000100105d4 <dg2>:
 	\.\.\.
 Disassembly of section \.got:
 
-00000000101005e0 <_GLOBAL_OFFSET_TABLE_>:
+0000000010010610 <_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
-    101005e8:	80000000 	.*
-    101005ec:	00000000 	.*
-    101005f0:	00000000 	.*
-    101005f4:	1010052c 	.*
-    101005f8:	00000000 	.*
-    101005fc:	10100538 	.*
-    10100600:	00000000 	.*
-    10100604:	1011e76c 	.*
-    10100608:	00000000 	.*
-    1010060c:	10100000 	.*
-    10100610:	00000000 	.*
-    10100614:	1010054e 	.*
-    10100618:	00000000 	.*
-    1010061c:	10100564 	.*
-    10100620:	00000000 	.*
-    10100624:	100000e0 	.*
-    10100628:	00000000 	.*
-    1010062c:	101005a4 	.*
-    10100630:	00000000 	.*
-    10100634:	101005b0 	.*
-    10100638:	00000000 	.*
-    1010063c:	1011e7e4 	.*
-    10100640:	00000000 	.*
-    10100644:	101005c6 	.*
-    10100648:	00000000 	.*
-    1010064c:	101005dc 	.*
-    10100650:	00000000 	.*
-    10100654:	100004e4 	.*
-    10100658:	00000000 	.*
+    10010618:	80000000 	.*
+	\.\.\.
+    10010624:	1001055c 	.*
+    10010628:	00000000 	.*
+    1001062c:	10010000 	.*
+    10010630:	00000000 	.*
+    10010634:	10010568 	.*
+    10010638:	00000000 	.*
+    1001063c:	1002e79c 	.*
+    10010640:	00000000 	.*
+    10010644:	1001057e 	.*
+    10010648:	00000000 	.*
+    1001064c:	10010594 	.*
+    10010650:	00000000 	.*
+    10010654:	10000110 	.*
+    10010658:	00000000 	.*
+    1001065c:	100105d4 	.*
+    10010660:	00000000 	.*
+    10010664:	100105e0 	.*
+    10010668:	00000000 	.*
+    1001066c:	1002e814 	.*
+    10010670:	00000000 	.*
+    10010674:	100105f6 	.*
+    10010678:	00000000 	.*
+    1001067c:	1001060c 	.*
+    10010680:	00000000 	.*
+    10010684:	10000514 	.*
+    10010688:	00000000 	.*
 	\.\.\.
-    1010067c:	100000e0 	.*
-    10100680:	00000000 	.*
-    10100684:	100004e4 	.*
-    10100688:	00000000 	.*
-    1010068c:	1010052c 	.*
-    10100690:	00000000 	.*
-    10100694:	101005a4 	.*
diff --git a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32-embed.d b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32-embed.d
new file mode 100644
index 0000000..edcbbf0
--- /dev/null
+++ b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32-embed.d
@@ -0,0 +1,434 @@
+#name: MIPS ELF xgot reloc n32
+#as: -EB -n32 -KPIC -xgot
+#source: ../../../gas/testsuite/gas/mips/elf-rel-got-n32.s
+#ld:
+#objdump: -D --show-raw-insn
+
+.*: +file format elf32-n.*mips.*
+
+Disassembly of section \.reginfo:
+
+10000078 <\.reginfo>:
+10000078:	92020022 	.*
+	\.\.\.
+1000008c:	10018760 	.*
+
+Disassembly of section \.text:
+
+10000074 <fn>:
+10000074:	3c050000 	lui	a1,0x0
+10000078:	00bc2821 	addu	a1,a1,gp
+1000007c:	8ca58018 	lw	a1,-32744\(a1\)
+10000080:	3c050000 	lui	a1,0x0
+10000084:	00bc2821 	addu	a1,a1,gp
+10000088:	8ca58018 	lw	a1,-32744\(a1\)
+1000008c:	24a5000c 	addiu	a1,a1,12
+10000090:	3c050000 	lui	a1,0x0
+10000094:	00bc2821 	addu	a1,a1,gp
+10000098:	8ca58018 	lw	a1,-32744\(a1\)
+1000009c:	3c010001 	lui	at,0x1
+100000a0:	3421e240 	ori	at,at,0xe240
+100000a4:	00a12821 	addu	a1,a1,at
+100000a8:	3c050000 	lui	a1,0x0
+100000ac:	00bc2821 	addu	a1,a1,gp
+100000b0:	8ca58018 	lw	a1,-32744\(a1\)
+100000b4:	00b12821 	addu	a1,a1,s1
+100000b8:	3c050000 	lui	a1,0x0
+100000bc:	00bc2821 	addu	a1,a1,gp
+100000c0:	8ca58018 	lw	a1,-32744\(a1\)
+100000c4:	24a5000c 	addiu	a1,a1,12
+100000c8:	00b12821 	addu	a1,a1,s1
+100000cc:	3c050000 	lui	a1,0x0
+100000d0:	00bc2821 	addu	a1,a1,gp
+100000d4:	8ca58018 	lw	a1,-32744\(a1\)
+100000d8:	3c010001 	lui	at,0x1
+100000dc:	3421e240 	ori	at,at,0xe240
+100000e0:	00a12821 	addu	a1,a1,at
+100000e4:	00b12821 	addu	a1,a1,s1
+100000e8:	3c050000 	lui	a1,0x0
+100000ec:	00bc2821 	addu	a1,a1,gp
+100000f0:	8ca58018 	lw	a1,-32744\(a1\)
+100000f4:	8ca50000 	lw	a1,0\(a1\)
+100000f8:	3c050000 	lui	a1,0x0
+100000fc:	00bc2821 	addu	a1,a1,gp
+10000100:	8ca58018 	lw	a1,-32744\(a1\)
+10000104:	8ca5000c 	lw	a1,12\(a1\)
+10000108:	3c050000 	lui	a1,0x0
+1000010c:	00bc2821 	addu	a1,a1,gp
+10000110:	8ca58018 	lw	a1,-32744\(a1\)
+10000114:	00b12821 	addu	a1,a1,s1
+10000118:	8ca50000 	lw	a1,0\(a1\)
+1000011c:	3c050000 	lui	a1,0x0
+10000120:	00bc2821 	addu	a1,a1,gp
+10000124:	8ca58018 	lw	a1,-32744\(a1\)
+10000128:	00b12821 	addu	a1,a1,s1
+1000012c:	8ca5000c 	lw	a1,12\(a1\)
+10000130:	3c010000 	lui	at,0x0
+10000134:	003c0821 	addu	at,at,gp
+10000138:	8c218018 	lw	at,-32744\(at\)
+1000013c:	00250821 	addu	at,at,a1
+10000140:	8c250022 	lw	a1,34\(at\)
+10000144:	3c010000 	lui	at,0x0
+10000148:	003c0821 	addu	at,at,gp
+1000014c:	8c218018 	lw	at,-32744\(at\)
+10000150:	00250821 	addu	at,at,a1
+10000154:	ac250038 	sw	a1,56\(at\)
+10000158:	3c010000 	lui	at,0x0
+1000015c:	003c0821 	addu	at,at,gp
+10000160:	8c218018 	lw	at,-32744\(at\)
+10000164:	88250000 	lwl	a1,0\(at\)
+10000168:	98250003 	lwr	a1,3\(at\)
+1000016c:	3c010000 	lui	at,0x0
+10000170:	003c0821 	addu	at,at,gp
+10000174:	8c218018 	lw	at,-32744\(at\)
+10000178:	2421000c 	addiu	at,at,12
+1000017c:	88250000 	lwl	a1,0\(at\)
+10000180:	98250003 	lwr	a1,3\(at\)
+10000184:	3c010000 	lui	at,0x0
+10000188:	003c0821 	addu	at,at,gp
+1000018c:	8c218018 	lw	at,-32744\(at\)
+10000190:	00310821 	addu	at,at,s1
+10000194:	88250000 	lwl	a1,0\(at\)
+10000198:	98250003 	lwr	a1,3\(at\)
+1000019c:	3c010000 	lui	at,0x0
+100001a0:	003c0821 	addu	at,at,gp
+100001a4:	8c218018 	lw	at,-32744\(at\)
+100001a8:	2421000c 	addiu	at,at,12
+100001ac:	00310821 	addu	at,at,s1
+100001b0:	88250000 	lwl	a1,0\(at\)
+100001b4:	98250003 	lwr	a1,3\(at\)
+100001b8:	3c010000 	lui	at,0x0
+100001bc:	003c0821 	addu	at,at,gp
+100001c0:	8c218018 	lw	at,-32744\(at\)
+100001c4:	24210022 	addiu	at,at,34
+100001c8:	00250821 	addu	at,at,a1
+100001cc:	88250000 	lwl	a1,0\(at\)
+100001d0:	98250003 	lwr	a1,3\(at\)
+100001d4:	3c010000 	lui	at,0x0
+100001d8:	003c0821 	addu	at,at,gp
+100001dc:	8c218018 	lw	at,-32744\(at\)
+100001e0:	24210038 	addiu	at,at,56
+100001e4:	00250821 	addu	at,at,a1
+100001e8:	a8250000 	swl	a1,0\(at\)
+100001ec:	b8250003 	swr	a1,3\(at\)
+100001f0:	8f85801c 	lw	a1,-32740\(gp\)
+100001f4:	24a506b8 	addiu	a1,a1,1720
+100001f8:	8f85801c 	lw	a1,-32740\(gp\)
+100001fc:	24a506c4 	addiu	a1,a1,1732
+10000200:	8f858020 	lw	a1,-32736\(gp\)
+10000204:	24a5e8f8 	addiu	a1,a1,-5896
+10000208:	8f85801c 	lw	a1,-32740\(gp\)
+1000020c:	24a506b8 	addiu	a1,a1,1720
+10000210:	00b12821 	addu	a1,a1,s1
+10000214:	8f85801c 	lw	a1,-32740\(gp\)
+10000218:	24a506c4 	addiu	a1,a1,1732
+1000021c:	00b12821 	addu	a1,a1,s1
+10000220:	8f858020 	lw	a1,-32736\(gp\)
+10000224:	24a5e8f8 	addiu	a1,a1,-5896
+10000228:	00b12821 	addu	a1,a1,s1
+1000022c:	8f85801c 	lw	a1,-32740\(gp\)
+10000230:	8ca506b8 	lw	a1,1720\(a1\)
+10000234:	8f85801c 	lw	a1,-32740\(gp\)
+10000238:	8ca506c4 	lw	a1,1732\(a1\)
+1000023c:	8f85801c 	lw	a1,-32740\(gp\)
+10000240:	00b12821 	addu	a1,a1,s1
+10000244:	8ca506b8 	lw	a1,1720\(a1\)
+10000248:	8f85801c 	lw	a1,-32740\(gp\)
+1000024c:	00b12821 	addu	a1,a1,s1
+10000250:	8ca506c4 	lw	a1,1732\(a1\)
+10000254:	8f81801c 	lw	at,-32740\(gp\)
+10000258:	00250821 	addu	at,at,a1
+1000025c:	8c2506da 	lw	a1,1754\(at\)
+10000260:	8f81801c 	lw	at,-32740\(gp\)
+10000264:	00250821 	addu	at,at,a1
+10000268:	ac2506f0 	sw	a1,1776\(at\)
+1000026c:	8f81801c 	lw	at,-32740\(gp\)
+10000270:	242106b8 	addiu	at,at,1720
+10000274:	88250000 	lwl	a1,0\(at\)
+10000278:	98250003 	lwr	a1,3\(at\)
+1000027c:	8f81801c 	lw	at,-32740\(gp\)
+10000280:	242106c4 	addiu	at,at,1732
+10000284:	88250000 	lwl	a1,0\(at\)
+10000288:	98250003 	lwr	a1,3\(at\)
+1000028c:	8f81801c 	lw	at,-32740\(gp\)
+10000290:	242106b8 	addiu	at,at,1720
+10000294:	00310821 	addu	at,at,s1
+10000298:	88250000 	lwl	a1,0\(at\)
+1000029c:	98250003 	lwr	a1,3\(at\)
+100002a0:	8f81801c 	lw	at,-32740\(gp\)
+100002a4:	242106c4 	addiu	at,at,1732
+100002a8:	00310821 	addu	at,at,s1
+100002ac:	88250000 	lwl	a1,0\(at\)
+100002b0:	98250003 	lwr	a1,3\(at\)
+100002b4:	8f81801c 	lw	at,-32740\(gp\)
+100002b8:	242106da 	addiu	at,at,1754
+100002bc:	00250821 	addu	at,at,a1
+100002c0:	88250000 	lwl	a1,0\(at\)
+100002c4:	98250003 	lwr	a1,3\(at\)
+100002c8:	8f81801c 	lw	at,-32740\(gp\)
+100002cc:	242106f0 	addiu	at,at,1776
+100002d0:	00250821 	addu	at,at,a1
+100002d4:	a8250000 	swl	a1,0\(at\)
+100002d8:	b8250003 	swr	a1,3\(at\)
+100002dc:	3c050000 	lui	a1,0x0
+100002e0:	00bc2821 	addu	a1,a1,gp
+100002e4:	8ca58024 	lw	a1,-32732\(a1\)
+100002e8:	8f858028 	lw	a1,-32728\(gp\)
+100002ec:	24a50074 	addiu	a1,a1,116
+100002f0:	3c190000 	lui	t9,0x0
+100002f4:	033cc821 	addu	t9,t9,gp
+100002f8:	8f398024 	lw	t9,-32732\(t9\)
+100002fc:	8f998028 	lw	t9,-32728\(gp\)
+10000300:	27390074 	addiu	t9,t9,116
+10000304:	3c190000 	lui	t9,0x0
+10000308:	033cc821 	addu	t9,t9,gp
+1000030c:	8f398024 	lw	t9,-32732\(t9\)
+10000310:	0411ff58 	bal	10000074 <fn>
+10000314:	00000000 	nop
+10000318:	8f998028 	lw	t9,-32728\(gp\)
+1000031c:	27390074 	addiu	t9,t9,116
+10000320:	0411ff54 	bal	10000074 <fn>
+10000324:	00000000 	nop
+10000328:	3c050000 	lui	a1,0x0
+1000032c:	00bc2821 	addu	a1,a1,gp
+10000330:	8ca5802c 	lw	a1,-32724\(a1\)
+10000334:	3c050000 	lui	a1,0x0
+10000338:	00bc2821 	addu	a1,a1,gp
+1000033c:	8ca5802c 	lw	a1,-32724\(a1\)
+10000340:	24a5000c 	addiu	a1,a1,12
+10000344:	3c050000 	lui	a1,0x0
+10000348:	00bc2821 	addu	a1,a1,gp
+1000034c:	8ca5802c 	lw	a1,-32724\(a1\)
+10000350:	3c010001 	lui	at,0x1
+10000354:	3421e240 	ori	at,at,0xe240
+10000358:	00a12821 	addu	a1,a1,at
+1000035c:	3c050000 	lui	a1,0x0
+10000360:	00bc2821 	addu	a1,a1,gp
+10000364:	8ca5802c 	lw	a1,-32724\(a1\)
+10000368:	00b12821 	addu	a1,a1,s1
+1000036c:	3c050000 	lui	a1,0x0
+10000370:	00bc2821 	addu	a1,a1,gp
+10000374:	8ca5802c 	lw	a1,-32724\(a1\)
+10000378:	24a5000c 	addiu	a1,a1,12
+1000037c:	00b12821 	addu	a1,a1,s1
+10000380:	3c050000 	lui	a1,0x0
+10000384:	00bc2821 	addu	a1,a1,gp
+10000388:	8ca5802c 	lw	a1,-32724\(a1\)
+1000038c:	3c010001 	lui	at,0x1
+10000390:	3421e240 	ori	at,at,0xe240
+10000394:	00a12821 	addu	a1,a1,at
+10000398:	00b12821 	addu	a1,a1,s1
+1000039c:	3c050000 	lui	a1,0x0
+100003a0:	00bc2821 	addu	a1,a1,gp
+100003a4:	8ca5802c 	lw	a1,-32724\(a1\)
+100003a8:	8ca50000 	lw	a1,0\(a1\)
+100003ac:	3c050000 	lui	a1,0x0
+100003b0:	00bc2821 	addu	a1,a1,gp
+100003b4:	8ca5802c 	lw	a1,-32724\(a1\)
+100003b8:	8ca5000c 	lw	a1,12\(a1\)
+100003bc:	3c050000 	lui	a1,0x0
+100003c0:	00bc2821 	addu	a1,a1,gp
+100003c4:	8ca5802c 	lw	a1,-32724\(a1\)
+100003c8:	00b12821 	addu	a1,a1,s1
+100003cc:	8ca50000 	lw	a1,0\(a1\)
+100003d0:	3c050000 	lui	a1,0x0
+100003d4:	00bc2821 	addu	a1,a1,gp
+100003d8:	8ca5802c 	lw	a1,-32724\(a1\)
+100003dc:	00b12821 	addu	a1,a1,s1
+100003e0:	8ca5000c 	lw	a1,12\(a1\)
+100003e4:	3c010000 	lui	at,0x0
+100003e8:	003c0821 	addu	at,at,gp
+100003ec:	8c21802c 	lw	at,-32724\(at\)
+100003f0:	00250821 	addu	at,at,a1
+100003f4:	8c250022 	lw	a1,34\(at\)
+100003f8:	3c010000 	lui	at,0x0
+100003fc:	003c0821 	addu	at,at,gp
+10000400:	8c21802c 	lw	at,-32724\(at\)
+10000404:	00250821 	addu	at,at,a1
+10000408:	ac250038 	sw	a1,56\(at\)
+1000040c:	3c010000 	lui	at,0x0
+10000410:	003c0821 	addu	at,at,gp
+10000414:	8c21802c 	lw	at,-32724\(at\)
+10000418:	88250000 	lwl	a1,0\(at\)
+1000041c:	98250003 	lwr	a1,3\(at\)
+10000420:	3c010000 	lui	at,0x0
+10000424:	003c0821 	addu	at,at,gp
+10000428:	8c21802c 	lw	at,-32724\(at\)
+1000042c:	2421000c 	addiu	at,at,12
+10000430:	88250000 	lwl	a1,0\(at\)
+10000434:	98250003 	lwr	a1,3\(at\)
+10000438:	3c010000 	lui	at,0x0
+1000043c:	003c0821 	addu	at,at,gp
+10000440:	8c21802c 	lw	at,-32724\(at\)
+10000444:	00310821 	addu	at,at,s1
+10000448:	88250000 	lwl	a1,0\(at\)
+1000044c:	98250003 	lwr	a1,3\(at\)
+10000450:	3c010000 	lui	at,0x0
+10000454:	003c0821 	addu	at,at,gp
+10000458:	8c21802c 	lw	at,-32724\(at\)
+1000045c:	2421000c 	addiu	at,at,12
+10000460:	00310821 	addu	at,at,s1
+10000464:	88250000 	lwl	a1,0\(at\)
+10000468:	98250003 	lwr	a1,3\(at\)
+1000046c:	3c010000 	lui	at,0x0
+10000470:	003c0821 	addu	at,at,gp
+10000474:	8c21802c 	lw	at,-32724\(at\)
+10000478:	24210022 	addiu	at,at,34
+1000047c:	00250821 	addu	at,at,a1
+10000480:	88250000 	lwl	a1,0\(at\)
+10000484:	98250003 	lwr	a1,3\(at\)
+10000488:	3c010000 	lui	at,0x0
+1000048c:	003c0821 	addu	at,at,gp
+10000490:	8c21802c 	lw	at,-32724\(at\)
+10000494:	24210038 	addiu	at,at,56
+10000498:	00250821 	addu	at,at,a1
+1000049c:	a8250000 	swl	a1,0\(at\)
+100004a0:	b8250003 	swr	a1,3\(at\)
+100004a4:	8f85801c 	lw	a1,-32740\(gp\)
+100004a8:	24a50730 	addiu	a1,a1,1840
+100004ac:	8f85801c 	lw	a1,-32740\(gp\)
+100004b0:	24a5073c 	addiu	a1,a1,1852
+100004b4:	8f858020 	lw	a1,-32736\(gp\)
+100004b8:	24a5e970 	addiu	a1,a1,-5776
+100004bc:	8f85801c 	lw	a1,-32740\(gp\)
+100004c0:	24a50730 	addiu	a1,a1,1840
+100004c4:	00b12821 	addu	a1,a1,s1
+100004c8:	8f85801c 	lw	a1,-32740\(gp\)
+100004cc:	24a5073c 	addiu	a1,a1,1852
+100004d0:	00b12821 	addu	a1,a1,s1
+100004d4:	8f858020 	lw	a1,-32736\(gp\)
+100004d8:	24a5e970 	addiu	a1,a1,-5776
+100004dc:	00b12821 	addu	a1,a1,s1
+100004e0:	8f85801c 	lw	a1,-32740\(gp\)
+100004e4:	8ca50730 	lw	a1,1840\(a1\)
+100004e8:	8f85801c 	lw	a1,-32740\(gp\)
+100004ec:	8ca5073c 	lw	a1,1852\(a1\)
+100004f0:	8f85801c 	lw	a1,-32740\(gp\)
+100004f4:	00b12821 	addu	a1,a1,s1
+100004f8:	8ca50730 	lw	a1,1840\(a1\)
+100004fc:	8f85801c 	lw	a1,-32740\(gp\)
+10000500:	00b12821 	addu	a1,a1,s1
+10000504:	8ca5073c 	lw	a1,1852\(a1\)
+10000508:	8f81801c 	lw	at,-32740\(gp\)
+1000050c:	00250821 	addu	at,at,a1
+10000510:	8c250752 	lw	a1,1874\(at\)
+10000514:	8f81801c 	lw	at,-32740\(gp\)
+10000518:	00250821 	addu	at,at,a1
+1000051c:	ac250768 	sw	a1,1896\(at\)
+10000520:	8f81801c 	lw	at,-32740\(gp\)
+10000524:	24210730 	addiu	at,at,1840
+10000528:	88250000 	lwl	a1,0\(at\)
+1000052c:	98250003 	lwr	a1,3\(at\)
+10000530:	8f81801c 	lw	at,-32740\(gp\)
+10000534:	2421073c 	addiu	at,at,1852
+10000538:	88250000 	lwl	a1,0\(at\)
+1000053c:	98250003 	lwr	a1,3\(at\)
+10000540:	8f81801c 	lw	at,-32740\(gp\)
+10000544:	24210730 	addiu	at,at,1840
+10000548:	00310821 	addu	at,at,s1
+1000054c:	88250000 	lwl	a1,0\(at\)
+10000550:	98250003 	lwr	a1,3\(at\)
+10000554:	8f81801c 	lw	at,-32740\(gp\)
+10000558:	2421073c 	addiu	at,at,1852
+1000055c:	00310821 	addu	at,at,s1
+10000560:	88250000 	lwl	a1,0\(at\)
+10000564:	98250003 	lwr	a1,3\(at\)
+10000568:	8f81801c 	lw	at,-32740\(gp\)
+1000056c:	24210752 	addiu	at,at,1874
+10000570:	00250821 	addu	at,at,a1
+10000574:	88250000 	lwl	a1,0\(at\)
+10000578:	98250003 	lwr	a1,3\(at\)
+1000057c:	8f81801c 	lw	at,-32740\(gp\)
+10000580:	24210768 	addiu	at,at,1896
+10000584:	00250821 	addu	at,at,a1
+10000588:	a8250000 	swl	a1,0\(at\)
+1000058c:	b8250003 	swr	a1,3\(at\)
+10000590:	3c050000 	lui	a1,0x0
+10000594:	00bc2821 	addu	a1,a1,gp
+10000598:	8ca58030 	lw	a1,-32720\(a1\)
+1000059c:	8f858028 	lw	a1,-32728\(gp\)
+100005a0:	24a50674 	addiu	a1,a1,1652
+100005a4:	3c190000 	lui	t9,0x0
+100005a8:	033cc821 	addu	t9,t9,gp
+100005ac:	8f398030 	lw	t9,-32720\(t9\)
+100005b0:	8f998028 	lw	t9,-32728\(gp\)
+100005b4:	27390674 	addiu	t9,t9,1652
+100005b8:	3c190000 	lui	t9,0x0
+100005bc:	033cc821 	addu	t9,t9,gp
+100005c0:	8f398030 	lw	t9,-32720\(t9\)
+100005c4:	0411002b 	bal	10000674 <fn2>
+100005c8:	00000000 	nop
+100005cc:	8f998028 	lw	t9,-32728\(gp\)
+100005d0:	27390674 	addiu	t9,t9,1652
+100005d4:	04110027 	bal	10000674 <fn2>
+100005d8:	00000000 	nop
+100005dc:	3c050000 	lui	a1,0x0
+100005e0:	00bc2821 	addu	a1,a1,gp
+100005e4:	8ca58018 	lw	a1,-32744\(a1\)
+100005e8:	1000fea2 	b	10000074 <fn>
+100005ec:	00000000 	nop
+100005f0:	3c050000 	lui	a1,0x0
+100005f4:	00bc2821 	addu	a1,a1,gp
+100005f8:	8ca5802c 	lw	a1,-32724\(a1\)
+100005fc:	8ca50000 	lw	a1,0\(a1\)
+10000600:	1000001c 	b	10000674 <fn2>
+10000604:	00000000 	nop
+10000608:	8f85801c 	lw	a1,-32740\(gp\)
+1000060c:	24a506b8 	addiu	a1,a1,1720
+10000610:	1000fe98 	b	10000074 <fn>
+10000614:	00000000 	nop
+10000618:	8f85801c 	lw	a1,-32740\(gp\)
+1000061c:	24a5073c 	addiu	a1,a1,1852
+10000620:	10000014 	b	10000674 <fn2>
+10000624:	00000000 	nop
+10000628:	8f858020 	lw	a1,-32736\(gp\)
+1000062c:	24a5e8f8 	addiu	a1,a1,-5896
+10000630:	1000fe90 	b	10000074 <fn>
+10000634:	00000000 	nop
+10000638:	8f85801c 	lw	a1,-32740\(gp\)
+1000063c:	8ca50730 	lw	a1,1840\(a1\)
+10000640:	1000000c 	b	10000674 <fn2>
+10000644:	00000000 	nop
+10000648:	8f85801c 	lw	a1,-32740\(gp\)
+1000064c:	8ca506c4 	lw	a1,1732\(a1\)
+10000650:	1000fe88 	b	10000074 <fn>
+10000654:	00000000 	nop
+10000658:	8f81801c 	lw	at,-32740\(gp\)
+1000065c:	00250821 	addu	at,at,a1
+10000660:	8c250752 	lw	a1,1874\(at\)
+10000664:	10000003 	b	10000674 <fn2>
+10000668:	00000000 	nop
+	\.\.\.
+
+10000674 <fn2>:
+	\.\.\.
+
+Disassembly of section \.data:
+
+1001067c <_fdata>:
+	\.\.\.
+
+100106b8 <dg1>:
+	\.\.\.
+
+100106f4 <sp2>:
+	\.\.\.
+
+10010730 <dg2>:
+	\.\.\.
+
+Disassembly of section \.got:
+
+10010770 <_GLOBAL_OFFSET_TABLE_>:
+10010770:	00000000 	.*
+10010774:	80000000 	.*
+10010778:	100106b8 	.*
+1001077c:	10010000 	.*
+10010780:	10030000 	.*
+10010784:	10000074 	.*
+10010788:	10000000 	.*
+1001078c:	10010730 	.*
+10010790:	10000674 	.*
+10010794:	00000000 	.*
+10010798:	00000000 	.*
+#pass
diff --git a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d
index d1980b9..e8a3aec 100644
--- a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d
+++ b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d
@@ -1,7 +1,7 @@
 #name: MIPS ELF xgot reloc n32
 #as: -EB -n32 -KPIC -xgot
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n32.s
-#ld: -melf32btsmipn32
+#ld:
 #objdump: -D --show-raw-insn
 
 .*: +file format elf32-n.*mips.*
@@ -11,7 +11,7 @@ Disassembly of section \.reginfo:
 10000098 <\.reginfo>:
 10000098:	92020022 	.*
 	\.\.\.
-100000ac:	10018790 	.*
+100000ac:	100187a0 	.*
 
 Disassembly of section \.text:
 
@@ -112,61 +112,61 @@ Disassembly of section \.text:
 10000224:	a8250000 	swl	a1,0\(at\)
 10000228:	b8250003 	swr	a1,3\(at\)
 1000022c:	8f85801c 	lw	a1,-32740\(gp\)
-10000230:	24a506ec 	addiu	a1,a1,1772
+10000230:	24a506fc 	addiu	a1,a1,1788
 10000234:	8f85801c 	lw	a1,-32740\(gp\)
-10000238:	24a506f8 	addiu	a1,a1,1784
+10000238:	24a50708 	addiu	a1,a1,1800
 1000023c:	8f858020 	lw	a1,-32736\(gp\)
-10000240:	24a5e92c 	addiu	a1,a1,-5844
+10000240:	24a5e93c 	addiu	a1,a1,-5828
 10000244:	8f85801c 	lw	a1,-32740\(gp\)
-10000248:	24a506ec 	addiu	a1,a1,1772
+10000248:	24a506fc 	addiu	a1,a1,1788
 1000024c:	00b12821 	addu	a1,a1,s1
 10000250:	8f85801c 	lw	a1,-32740\(gp\)
-10000254:	24a506f8 	addiu	a1,a1,1784
+10000254:	24a50708 	addiu	a1,a1,1800
 10000258:	00b12821 	addu	a1,a1,s1
 1000025c:	8f858020 	lw	a1,-32736\(gp\)
-10000260:	24a5e92c 	addiu	a1,a1,-5844
+10000260:	24a5e93c 	addiu	a1,a1,-5828
 10000264:	00b12821 	addu	a1,a1,s1
 10000268:	8f85801c 	lw	a1,-32740\(gp\)
-1000026c:	8ca506ec 	lw	a1,1772\(a1\)
+1000026c:	8ca506fc 	lw	a1,1788\(a1\)
 10000270:	8f85801c 	lw	a1,-32740\(gp\)
-10000274:	8ca506f8 	lw	a1,1784\(a1\)
+10000274:	8ca50708 	lw	a1,1800\(a1\)
 10000278:	8f85801c 	lw	a1,-32740\(gp\)
 1000027c:	00b12821 	addu	a1,a1,s1
-10000280:	8ca506ec 	lw	a1,1772\(a1\)
+10000280:	8ca506fc 	lw	a1,1788\(a1\)
 10000284:	8f85801c 	lw	a1,-32740\(gp\)
 10000288:	00b12821 	addu	a1,a1,s1
-1000028c:	8ca506f8 	lw	a1,1784\(a1\)
+1000028c:	8ca50708 	lw	a1,1800\(a1\)
 10000290:	8f81801c 	lw	at,-32740\(gp\)
 10000294:	00250821 	addu	at,at,a1
-10000298:	8c25070e 	lw	a1,1806\(at\)
+10000298:	8c25071e 	lw	a1,1822\(at\)
 1000029c:	8f81801c 	lw	at,-32740\(gp\)
 100002a0:	00250821 	addu	at,at,a1
-100002a4:	ac250724 	sw	a1,1828\(at\)
+100002a4:	ac250734 	sw	a1,1844\(at\)
 100002a8:	8f81801c 	lw	at,-32740\(gp\)
-100002ac:	242106ec 	addiu	at,at,1772
+100002ac:	242106fc 	addiu	at,at,1788
 100002b0:	88250000 	lwl	a1,0\(at\)
 100002b4:	98250003 	lwr	a1,3\(at\)
 100002b8:	8f81801c 	lw	at,-32740\(gp\)
-100002bc:	242106f8 	addiu	at,at,1784
+100002bc:	24210708 	addiu	at,at,1800
 100002c0:	88250000 	lwl	a1,0\(at\)
 100002c4:	98250003 	lwr	a1,3\(at\)
 100002c8:	8f81801c 	lw	at,-32740\(gp\)
-100002cc:	242106ec 	addiu	at,at,1772
+100002cc:	242106fc 	addiu	at,at,1788
 100002d0:	00310821 	addu	at,at,s1
 100002d4:	88250000 	lwl	a1,0\(at\)
 100002d8:	98250003 	lwr	a1,3\(at\)
 100002dc:	8f81801c 	lw	at,-32740\(gp\)
-100002e0:	242106f8 	addiu	at,at,1784
+100002e0:	24210708 	addiu	at,at,1800
 100002e4:	00310821 	addu	at,at,s1
 100002e8:	88250000 	lwl	a1,0\(at\)
 100002ec:	98250003 	lwr	a1,3\(at\)
 100002f0:	8f81801c 	lw	at,-32740\(gp\)
-100002f4:	2421070e 	addiu	at,at,1806
+100002f4:	2421071e 	addiu	at,at,1822
 100002f8:	00250821 	addu	at,at,a1
 100002fc:	88250000 	lwl	a1,0\(at\)
 10000300:	98250003 	lwr	a1,3\(at\)
 10000304:	8f81801c 	lw	at,-32740\(gp\)
-10000308:	24210724 	addiu	at,at,1828
+10000308:	24210734 	addiu	at,at,1844
 1000030c:	00250821 	addu	at,at,a1
 10000310:	a8250000 	swl	a1,0\(at\)
 10000314:	b8250003 	swr	a1,3\(at\)
@@ -285,61 +285,61 @@ Disassembly of section \.text:
 100004d8:	a8250000 	swl	a1,0\(at\)
 100004dc:	b8250003 	swr	a1,3\(at\)
 100004e0:	8f85801c 	lw	a1,-32740\(gp\)
-100004e4:	24a50764 	addiu	a1,a1,1892
+100004e4:	24a50774 	addiu	a1,a1,1908
 100004e8:	8f85801c 	lw	a1,-32740\(gp\)
-100004ec:	24a50770 	addiu	a1,a1,1904
+100004ec:	24a50780 	addiu	a1,a1,1920
 100004f0:	8f858020 	lw	a1,-32736\(gp\)
-100004f4:	24a5e9a4 	addiu	a1,a1,-5724
+100004f4:	24a5e9b4 	addiu	a1,a1,-5708
 100004f8:	8f85801c 	lw	a1,-32740\(gp\)
-100004fc:	24a50764 	addiu	a1,a1,1892
+100004fc:	24a50774 	addiu	a1,a1,1908
 10000500:	00b12821 	addu	a1,a1,s1
 10000504:	8f85801c 	lw	a1,-32740\(gp\)
-10000508:	24a50770 	addiu	a1,a1,1904
+10000508:	24a50780 	addiu	a1,a1,1920
 1000050c:	00b12821 	addu	a1,a1,s1
 10000510:	8f858020 	lw	a1,-32736\(gp\)
-10000514:	24a5e9a4 	addiu	a1,a1,-5724
+10000514:	24a5e9b4 	addiu	a1,a1,-5708
 10000518:	00b12821 	addu	a1,a1,s1
 1000051c:	8f85801c 	lw	a1,-32740\(gp\)
-10000520:	8ca50764 	lw	a1,1892\(a1\)
+10000520:	8ca50774 	lw	a1,1908\(a1\)
 10000524:	8f85801c 	lw	a1,-32740\(gp\)
-10000528:	8ca50770 	lw	a1,1904\(a1\)
+10000528:	8ca50780 	lw	a1,1920\(a1\)
 1000052c:	8f85801c 	lw	a1,-32740\(gp\)
 10000530:	00b12821 	addu	a1,a1,s1
-10000534:	8ca50764 	lw	a1,1892\(a1\)
+10000534:	8ca50774 	lw	a1,1908\(a1\)
 10000538:	8f85801c 	lw	a1,-32740\(gp\)
 1000053c:	00b12821 	addu	a1,a1,s1
-10000540:	8ca50770 	lw	a1,1904\(a1\)
+10000540:	8ca50780 	lw	a1,1920\(a1\)
 10000544:	8f81801c 	lw	at,-32740\(gp\)
 10000548:	00250821 	addu	at,at,a1
-1000054c:	8c250786 	lw	a1,1926\(at\)
+1000054c:	8c250796 	lw	a1,1942\(at\)
 10000550:	8f81801c 	lw	at,-32740\(gp\)
 10000554:	00250821 	addu	at,at,a1
-10000558:	ac25079c 	sw	a1,1948\(at\)
+10000558:	ac2507ac 	sw	a1,1964\(at\)
 1000055c:	8f81801c 	lw	at,-32740\(gp\)
-10000560:	24210764 	addiu	at,at,1892
+10000560:	24210774 	addiu	at,at,1908
 10000564:	88250000 	lwl	a1,0\(at\)
 10000568:	98250003 	lwr	a1,3\(at\)
 1000056c:	8f81801c 	lw	at,-32740\(gp\)
-10000570:	24210770 	addiu	at,at,1904
+10000570:	24210780 	addiu	at,at,1920
 10000574:	88250000 	lwl	a1,0\(at\)
 10000578:	98250003 	lwr	a1,3\(at\)
 1000057c:	8f81801c 	lw	at,-32740\(gp\)
-10000580:	24210764 	addiu	at,at,1892
+10000580:	24210774 	addiu	at,at,1908
 10000584:	00310821 	addu	at,at,s1
 10000588:	88250000 	lwl	a1,0\(at\)
 1000058c:	98250003 	lwr	a1,3\(at\)
 10000590:	8f81801c 	lw	at,-32740\(gp\)
-10000594:	24210770 	addiu	at,at,1904
+10000594:	24210780 	addiu	at,at,1920
 10000598:	00310821 	addu	at,at,s1
 1000059c:	88250000 	lwl	a1,0\(at\)
 100005a0:	98250003 	lwr	a1,3\(at\)
 100005a4:	8f81801c 	lw	at,-32740\(gp\)
-100005a8:	24210786 	addiu	at,at,1926
+100005a8:	24210796 	addiu	at,at,1942
 100005ac:	00250821 	addu	at,at,a1
 100005b0:	88250000 	lwl	a1,0\(at\)
 100005b4:	98250003 	lwr	a1,3\(at\)
 100005b8:	8f81801c 	lw	at,-32740\(gp\)
-100005bc:	2421079c 	addiu	at,at,1948
+100005bc:	242107ac 	addiu	at,at,1964
 100005c0:	00250821 	addu	at,at,a1
 100005c4:	a8250000 	swl	a1,0\(at\)
 100005c8:	b8250003 	swr	a1,3\(at\)
@@ -374,58 +374,61 @@ Disassembly of section \.text:
 1000063c:	1000001c 	b	100006b0 <fn2>
 10000640:	00000000 	nop
 10000644:	8f85801c 	lw	a1,-32740\(gp\)
-10000648:	24a506ec 	addiu	a1,a1,1772
+10000648:	24a506fc 	addiu	a1,a1,1788
 1000064c:	1000fe98 	b	100000b0 <fn>
 10000650:	00000000 	nop
 10000654:	8f85801c 	lw	a1,-32740\(gp\)
-10000658:	24a50770 	addiu	a1,a1,1904
+10000658:	24a50780 	addiu	a1,a1,1920
 1000065c:	10000014 	b	100006b0 <fn2>
 10000660:	00000000 	nop
 10000664:	8f858020 	lw	a1,-32736\(gp\)
-10000668:	24a5e92c 	addiu	a1,a1,-5844
+10000668:	24a5e93c 	addiu	a1,a1,-5828
 1000066c:	1000fe90 	b	100000b0 <fn>
 10000670:	00000000 	nop
 10000674:	8f85801c 	lw	a1,-32740\(gp\)
-10000678:	8ca50764 	lw	a1,1892\(a1\)
+10000678:	8ca50774 	lw	a1,1908\(a1\)
 1000067c:	1000000c 	b	100006b0 <fn2>
 10000680:	00000000 	nop
 10000684:	8f85801c 	lw	a1,-32740\(gp\)
-10000688:	8ca506f8 	lw	a1,1784\(a1\)
+10000688:	8ca50708 	lw	a1,1800\(a1\)
 1000068c:	1000fe88 	b	100000b0 <fn>
 10000690:	00000000 	nop
 10000694:	8f81801c 	lw	at,-32740\(gp\)
 10000698:	00250821 	addu	at,at,a1
-1000069c:	8c250786 	lw	a1,1926\(at\)
+1000069c:	8c250796 	lw	a1,1942\(at\)
 100006a0:	10000003 	b	100006b0 <fn2>
 100006a4:	00000000 	nop
 	\.\.\.
 
+100006b0 <fn2>:
+	\.\.\.
+
 Disassembly of section \.data:
 
-100106b0 <_fdata>:
+100106c0 <_fdata>:
 	\.\.\.
 
-100106ec <dg1>:
+100106fc <dg1>:
 	\.\.\.
 
-10010728 <sp2>:
+10010738 <sp2>:
 	\.\.\.
 
-10010764 <dg2>:
+10010774 <dg2>:
 	\.\.\.
 
 Disassembly of section \.got:
 
-100107a0 <_GLOBAL_OFFSET_TABLE_>:
-100107a0:	00000000 	.*
-100107a4:	80000000 	.*
-100107a8:	100106ec 	.*
-100107ac:	10010000 	.*
-100107b0:	10030000 	.*
-100107b4:	100000b0 	.*
-100107b8:	10000000 	.*
-100107bc:	10010764 	.*
-100107c0:	100006b0 	.*
-100107c4:	00000000 	.*
-100107c8:	00000000 	.*
+100107b0 <_GLOBAL_OFFSET_TABLE_>:
+100107b0:	00000000 	.*
+100107b4:	80000000 	.*
+100107b8:	100106fc 	.*
+100107bc:	10010000 	.*
+100107c0:	10030000 	.*
+100107c4:	100000b0 	.*
+100107c8:	10000000 	.*
+100107cc:	10010774 	.*
+100107d0:	100006b0 	.*
+100107d4:	00000000 	.*
+100107d8:	00000000 	.*
 #pass
diff --git a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-embed.d b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-embed.d
new file mode 100644
index 0000000..4c5a07d
--- /dev/null
+++ b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-embed.d
@@ -0,0 +1,444 @@
+#name: MIPS ELF xgot reloc n64
+#as: -EB -64 -KPIC -xgot
+#source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s
+#ld:
+#objdump: -D --show-raw-insn
+
+.*: +file format elf64-.*mips.*
+
+Disassembly of section \.MIPS\.options:
+
+00000001200000b0 <\.MIPS\.options>:
+   1200000b0:	01280000 	.*
+   1200000b4:	00000000 	.*
+   1200000b8:	92020022 	.*
+	\.\.\.
+   1200000d0:	00000001 	.*
+   1200000d4:	200187a0 	.*
+
+Disassembly of section \.text:
+
+00000001200000b0 <fn>:
+   1200000b0:	3c050000 	lui	a1,0x0
+   1200000b4:	00bc282d 	daddu	a1,a1,gp
+   1200000b8:	dca58020 	ld	a1,-32736\(a1\)
+   1200000bc:	3c050000 	lui	a1,0x0
+   1200000c0:	00bc282d 	daddu	a1,a1,gp
+   1200000c4:	dca58020 	ld	a1,-32736\(a1\)
+   1200000c8:	64a5000c 	daddiu	a1,a1,12
+   1200000cc:	3c050000 	lui	a1,0x0
+   1200000d0:	00bc282d 	daddu	a1,a1,gp
+   1200000d4:	dca58020 	ld	a1,-32736\(a1\)
+   1200000d8:	3c010001 	lui	at,0x1
+   1200000dc:	3421e240 	ori	at,at,0xe240
+   1200000e0:	00a1282d 	daddu	a1,a1,at
+   1200000e4:	3c050000 	lui	a1,0x0
+   1200000e8:	00bc282d 	daddu	a1,a1,gp
+   1200000ec:	dca58020 	ld	a1,-32736\(a1\)
+   1200000f0:	00b1282d 	daddu	a1,a1,s1
+   1200000f4:	3c050000 	lui	a1,0x0
+   1200000f8:	00bc282d 	daddu	a1,a1,gp
+   1200000fc:	dca58020 	ld	a1,-32736\(a1\)
+   120000100:	64a5000c 	daddiu	a1,a1,12
+   120000104:	00b1282d 	daddu	a1,a1,s1
+   120000108:	3c050000 	lui	a1,0x0
+   12000010c:	00bc282d 	daddu	a1,a1,gp
+   120000110:	dca58020 	ld	a1,-32736\(a1\)
+   120000114:	3c010001 	lui	at,0x1
+   120000118:	3421e240 	ori	at,at,0xe240
+   12000011c:	00a1282d 	daddu	a1,a1,at
+   120000120:	00b1282d 	daddu	a1,a1,s1
+   120000124:	3c050000 	lui	a1,0x0
+   120000128:	00bc282d 	daddu	a1,a1,gp
+   12000012c:	dca58020 	ld	a1,-32736\(a1\)
+   120000130:	dca50000 	ld	a1,0\(a1\)
+   120000134:	3c050000 	lui	a1,0x0
+   120000138:	00bc282d 	daddu	a1,a1,gp
+   12000013c:	dca58020 	ld	a1,-32736\(a1\)
+   120000140:	dca5000c 	ld	a1,12\(a1\)
+   120000144:	3c050000 	lui	a1,0x0
+   120000148:	00bc282d 	daddu	a1,a1,gp
+   12000014c:	dca58020 	ld	a1,-32736\(a1\)
+   120000150:	00b1282d 	daddu	a1,a1,s1
+   120000154:	dca50000 	ld	a1,0\(a1\)
+   120000158:	3c050000 	lui	a1,0x0
+   12000015c:	00bc282d 	daddu	a1,a1,gp
+   120000160:	dca58020 	ld	a1,-32736\(a1\)
+   120000164:	00b1282d 	daddu	a1,a1,s1
+   120000168:	dca5000c 	ld	a1,12\(a1\)
+   12000016c:	3c010000 	lui	at,0x0
+   120000170:	003c082d 	daddu	at,at,gp
+   120000174:	dc218020 	ld	at,-32736\(at\)
+   120000178:	0025082d 	daddu	at,at,a1
+   12000017c:	dc250022 	ld	a1,34\(at\)
+   120000180:	3c010000 	lui	at,0x0
+   120000184:	003c082d 	daddu	at,at,gp
+   120000188:	dc218020 	ld	at,-32736\(at\)
+   12000018c:	0025082d 	daddu	at,at,a1
+   120000190:	fc250038 	sd	a1,56\(at\)
+   120000194:	3c010000 	lui	at,0x0
+   120000198:	003c082d 	daddu	at,at,gp
+   12000019c:	dc218020 	ld	at,-32736\(at\)
+   1200001a0:	88250000 	lwl	a1,0\(at\)
+   1200001a4:	98250003 	lwr	a1,3\(at\)
+   1200001a8:	3c010000 	lui	at,0x0
+   1200001ac:	003c082d 	daddu	at,at,gp
+   1200001b0:	dc218020 	ld	at,-32736\(at\)
+   1200001b4:	6421000c 	daddiu	at,at,12
+   1200001b8:	88250000 	lwl	a1,0\(at\)
+   1200001bc:	98250003 	lwr	a1,3\(at\)
+   1200001c0:	3c010000 	lui	at,0x0
+   1200001c4:	003c082d 	daddu	at,at,gp
+   1200001c8:	dc218020 	ld	at,-32736\(at\)
+   1200001cc:	0031082d 	daddu	at,at,s1
+   1200001d0:	88250000 	lwl	a1,0\(at\)
+   1200001d4:	98250003 	lwr	a1,3\(at\)
+   1200001d8:	3c010000 	lui	at,0x0
+   1200001dc:	003c082d 	daddu	at,at,gp
+   1200001e0:	dc218020 	ld	at,-32736\(at\)
+   1200001e4:	6421000c 	daddiu	at,at,12
+   1200001e8:	0031082d 	daddu	at,at,s1
+   1200001ec:	88250000 	lwl	a1,0\(at\)
+   1200001f0:	98250003 	lwr	a1,3\(at\)
+   1200001f4:	3c010000 	lui	at,0x0
+   1200001f8:	003c082d 	daddu	at,at,gp
+   1200001fc:	dc218020 	ld	at,-32736\(at\)
+   120000200:	64210022 	daddiu	at,at,34
+   120000204:	0025082d 	daddu	at,at,a1
+   120000208:	88250000 	lwl	a1,0\(at\)
+   12000020c:	98250003 	lwr	a1,3\(at\)
+   120000210:	3c010000 	lui	at,0x0
+   120000214:	003c082d 	daddu	at,at,gp
+   120000218:	dc218020 	ld	at,-32736\(at\)
+   12000021c:	64210038 	daddiu	at,at,56
+   120000220:	0025082d 	daddu	at,at,a1
+   120000224:	a8250000 	swl	a1,0\(at\)
+   120000228:	b8250003 	swr	a1,3\(at\)
+   12000022c:	df858028 	ld	a1,-32728\(gp\)
+   120000230:	64a506f4 	daddiu	a1,a1,1780
+   120000234:	df858028 	ld	a1,-32728\(gp\)
+   120000238:	64a50700 	daddiu	a1,a1,1792
+   12000023c:	df858030 	ld	a1,-32720\(gp\)
+   120000240:	64a5e934 	daddiu	a1,a1,-5836
+   120000244:	df858028 	ld	a1,-32728\(gp\)
+   120000248:	64a506f4 	daddiu	a1,a1,1780
+   12000024c:	00b1282d 	daddu	a1,a1,s1
+   120000250:	df858028 	ld	a1,-32728\(gp\)
+   120000254:	64a50700 	daddiu	a1,a1,1792
+   120000258:	00b1282d 	daddu	a1,a1,s1
+   12000025c:	df858030 	ld	a1,-32720\(gp\)
+   120000260:	64a5e934 	daddiu	a1,a1,-5836
+   120000264:	00b1282d 	daddu	a1,a1,s1
+   120000268:	df858028 	ld	a1,-32728\(gp\)
+   12000026c:	dca506f4 	ld	a1,1780\(a1\)
+   120000270:	df858028 	ld	a1,-32728\(gp\)
+   120000274:	dca50700 	ld	a1,1792\(a1\)
+   120000278:	df858028 	ld	a1,-32728\(gp\)
+   12000027c:	00b1282d 	daddu	a1,a1,s1
+   120000280:	dca506f4 	ld	a1,1780\(a1\)
+   120000284:	df858028 	ld	a1,-32728\(gp\)
+   120000288:	00b1282d 	daddu	a1,a1,s1
+   12000028c:	dca50700 	ld	a1,1792\(a1\)
+   120000290:	df818028 	ld	at,-32728\(gp\)
+   120000294:	0025082d 	daddu	at,at,a1
+   120000298:	dc250716 	ld	a1,1814\(at\)
+   12000029c:	df818028 	ld	at,-32728\(gp\)
+   1200002a0:	0025082d 	daddu	at,at,a1
+   1200002a4:	fc25072c 	sd	a1,1836\(at\)
+   1200002a8:	df818028 	ld	at,-32728\(gp\)
+   1200002ac:	642106f4 	daddiu	at,at,1780
+   1200002b0:	88250000 	lwl	a1,0\(at\)
+   1200002b4:	98250003 	lwr	a1,3\(at\)
+   1200002b8:	df818028 	ld	at,-32728\(gp\)
+   1200002bc:	64210700 	daddiu	at,at,1792
+   1200002c0:	88250000 	lwl	a1,0\(at\)
+   1200002c4:	98250003 	lwr	a1,3\(at\)
+   1200002c8:	df818028 	ld	at,-32728\(gp\)
+   1200002cc:	642106f4 	daddiu	at,at,1780
+   1200002d0:	0031082d 	daddu	at,at,s1
+   1200002d4:	88250000 	lwl	a1,0\(at\)
+   1200002d8:	98250003 	lwr	a1,3\(at\)
+   1200002dc:	df818028 	ld	at,-32728\(gp\)
+   1200002e0:	64210700 	daddiu	at,at,1792
+   1200002e4:	0031082d 	daddu	at,at,s1
+   1200002e8:	88250000 	lwl	a1,0\(at\)
+   1200002ec:	98250003 	lwr	a1,3\(at\)
+   1200002f0:	df818028 	ld	at,-32728\(gp\)
+   1200002f4:	64210716 	daddiu	at,at,1814
+   1200002f8:	0025082d 	daddu	at,at,a1
+   1200002fc:	88250000 	lwl	a1,0\(at\)
+   120000300:	98250003 	lwr	a1,3\(at\)
+   120000304:	df818028 	ld	at,-32728\(gp\)
+   120000308:	6421072c 	daddiu	at,at,1836
+   12000030c:	0025082d 	daddu	at,at,a1
+   120000310:	a8250000 	swl	a1,0\(at\)
+   120000314:	b8250003 	swr	a1,3\(at\)
+   120000318:	3c050000 	lui	a1,0x0
+   12000031c:	00bc282d 	daddu	a1,a1,gp
+   120000320:	dca58038 	ld	a1,-32712\(a1\)
+   120000324:	df858040 	ld	a1,-32704\(gp\)
+   120000328:	64a500b0 	daddiu	a1,a1,176
+   12000032c:	3c190000 	lui	t9,0x0
+   120000330:	033cc82d 	daddu	t9,t9,gp
+   120000334:	df398038 	ld	t9,-32712\(t9\)
+   120000338:	df998040 	ld	t9,-32704\(gp\)
+   12000033c:	673900b0 	daddiu	t9,t9,176
+   120000340:	3c190000 	lui	t9,0x0
+   120000344:	033cc82d 	daddu	t9,t9,gp
+   120000348:	df398038 	ld	t9,-32712\(t9\)
+   12000034c:	0411ff58 	bal	1200000b0 <fn>
+   120000350:	00000000 	nop
+   120000354:	df998040 	ld	t9,-32704\(gp\)
+   120000358:	673900b0 	daddiu	t9,t9,176
+   12000035c:	0411ff54 	bal	1200000b0 <fn>
+   120000360:	00000000 	nop
+   120000364:	3c050000 	lui	a1,0x0
+   120000368:	00bc282d 	daddu	a1,a1,gp
+   12000036c:	dca58048 	ld	a1,-32696\(a1\)
+   120000370:	3c050000 	lui	a1,0x0
+   120000374:	00bc282d 	daddu	a1,a1,gp
+   120000378:	dca58048 	ld	a1,-32696\(a1\)
+   12000037c:	64a5000c 	daddiu	a1,a1,12
+   120000380:	3c050000 	lui	a1,0x0
+   120000384:	00bc282d 	daddu	a1,a1,gp
+   120000388:	dca58048 	ld	a1,-32696\(a1\)
+   12000038c:	3c010001 	lui	at,0x1
+   120000390:	3421e240 	ori	at,at,0xe240
+   120000394:	00a1282d 	daddu	a1,a1,at
+   120000398:	3c050000 	lui	a1,0x0
+   12000039c:	00bc282d 	daddu	a1,a1,gp
+   1200003a0:	dca58048 	ld	a1,-32696\(a1\)
+   1200003a4:	00b1282d 	daddu	a1,a1,s1
+   1200003a8:	3c050000 	lui	a1,0x0
+   1200003ac:	00bc282d 	daddu	a1,a1,gp
+   1200003b0:	dca58048 	ld	a1,-32696\(a1\)
+   1200003b4:	64a5000c 	daddiu	a1,a1,12
+   1200003b8:	00b1282d 	daddu	a1,a1,s1
+   1200003bc:	3c050000 	lui	a1,0x0
+   1200003c0:	00bc282d 	daddu	a1,a1,gp
+   1200003c4:	dca58048 	ld	a1,-32696\(a1\)
+   1200003c8:	3c010001 	lui	at,0x1
+   1200003cc:	3421e240 	ori	at,at,0xe240
+   1200003d0:	00a1282d 	daddu	a1,a1,at
+   1200003d4:	00b1282d 	daddu	a1,a1,s1
+   1200003d8:	3c050000 	lui	a1,0x0
+   1200003dc:	00bc282d 	daddu	a1,a1,gp
+   1200003e0:	dca58048 	ld	a1,-32696\(a1\)
+   1200003e4:	dca50000 	ld	a1,0\(a1\)
+   1200003e8:	3c050000 	lui	a1,0x0
+   1200003ec:	00bc282d 	daddu	a1,a1,gp
+   1200003f0:	dca58048 	ld	a1,-32696\(a1\)
+   1200003f4:	dca5000c 	ld	a1,12\(a1\)
+   1200003f8:	3c050000 	lui	a1,0x0
+   1200003fc:	00bc282d 	daddu	a1,a1,gp
+   120000400:	dca58048 	ld	a1,-32696\(a1\)
+   120000404:	00b1282d 	daddu	a1,a1,s1
+   120000408:	dca50000 	ld	a1,0\(a1\)
+   12000040c:	3c050000 	lui	a1,0x0
+   120000410:	00bc282d 	daddu	a1,a1,gp
+   120000414:	dca58048 	ld	a1,-32696\(a1\)
+   120000418:	00b1282d 	daddu	a1,a1,s1
+   12000041c:	dca5000c 	ld	a1,12\(a1\)
+   120000420:	3c010000 	lui	at,0x0
+   120000424:	003c082d 	daddu	at,at,gp
+   120000428:	dc218048 	ld	at,-32696\(at\)
+   12000042c:	0025082d 	daddu	at,at,a1
+   120000430:	dc250022 	ld	a1,34\(at\)
+   120000434:	3c010000 	lui	at,0x0
+   120000438:	003c082d 	daddu	at,at,gp
+   12000043c:	dc218048 	ld	at,-32696\(at\)
+   120000440:	0025082d 	daddu	at,at,a1
+   120000444:	fc250038 	sd	a1,56\(at\)
+   120000448:	3c010000 	lui	at,0x0
+   12000044c:	003c082d 	daddu	at,at,gp
+   120000450:	dc218048 	ld	at,-32696\(at\)
+   120000454:	88250000 	lwl	a1,0\(at\)
+   120000458:	98250003 	lwr	a1,3\(at\)
+   12000045c:	3c010000 	lui	at,0x0
+   120000460:	003c082d 	daddu	at,at,gp
+   120000464:	dc218048 	ld	at,-32696\(at\)
+   120000468:	6421000c 	daddiu	at,at,12
+   12000046c:	88250000 	lwl	a1,0\(at\)
+   120000470:	98250003 	lwr	a1,3\(at\)
+   120000474:	3c010000 	lui	at,0x0
+   120000478:	003c082d 	daddu	at,at,gp
+   12000047c:	dc218048 	ld	at,-32696\(at\)
+   120000480:	0031082d 	daddu	at,at,s1
+   120000484:	88250000 	lwl	a1,0\(at\)
+   120000488:	98250003 	lwr	a1,3\(at\)
+   12000048c:	3c010000 	lui	at,0x0
+   120000490:	003c082d 	daddu	at,at,gp
+   120000494:	dc218048 	ld	at,-32696\(at\)
+   120000498:	6421000c 	daddiu	at,at,12
+   12000049c:	0031082d 	daddu	at,at,s1
+   1200004a0:	88250000 	lwl	a1,0\(at\)
+   1200004a4:	98250003 	lwr	a1,3\(at\)
+   1200004a8:	3c010000 	lui	at,0x0
+   1200004ac:	003c082d 	daddu	at,at,gp
+   1200004b0:	dc218048 	ld	at,-32696\(at\)
+   1200004b4:	64210022 	daddiu	at,at,34
+   1200004b8:	0025082d 	daddu	at,at,a1
+   1200004bc:	88250000 	lwl	a1,0\(at\)
+   1200004c0:	98250003 	lwr	a1,3\(at\)
+   1200004c4:	3c010000 	lui	at,0x0
+   1200004c8:	003c082d 	daddu	at,at,gp
+   1200004cc:	dc218048 	ld	at,-32696\(at\)
+   1200004d0:	64210038 	daddiu	at,at,56
+   1200004d4:	0025082d 	daddu	at,at,a1
+   1200004d8:	a8250000 	swl	a1,0\(at\)
+   1200004dc:	b8250003 	swr	a1,3\(at\)
+   1200004e0:	df858028 	ld	a1,-32728\(gp\)
+   1200004e4:	64a5076c 	daddiu	a1,a1,1900
+   1200004e8:	df858028 	ld	a1,-32728\(gp\)
+   1200004ec:	64a50778 	daddiu	a1,a1,1912
+   1200004f0:	df858030 	ld	a1,-32720\(gp\)
+   1200004f4:	64a5e9ac 	daddiu	a1,a1,-5716
+   1200004f8:	df858028 	ld	a1,-32728\(gp\)
+   1200004fc:	64a5076c 	daddiu	a1,a1,1900
+   120000500:	00b1282d 	daddu	a1,a1,s1
+   120000504:	df858028 	ld	a1,-32728\(gp\)
+   120000508:	64a50778 	daddiu	a1,a1,1912
+   12000050c:	00b1282d 	daddu	a1,a1,s1
+   120000510:	df858030 	ld	a1,-32720\(gp\)
+   120000514:	64a5e9ac 	daddiu	a1,a1,-5716
+   120000518:	00b1282d 	daddu	a1,a1,s1
+   12000051c:	df858028 	ld	a1,-32728\(gp\)
+   120000520:	dca5076c 	ld	a1,1900\(a1\)
+   120000524:	df858028 	ld	a1,-32728\(gp\)
+   120000528:	dca50778 	ld	a1,1912\(a1\)
+   12000052c:	df858028 	ld	a1,-32728\(gp\)
+   120000530:	00b1282d 	daddu	a1,a1,s1
+   120000534:	dca5076c 	ld	a1,1900\(a1\)
+   120000538:	df858028 	ld	a1,-32728\(gp\)
+   12000053c:	00b1282d 	daddu	a1,a1,s1
+   120000540:	dca50778 	ld	a1,1912\(a1\)
+   120000544:	df818028 	ld	at,-32728\(gp\)
+   120000548:	0025082d 	daddu	at,at,a1
+   12000054c:	dc25078e 	ld	a1,1934\(at\)
+   120000550:	df818028 	ld	at,-32728\(gp\)
+   120000554:	0025082d 	daddu	at,at,a1
+   120000558:	fc2507a4 	sd	a1,1956\(at\)
+   12000055c:	df818028 	ld	at,-32728\(gp\)
+   120000560:	6421076c 	daddiu	at,at,1900
+   120000564:	88250000 	lwl	a1,0\(at\)
+   120000568:	98250003 	lwr	a1,3\(at\)
+   12000056c:	df818028 	ld	at,-32728\(gp\)
+   120000570:	64210778 	daddiu	at,at,1912
+   120000574:	88250000 	lwl	a1,0\(at\)
+   120000578:	98250003 	lwr	a1,3\(at\)
+   12000057c:	df818028 	ld	at,-32728\(gp\)
+   120000580:	6421076c 	daddiu	at,at,1900
+   120000584:	0031082d 	daddu	at,at,s1
+   120000588:	88250000 	lwl	a1,0\(at\)
+   12000058c:	98250003 	lwr	a1,3\(at\)
+   120000590:	df818028 	ld	at,-32728\(gp\)
+   120000594:	64210778 	daddiu	at,at,1912
+   120000598:	0031082d 	daddu	at,at,s1
+   12000059c:	88250000 	lwl	a1,0\(at\)
+   1200005a0:	98250003 	lwr	a1,3\(at\)
+   1200005a4:	df818028 	ld	at,-32728\(gp\)
+   1200005a8:	6421078e 	daddiu	at,at,1934
+   1200005ac:	0025082d 	daddu	at,at,a1
+   1200005b0:	88250000 	lwl	a1,0\(at\)
+   1200005b4:	98250003 	lwr	a1,3\(at\)
+   1200005b8:	df818028 	ld	at,-32728\(gp\)
+   1200005bc:	642107a4 	daddiu	at,at,1956
+   1200005c0:	0025082d 	daddu	at,at,a1
+   1200005c4:	a8250000 	swl	a1,0\(at\)
+   1200005c8:	b8250003 	swr	a1,3\(at\)
+   1200005cc:	3c050000 	lui	a1,0x0
+   1200005d0:	00bc282d 	daddu	a1,a1,gp
+   1200005d4:	dca58050 	ld	a1,-32688\(a1\)
+   1200005d8:	df858040 	ld	a1,-32704\(gp\)
+   1200005dc:	64a506b0 	daddiu	a1,a1,1712
+   1200005e0:	3c190000 	lui	t9,0x0
+   1200005e4:	033cc82d 	daddu	t9,t9,gp
+   1200005e8:	df398050 	ld	t9,-32688\(t9\)
+   1200005ec:	df998040 	ld	t9,-32704\(gp\)
+   1200005f0:	673906b0 	daddiu	t9,t9,1712
+   1200005f4:	3c190000 	lui	t9,0x0
+   1200005f8:	033cc82d 	daddu	t9,t9,gp
+   1200005fc:	df398050 	ld	t9,-32688\(t9\)
+   120000600:	0411002b 	bal	1200006b0 <fn2>
+   120000604:	00000000 	nop
+   120000608:	df998040 	ld	t9,-32704\(gp\)
+   12000060c:	673906b0 	daddiu	t9,t9,1712
+   120000610:	04110027 	bal	1200006b0 <fn2>
+   120000614:	00000000 	nop
+   120000618:	3c050000 	lui	a1,0x0
+   12000061c:	00bc282d 	daddu	a1,a1,gp
+   120000620:	dca58020 	ld	a1,-32736\(a1\)
+   120000624:	1000fea2 	b	1200000b0 <fn>
+   120000628:	00000000 	nop
+   12000062c:	3c050000 	lui	a1,0x0
+   120000630:	00bc282d 	daddu	a1,a1,gp
+   120000634:	dca58048 	ld	a1,-32696\(a1\)
+   120000638:	dca50000 	ld	a1,0\(a1\)
+   12000063c:	1000001c 	b	1200006b0 <fn2>
+   120000640:	00000000 	nop
+   120000644:	df858028 	ld	a1,-32728\(gp\)
+   120000648:	64a506f4 	daddiu	a1,a1,1780
+   12000064c:	1000fe98 	b	1200000b0 <fn>
+   120000650:	00000000 	nop
+   120000654:	df858028 	ld	a1,-32728\(gp\)
+   120000658:	64a50778 	daddiu	a1,a1,1912
+   12000065c:	10000014 	b	1200006b0 <fn2>
+   120000660:	00000000 	nop
+   120000664:	df858030 	ld	a1,-32720\(gp\)
+   120000668:	64a5e934 	daddiu	a1,a1,-5836
+   12000066c:	1000fe90 	b	1200000b0 <fn>
+   120000670:	00000000 	nop
+   120000674:	df858028 	ld	a1,-32728\(gp\)
+   120000678:	dca5076c 	ld	a1,1900\(a1\)
+   12000067c:	1000000c 	b	1200006b0 <fn2>
+   120000680:	00000000 	nop
+   120000684:	df858028 	ld	a1,-32728\(gp\)
+   120000688:	dca50700 	ld	a1,1792\(a1\)
+   12000068c:	1000fe88 	b	1200000b0 <fn>
+   120000690:	00000000 	nop
+   120000694:	df818028 	ld	at,-32728\(gp\)
+   120000698:	0025082d 	daddu	at,at,a1
+   12000069c:	dc25078e 	ld	a1,1934\(at\)
+   1200006a0:	10000003 	b	1200006b0 <fn2>
+   1200006a4:	00000000 	nop
+	\.\.\.
+
+00000001200006b0 <fn2>:
+	\.\.\.
+
+Disassembly of section \.data:
+
+00000001200106b8 <_fdata>:
+	\.\.\.
+
+00000001200106f4 <dg1>:
+	\.\.\.
+
+0000000120010730 <sp2>:
+	\.\.\.
+
+000000012001076c <dg2>:
+	\.\.\.
+
+Disassembly of section \.got:
+
+00000001200107b0 <_GLOBAL_OFFSET_TABLE_>:
+	\.\.\.
+   1200107b8:	80000000 	.*
+   1200107bc:	00000000 	.*
+   1200107c0:	00000001 	.*
+   1200107c4:	200106f4 	.*
+   1200107c8:	00000001 	.*
+   1200107cc:	20010000 	.*
+   1200107d0:	00000001 	.*
+   1200107d4:	20030000 	.*
+   1200107d8:	00000001 	.*
+   1200107dc:	200000b0 	.*
+   1200107e0:	00000001 	.*
+   1200107e4:	20000000 	.*
+   1200107e8:	00000001 	.*
+   1200107ec:	2001076c 	.*
+   1200107f0:	00000001 	.*
+   1200107f4:	200006b0 	.*
+	\.\.\.
+#pass
diff --git a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-linux.d b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-linux.d
index 075b294..58e496f 100644
--- a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-linux.d
+++ b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-linux.d
@@ -1,7 +1,7 @@
 #name: MIPS ELF xgot reloc n64
 #as: -EB -64 -KPIC -xgot
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s
-#ld: -melf64btsmip
+#ld:
 #objdump: -D --show-raw-insn
 
 .*: +file format elf64-.*mips.*
@@ -14,7 +14,7 @@ Disassembly of section \.MIPS\.options:
    1200000b8:	92020022 	.*
 	\.\.\.
    1200000d0:	00000001 	.*
-   1200000d4:	200187c0 	.*
+   1200000d4:	200187d0 	.*
 
 Disassembly of section \.text:
 
@@ -115,61 +115,61 @@ Disassembly of section \.text:
    120000254:	a8250000 	swl	a1,0\(at\)
    120000258:	b8250003 	swr	a1,3\(at\)
    12000025c:	df858028 	ld	a1,-32728\(gp\)
-   120000260:	64a5071c 	daddiu	a1,a1,1820
+   120000260:	64a5072c 	daddiu	a1,a1,1836
    120000264:	df858028 	ld	a1,-32728\(gp\)
-   120000268:	64a50728 	daddiu	a1,a1,1832
+   120000268:	64a50738 	daddiu	a1,a1,1848
    12000026c:	df858030 	ld	a1,-32720\(gp\)
-   120000270:	64a5e95c 	daddiu	a1,a1,-5796
+   120000270:	64a5e96c 	daddiu	a1,a1,-5780
    120000274:	df858028 	ld	a1,-32728\(gp\)
-   120000278:	64a5071c 	daddiu	a1,a1,1820
+   120000278:	64a5072c 	daddiu	a1,a1,1836
    12000027c:	00b1282d 	daddu	a1,a1,s1
    120000280:	df858028 	ld	a1,-32728\(gp\)
-   120000284:	64a50728 	daddiu	a1,a1,1832
+   120000284:	64a50738 	daddiu	a1,a1,1848
    120000288:	00b1282d 	daddu	a1,a1,s1
    12000028c:	df858030 	ld	a1,-32720\(gp\)
-   120000290:	64a5e95c 	daddiu	a1,a1,-5796
+   120000290:	64a5e96c 	daddiu	a1,a1,-5780
    120000294:	00b1282d 	daddu	a1,a1,s1
    120000298:	df858028 	ld	a1,-32728\(gp\)
-   12000029c:	dca5071c 	ld	a1,1820\(a1\)
+   12000029c:	dca5072c 	ld	a1,1836\(a1\)
    1200002a0:	df858028 	ld	a1,-32728\(gp\)
-   1200002a4:	dca50728 	ld	a1,1832\(a1\)
+   1200002a4:	dca50738 	ld	a1,1848\(a1\)
    1200002a8:	df858028 	ld	a1,-32728\(gp\)
    1200002ac:	00b1282d 	daddu	a1,a1,s1
-   1200002b0:	dca5071c 	ld	a1,1820\(a1\)
+   1200002b0:	dca5072c 	ld	a1,1836\(a1\)
    1200002b4:	df858028 	ld	a1,-32728\(gp\)
    1200002b8:	00b1282d 	daddu	a1,a1,s1
-   1200002bc:	dca50728 	ld	a1,1832\(a1\)
+   1200002bc:	dca50738 	ld	a1,1848\(a1\)
    1200002c0:	df818028 	ld	at,-32728\(gp\)
    1200002c4:	0025082d 	daddu	at,at,a1
-   1200002c8:	dc25073e 	ld	a1,1854\(at\)
+   1200002c8:	dc25074e 	ld	a1,1870\(at\)
    1200002cc:	df818028 	ld	at,-32728\(gp\)
    1200002d0:	0025082d 	daddu	at,at,a1
-   1200002d4:	fc250754 	sd	a1,1876\(at\)
+   1200002d4:	fc250764 	sd	a1,1892\(at\)
    1200002d8:	df818028 	ld	at,-32728\(gp\)
-   1200002dc:	6421071c 	daddiu	at,at,1820
+   1200002dc:	6421072c 	daddiu	at,at,1836
    1200002e0:	88250000 	lwl	a1,0\(at\)
    1200002e4:	98250003 	lwr	a1,3\(at\)
    1200002e8:	df818028 	ld	at,-32728\(gp\)
-   1200002ec:	64210728 	daddiu	at,at,1832
+   1200002ec:	64210738 	daddiu	at,at,1848
    1200002f0:	88250000 	lwl	a1,0\(at\)
    1200002f4:	98250003 	lwr	a1,3\(at\)
    1200002f8:	df818028 	ld	at,-32728\(gp\)
-   1200002fc:	6421071c 	daddiu	at,at,1820
+   1200002fc:	6421072c 	daddiu	at,at,1836
    120000300:	0031082d 	daddu	at,at,s1
    120000304:	88250000 	lwl	a1,0\(at\)
    120000308:	98250003 	lwr	a1,3\(at\)
    12000030c:	df818028 	ld	at,-32728\(gp\)
-   120000310:	64210728 	daddiu	at,at,1832
+   120000310:	64210738 	daddiu	at,at,1848
    120000314:	0031082d 	daddu	at,at,s1
    120000318:	88250000 	lwl	a1,0\(at\)
    12000031c:	98250003 	lwr	a1,3\(at\)
    120000320:	df818028 	ld	at,-32728\(gp\)
-   120000324:	6421073e 	daddiu	at,at,1854
+   120000324:	6421074e 	daddiu	at,at,1870
    120000328:	0025082d 	daddu	at,at,a1
    12000032c:	88250000 	lwl	a1,0\(at\)
    120000330:	98250003 	lwr	a1,3\(at\)
    120000334:	df818028 	ld	at,-32728\(gp\)
-   120000338:	64210754 	daddiu	at,at,1876
+   120000338:	64210764 	daddiu	at,at,1892
    12000033c:	0025082d 	daddu	at,at,a1
    120000340:	a8250000 	swl	a1,0\(at\)
    120000344:	b8250003 	swr	a1,3\(at\)
@@ -288,61 +288,61 @@ Disassembly of section \.text:
    120000508:	a8250000 	swl	a1,0\(at\)
    12000050c:	b8250003 	swr	a1,3\(at\)
    120000510:	df858028 	ld	a1,-32728\(gp\)
-   120000514:	64a50794 	daddiu	a1,a1,1940
+   120000514:	64a507a4 	daddiu	a1,a1,1956
    120000518:	df858028 	ld	a1,-32728\(gp\)
-   12000051c:	64a507a0 	daddiu	a1,a1,1952
+   12000051c:	64a507b0 	daddiu	a1,a1,1968
    120000520:	df858030 	ld	a1,-32720\(gp\)
-   120000524:	64a5e9d4 	daddiu	a1,a1,-5676
+   120000524:	64a5e9e4 	daddiu	a1,a1,-5660
    120000528:	df858028 	ld	a1,-32728\(gp\)
-   12000052c:	64a50794 	daddiu	a1,a1,1940
+   12000052c:	64a507a4 	daddiu	a1,a1,1956
    120000530:	00b1282d 	daddu	a1,a1,s1
    120000534:	df858028 	ld	a1,-32728\(gp\)
-   120000538:	64a507a0 	daddiu	a1,a1,1952
+   120000538:	64a507b0 	daddiu	a1,a1,1968
    12000053c:	00b1282d 	daddu	a1,a1,s1
    120000540:	df858030 	ld	a1,-32720\(gp\)
-   120000544:	64a5e9d4 	daddiu	a1,a1,-5676
+   120000544:	64a5e9e4 	daddiu	a1,a1,-5660
    120000548:	00b1282d 	daddu	a1,a1,s1
    12000054c:	df858028 	ld	a1,-32728\(gp\)
-   120000550:	dca50794 	ld	a1,1940\(a1\)
+   120000550:	dca507a4 	ld	a1,1956\(a1\)
    120000554:	df858028 	ld	a1,-32728\(gp\)
-   120000558:	dca507a0 	ld	a1,1952\(a1\)
+   120000558:	dca507b0 	ld	a1,1968\(a1\)
    12000055c:	df858028 	ld	a1,-32728\(gp\)
    120000560:	00b1282d 	daddu	a1,a1,s1
-   120000564:	dca50794 	ld	a1,1940\(a1\)
+   120000564:	dca507a4 	ld	a1,1956\(a1\)
    120000568:	df858028 	ld	a1,-32728\(gp\)
    12000056c:	00b1282d 	daddu	a1,a1,s1
-   120000570:	dca507a0 	ld	a1,1952\(a1\)
+   120000570:	dca507b0 	ld	a1,1968\(a1\)
    120000574:	df818028 	ld	at,-32728\(gp\)
    120000578:	0025082d 	daddu	at,at,a1
-   12000057c:	dc2507b6 	ld	a1,1974\(at\)
+   12000057c:	dc2507c6 	ld	a1,1990\(at\)
    120000580:	df818028 	ld	at,-32728\(gp\)
    120000584:	0025082d 	daddu	at,at,a1
-   120000588:	fc2507cc 	sd	a1,1996\(at\)
+   120000588:	fc2507dc 	sd	a1,2012\(at\)
    12000058c:	df818028 	ld	at,-32728\(gp\)
-   120000590:	64210794 	daddiu	at,at,1940
+   120000590:	642107a4 	daddiu	at,at,1956
    120000594:	88250000 	lwl	a1,0\(at\)
    120000598:	98250003 	lwr	a1,3\(at\)
    12000059c:	df818028 	ld	at,-32728\(gp\)
-   1200005a0:	642107a0 	daddiu	at,at,1952
+   1200005a0:	642107b0 	daddiu	at,at,1968
    1200005a4:	88250000 	lwl	a1,0\(at\)
    1200005a8:	98250003 	lwr	a1,3\(at\)
    1200005ac:	df818028 	ld	at,-32728\(gp\)
-   1200005b0:	64210794 	daddiu	at,at,1940
+   1200005b0:	642107a4 	daddiu	at,at,1956
    1200005b4:	0031082d 	daddu	at,at,s1
    1200005b8:	88250000 	lwl	a1,0\(at\)
    1200005bc:	98250003 	lwr	a1,3\(at\)
    1200005c0:	df818028 	ld	at,-32728\(gp\)
-   1200005c4:	642107a0 	daddiu	at,at,1952
+   1200005c4:	642107b0 	daddiu	at,at,1968
    1200005c8:	0031082d 	daddu	at,at,s1
    1200005cc:	88250000 	lwl	a1,0\(at\)
    1200005d0:	98250003 	lwr	a1,3\(at\)
    1200005d4:	df818028 	ld	at,-32728\(gp\)
-   1200005d8:	642107b6 	daddiu	at,at,1974
+   1200005d8:	642107c6 	daddiu	at,at,1990
    1200005dc:	0025082d 	daddu	at,at,a1
    1200005e0:	88250000 	lwl	a1,0\(at\)
    1200005e4:	98250003 	lwr	a1,3\(at\)
    1200005e8:	df818028 	ld	at,-32728\(gp\)
-   1200005ec:	642107cc 	daddiu	at,at,1996
+   1200005ec:	642107dc 	daddiu	at,at,2012
    1200005f0:	0025082d 	daddu	at,at,a1
    1200005f4:	a8250000 	swl	a1,0\(at\)
    1200005f8:	b8250003 	swr	a1,3\(at\)
@@ -377,65 +377,68 @@ Disassembly of section \.text:
    12000066c:	1000001c 	b	1200006e0 <fn2>
    120000670:	00000000 	nop
    120000674:	df858028 	ld	a1,-32728\(gp\)
-   120000678:	64a5071c 	daddiu	a1,a1,1820
+   120000678:	64a5072c 	daddiu	a1,a1,1836
    12000067c:	1000fe98 	b	1200000e0 <fn>
    120000680:	00000000 	nop
    120000684:	df858028 	ld	a1,-32728\(gp\)
-   120000688:	64a507a0 	daddiu	a1,a1,1952
+   120000688:	64a507b0 	daddiu	a1,a1,1968
    12000068c:	10000014 	b	1200006e0 <fn2>
    120000690:	00000000 	nop
    120000694:	df858030 	ld	a1,-32720\(gp\)
-   120000698:	64a5e95c 	daddiu	a1,a1,-5796
+   120000698:	64a5e96c 	daddiu	a1,a1,-5780
    12000069c:	1000fe90 	b	1200000e0 <fn>
    1200006a0:	00000000 	nop
    1200006a4:	df858028 	ld	a1,-32728\(gp\)
-   1200006a8:	dca50794 	ld	a1,1940\(a1\)
+   1200006a8:	dca507a4 	ld	a1,1956\(a1\)
    1200006ac:	1000000c 	b	1200006e0 <fn2>
    1200006b0:	00000000 	nop
    1200006b4:	df858028 	ld	a1,-32728\(gp\)
-   1200006b8:	dca50728 	ld	a1,1832\(a1\)
+   1200006b8:	dca50738 	ld	a1,1848\(a1\)
    1200006bc:	1000fe88 	b	1200000e0 <fn>
    1200006c0:	00000000 	nop
    1200006c4:	df818028 	ld	at,-32728\(gp\)
    1200006c8:	0025082d 	daddu	at,at,a1
-   1200006cc:	dc2507b6 	ld	a1,1974\(at\)
+   1200006cc:	dc2507c6 	ld	a1,1990\(at\)
    1200006d0:	10000003 	b	1200006e0 <fn2>
    1200006d4:	00000000 	nop
 	\.\.\.
 
+00000001200006e0 <fn2>:
+	\.\.\.
+
 Disassembly of section \.data:
 
-00000001200106e0 <_fdata>:
+00000001200106f0 <_fdata>:
 	\.\.\.
 
-000000012001071c <dg1>:
+000000012001072c <dg1>:
 	\.\.\.
 
-0000000120010758 <sp2>:
+0000000120010768 <sp2>:
 	\.\.\.
 
-0000000120010794 <dg2>:
+00000001200107a4 <dg2>:
 	\.\.\.
 
 Disassembly of section \.got:
 
-00000001200107d0 <_GLOBAL_OFFSET_TABLE_>:
+00000001200107e0 <_GLOBAL_OFFSET_TABLE_>:
 	\.\.\.
-   1200107d8:	80000000 	.*
-   1200107dc:	00000000 	.*
-   1200107e0:	00000001 	.*
-   1200107e4:	2001071c 	.*
-   1200107e8:	00000001 	.*
-   1200107ec:	20010000 	.*
+   1200107e8:	80000000 	.*
+   1200107ec:	00000000 	.*
    1200107f0:	00000001 	.*
-   1200107f4:	20030000 	.*
+   1200107f4:	2001072c 	.*
    1200107f8:	00000001 	.*
-   1200107fc:	200000e0 	.*
+   1200107fc:	20010000 	.*
    120010800:	00000001 	.*
-   120010804:	20000000 	.*
+   120010804:	20030000 	.*
    120010808:	00000001 	.*
-   12001080c:	20010794 	.*
+   12001080c:	200000e0 	.*
    120010810:	00000001 	.*
-   120010814:	200006e0 	.*
+   120010814:	20000000 	.*
+   120010818:	00000001 	.*
+   12001081c:	200107a4 	.*
+   120010820:	00000001 	.*
+   120010824:	200006e0 	.*
 	\.\.\.
 #pass
diff --git a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64.d b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64.d
index 0111f78..5e6a7f9 100644
--- a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64.d
+++ b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64.d
@@ -1,436 +1,439 @@
 #name: MIPS ELF xgot reloc n64
 #as: -EB -64 -KPIC -xgot
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s
-#ld: -melf64btsmip
+#ld:
 #objdump: -D --show-raw-insn
 
 .*: +file format elf64-.*mips.*
 
 Disassembly of section \.MIPS\.options:
 
-00000000100000b0 <\.MIPS\.options>:
-    100000b0:	01280000 	.*
-    100000b4:	00000000 	.*
-    100000b8:	92020022 	.*
+00000000100000e8 <\.MIPS\.options>:
+    100000e8:	01280000 	.*
+    100000ec:	00000000 	.*
+    100000f0:	92020022 	.*
 	\.\.\.
-    100000d4:	101087c0 	.*
+    1000010c:	10018800 	.*
 Disassembly of section \.text:
 
-00000000100000e0 <fn>:
-    100000e0:	3c050000 	lui	a1,0x0
-    100000e4:	00bc282d 	daddu	a1,a1,gp
-    100000e8:	dca58058 	ld	a1,-32680\(a1\)
-    100000ec:	3c050000 	lui	a1,0x0
-    100000f0:	00bc282d 	daddu	a1,a1,gp
-    100000f4:	dca58058 	ld	a1,-32680\(a1\)
-    100000f8:	64a5000c 	daddiu	a1,a1,12
-    100000fc:	3c050000 	lui	a1,0x0
-    10000100:	00bc282d 	daddu	a1,a1,gp
-    10000104:	dca58058 	ld	a1,-32680\(a1\)
-    10000108:	3c010002 	lui	at,0x2
-    1000010c:	6421e240 	daddiu	at,at,-7616
-    10000110:	00a1282d 	daddu	a1,a1,at
-    10000114:	3c050000 	lui	a1,0x0
-    10000118:	00bc282d 	daddu	a1,a1,gp
-    1000011c:	dca58058 	ld	a1,-32680\(a1\)
-    10000120:	00b1282d 	daddu	a1,a1,s1
-    10000124:	3c050000 	lui	a1,0x0
-    10000128:	00bc282d 	daddu	a1,a1,gp
-    1000012c:	dca58058 	ld	a1,-32680\(a1\)
-    10000130:	64a5000c 	daddiu	a1,a1,12
-    10000134:	00b1282d 	daddu	a1,a1,s1
-    10000138:	3c050000 	lui	a1,0x0
-    1000013c:	00bc282d 	daddu	a1,a1,gp
-    10000140:	dca58058 	ld	a1,-32680\(a1\)
-    10000144:	3c010002 	lui	at,0x2
-    10000148:	6421e240 	daddiu	at,at,-7616
-    1000014c:	00a1282d 	daddu	a1,a1,at
+0000000010000110 <fn>:
+    10000110:	3c050000 	lui	a1,0x0
+    10000114:	00bc282d 	daddu	a1,a1,gp
+    10000118:	dca58020 	ld	a1,-32736\(a1\)
+    1000011c:	3c050000 	lui	a1,0x0
+    10000120:	00bc282d 	daddu	a1,a1,gp
+    10000124:	dca58020 	ld	a1,-32736\(a1\)
+    10000128:	64a5000c 	daddiu	a1,a1,12
+    1000012c:	3c050000 	lui	a1,0x0
+    10000130:	00bc282d 	daddu	a1,a1,gp
+    10000134:	dca58020 	ld	a1,-32736\(a1\)
+    10000138:	3c010001 	lui	at,0x1
+    1000013c:	3421e240 	ori	at,at,0xe240
+    10000140:	00a1282d 	daddu	a1,a1,at
+    10000144:	3c050000 	lui	a1,0x0
+    10000148:	00bc282d 	daddu	a1,a1,gp
+    1000014c:	dca58020 	ld	a1,-32736\(a1\)
     10000150:	00b1282d 	daddu	a1,a1,s1
     10000154:	3c050000 	lui	a1,0x0
     10000158:	00bc282d 	daddu	a1,a1,gp
-    1000015c:	dca58058 	ld	a1,-32680\(a1\)
-    10000160:	dca50000 	ld	a1,0\(a1\)
-    10000164:	3c050000 	lui	a1,0x0
-    10000168:	00bc282d 	daddu	a1,a1,gp
-    1000016c:	dca58058 	ld	a1,-32680\(a1\)
-    10000170:	dca5000c 	ld	a1,12\(a1\)
-    10000174:	3c050000 	lui	a1,0x0
-    10000178:	00bc282d 	daddu	a1,a1,gp
-    1000017c:	dca58058 	ld	a1,-32680\(a1\)
+    1000015c:	dca58020 	ld	a1,-32736\(a1\)
+    10000160:	64a5000c 	daddiu	a1,a1,12
+    10000164:	00b1282d 	daddu	a1,a1,s1
+    10000168:	3c050000 	lui	a1,0x0
+    1000016c:	00bc282d 	daddu	a1,a1,gp
+    10000170:	dca58020 	ld	a1,-32736\(a1\)
+    10000174:	3c010001 	lui	at,0x1
+    10000178:	3421e240 	ori	at,at,0xe240
+    1000017c:	00a1282d 	daddu	a1,a1,at
     10000180:	00b1282d 	daddu	a1,a1,s1
-    10000184:	dca50000 	ld	a1,0\(a1\)
-    10000188:	3c050000 	lui	a1,0x0
-    1000018c:	00bc282d 	daddu	a1,a1,gp
-    10000190:	dca58058 	ld	a1,-32680\(a1\)
-    10000194:	00b1282d 	daddu	a1,a1,s1
-    10000198:	dca5000c 	ld	a1,12\(a1\)
-    1000019c:	3c010000 	lui	at,0x0
-    100001a0:	003c082d 	daddu	at,at,gp
-    100001a4:	dc218058 	ld	at,-32680\(at\)
-    100001a8:	0025082d 	daddu	at,at,a1
-    100001ac:	dc250022 	ld	a1,34\(at\)
-    100001b0:	3c010000 	lui	at,0x0
-    100001b4:	003c082d 	daddu	at,at,gp
-    100001b8:	dc218058 	ld	at,-32680\(at\)
-    100001bc:	0025082d 	daddu	at,at,a1
-    100001c0:	fc250038 	sd	a1,56\(at\)
-    100001c4:	3c010000 	lui	at,0x0
-    100001c8:	003c082d 	daddu	at,at,gp
-    100001cc:	dc218058 	ld	at,-32680\(at\)
-    100001d0:	88250000 	lwl	a1,0\(at\)
-    100001d4:	98250003 	lwr	a1,3\(at\)
-    100001d8:	3c010000 	lui	at,0x0
-    100001dc:	003c082d 	daddu	at,at,gp
-    100001e0:	dc218058 	ld	at,-32680\(at\)
-    100001e4:	6421000c 	daddiu	at,at,12
-    100001e8:	88250000 	lwl	a1,0\(at\)
-    100001ec:	98250003 	lwr	a1,3\(at\)
-    100001f0:	3c010000 	lui	at,0x0
-    100001f4:	003c082d 	daddu	at,at,gp
-    100001f8:	dc218058 	ld	at,-32680\(at\)
-    100001fc:	0031082d 	daddu	at,at,s1
+    10000184:	3c050000 	lui	a1,0x0
+    10000188:	00bc282d 	daddu	a1,a1,gp
+    1000018c:	dca58020 	ld	a1,-32736\(a1\)
+    10000190:	dca50000 	ld	a1,0\(a1\)
+    10000194:	3c050000 	lui	a1,0x0
+    10000198:	00bc282d 	daddu	a1,a1,gp
+    1000019c:	dca58020 	ld	a1,-32736\(a1\)
+    100001a0:	dca5000c 	ld	a1,12\(a1\)
+    100001a4:	3c050000 	lui	a1,0x0
+    100001a8:	00bc282d 	daddu	a1,a1,gp
+    100001ac:	dca58020 	ld	a1,-32736\(a1\)
+    100001b0:	00b1282d 	daddu	a1,a1,s1
+    100001b4:	dca50000 	ld	a1,0\(a1\)
+    100001b8:	3c050000 	lui	a1,0x0
+    100001bc:	00bc282d 	daddu	a1,a1,gp
+    100001c0:	dca58020 	ld	a1,-32736\(a1\)
+    100001c4:	00b1282d 	daddu	a1,a1,s1
+    100001c8:	dca5000c 	ld	a1,12\(a1\)
+    100001cc:	3c010000 	lui	at,0x0
+    100001d0:	003c082d 	daddu	at,at,gp
+    100001d4:	dc218020 	ld	at,-32736\(at\)
+    100001d8:	0025082d 	daddu	at,at,a1
+    100001dc:	dc250022 	ld	a1,34\(at\)
+    100001e0:	3c010000 	lui	at,0x0
+    100001e4:	003c082d 	daddu	at,at,gp
+    100001e8:	dc218020 	ld	at,-32736\(at\)
+    100001ec:	0025082d 	daddu	at,at,a1
+    100001f0:	fc250038 	sd	a1,56\(at\)
+    100001f4:	3c010000 	lui	at,0x0
+    100001f8:	003c082d 	daddu	at,at,gp
+    100001fc:	dc218020 	ld	at,-32736\(at\)
     10000200:	88250000 	lwl	a1,0\(at\)
     10000204:	98250003 	lwr	a1,3\(at\)
     10000208:	3c010000 	lui	at,0x0
     1000020c:	003c082d 	daddu	at,at,gp
-    10000210:	dc218058 	ld	at,-32680\(at\)
+    10000210:	dc218020 	ld	at,-32736\(at\)
     10000214:	6421000c 	daddiu	at,at,12
-    10000218:	0031082d 	daddu	at,at,s1
-    1000021c:	88250000 	lwl	a1,0\(at\)
-    10000220:	98250003 	lwr	a1,3\(at\)
-    10000224:	3c010000 	lui	at,0x0
-    10000228:	003c082d 	daddu	at,at,gp
-    1000022c:	dc218058 	ld	at,-32680\(at\)
-    10000230:	64210022 	daddiu	at,at,34
-    10000234:	0025082d 	daddu	at,at,a1
-    10000238:	88250000 	lwl	a1,0\(at\)
-    1000023c:	98250003 	lwr	a1,3\(at\)
-    10000240:	3c010000 	lui	at,0x0
-    10000244:	003c082d 	daddu	at,at,gp
-    10000248:	dc218058 	ld	at,-32680\(at\)
-    1000024c:	64210038 	daddiu	at,at,56
-    10000250:	0025082d 	daddu	at,at,a1
-    10000254:	a8250000 	swl	a1,0\(at\)
-    10000258:	b8250003 	swr	a1,3\(at\)
-    1000025c:	df858020 	ld	a1,-32736\(gp\)
-    10000260:	64a5071c 	daddiu	a1,a1,1820
-    10000264:	df858020 	ld	a1,-32736\(gp\)
-    10000268:	64a50728 	daddiu	a1,a1,1832
-    1000026c:	df858028 	ld	a1,-32728\(gp\)
-    10000270:	64a5e95c 	daddiu	a1,a1,-5796
-    10000274:	df858020 	ld	a1,-32736\(gp\)
-    10000278:	64a5071c 	daddiu	a1,a1,1820
-    1000027c:	00b1282d 	daddu	a1,a1,s1
-    10000280:	df858020 	ld	a1,-32736\(gp\)
-    10000284:	64a50728 	daddiu	a1,a1,1832
-    10000288:	00b1282d 	daddu	a1,a1,s1
+    10000218:	88250000 	lwl	a1,0\(at\)
+    1000021c:	98250003 	lwr	a1,3\(at\)
+    10000220:	3c010000 	lui	at,0x0
+    10000224:	003c082d 	daddu	at,at,gp
+    10000228:	dc218020 	ld	at,-32736\(at\)
+    1000022c:	0031082d 	daddu	at,at,s1
+    10000230:	88250000 	lwl	a1,0\(at\)
+    10000234:	98250003 	lwr	a1,3\(at\)
+    10000238:	3c010000 	lui	at,0x0
+    1000023c:	003c082d 	daddu	at,at,gp
+    10000240:	dc218020 	ld	at,-32736\(at\)
+    10000244:	6421000c 	daddiu	at,at,12
+    10000248:	0031082d 	daddu	at,at,s1
+    1000024c:	88250000 	lwl	a1,0\(at\)
+    10000250:	98250003 	lwr	a1,3\(at\)
+    10000254:	3c010000 	lui	at,0x0
+    10000258:	003c082d 	daddu	at,at,gp
+    1000025c:	dc218020 	ld	at,-32736\(at\)
+    10000260:	64210022 	daddiu	at,at,34
+    10000264:	0025082d 	daddu	at,at,a1
+    10000268:	88250000 	lwl	a1,0\(at\)
+    1000026c:	98250003 	lwr	a1,3\(at\)
+    10000270:	3c010000 	lui	at,0x0
+    10000274:	003c082d 	daddu	at,at,gp
+    10000278:	dc218020 	ld	at,-32736\(at\)
+    1000027c:	64210038 	daddiu	at,at,56
+    10000280:	0025082d 	daddu	at,at,a1
+    10000284:	a8250000 	swl	a1,0\(at\)
+    10000288:	b8250003 	swr	a1,3\(at\)
     1000028c:	df858028 	ld	a1,-32728\(gp\)
-    10000290:	64a5e95c 	daddiu	a1,a1,-5796
-    10000294:	00b1282d 	daddu	a1,a1,s1
-    10000298:	df858020 	ld	a1,-32736\(gp\)
-    1000029c:	dca5071c 	ld	a1,1820\(a1\)
-    100002a0:	df858020 	ld	a1,-32736\(gp\)
-    100002a4:	dca50728 	ld	a1,1832\(a1\)
-    100002a8:	df858020 	ld	a1,-32736\(gp\)
+    10000290:	64a5075c 	daddiu	a1,a1,1884
+    10000294:	df858028 	ld	a1,-32728\(gp\)
+    10000298:	64a50768 	daddiu	a1,a1,1896
+    1000029c:	df858030 	ld	a1,-32720\(gp\)
+    100002a0:	64a5e99c 	daddiu	a1,a1,-5732
+    100002a4:	df858028 	ld	a1,-32728\(gp\)
+    100002a8:	64a5075c 	daddiu	a1,a1,1884
     100002ac:	00b1282d 	daddu	a1,a1,s1
-    100002b0:	dca5071c 	ld	a1,1820\(a1\)
-    100002b4:	df858020 	ld	a1,-32736\(gp\)
+    100002b0:	df858028 	ld	a1,-32728\(gp\)
+    100002b4:	64a50768 	daddiu	a1,a1,1896
     100002b8:	00b1282d 	daddu	a1,a1,s1
-    100002bc:	dca50728 	ld	a1,1832\(a1\)
-    100002c0:	df818020 	ld	at,-32736\(gp\)
-    100002c4:	0025082d 	daddu	at,at,a1
-    100002c8:	dc25073e 	ld	a1,1854\(at\)
-    100002cc:	df818020 	ld	at,-32736\(gp\)
-    100002d0:	0025082d 	daddu	at,at,a1
-    100002d4:	fc250754 	sd	a1,1876\(at\)
-    100002d8:	df818020 	ld	at,-32736\(gp\)
-    100002dc:	6421071c 	daddiu	at,at,1820
-    100002e0:	88250000 	lwl	a1,0\(at\)
-    100002e4:	98250003 	lwr	a1,3\(at\)
-    100002e8:	df818020 	ld	at,-32736\(gp\)
-    100002ec:	64210728 	daddiu	at,at,1832
-    100002f0:	88250000 	lwl	a1,0\(at\)
-    100002f4:	98250003 	lwr	a1,3\(at\)
-    100002f8:	df818020 	ld	at,-32736\(gp\)
-    100002fc:	6421071c 	daddiu	at,at,1820
-    10000300:	0031082d 	daddu	at,at,s1
-    10000304:	88250000 	lwl	a1,0\(at\)
-    10000308:	98250003 	lwr	a1,3\(at\)
-    1000030c:	df818020 	ld	at,-32736\(gp\)
-    10000310:	64210728 	daddiu	at,at,1832
-    10000314:	0031082d 	daddu	at,at,s1
-    10000318:	88250000 	lwl	a1,0\(at\)
-    1000031c:	98250003 	lwr	a1,3\(at\)
-    10000320:	df818020 	ld	at,-32736\(gp\)
-    10000324:	6421073e 	daddiu	at,at,1854
-    10000328:	0025082d 	daddu	at,at,a1
-    1000032c:	88250000 	lwl	a1,0\(at\)
-    10000330:	98250003 	lwr	a1,3\(at\)
-    10000334:	df818020 	ld	at,-32736\(gp\)
-    10000338:	64210754 	daddiu	at,at,1876
-    1000033c:	0025082d 	daddu	at,at,a1
-    10000340:	a8250000 	swl	a1,0\(at\)
-    10000344:	b8250003 	swr	a1,3\(at\)
-    10000348:	3c050000 	lui	a1,0x0
-    1000034c:	00bc282d 	daddu	a1,a1,gp
-    10000350:	dca58048 	ld	a1,-32696\(a1\)
-    10000354:	df858030 	ld	a1,-32720\(gp\)
-    10000358:	64a500e0 	daddiu	a1,a1,224
-    1000035c:	3c190000 	lui	t9,0x0
-    10000360:	033cc82d 	daddu	t9,t9,gp
-    10000364:	df398048 	ld	t9,-32696\(t9\)
-    10000368:	df998030 	ld	t9,-32720\(gp\)
-    1000036c:	673900e0 	daddiu	t9,t9,224
-    10000370:	3c190000 	lui	t9,0x0
-    10000374:	033cc82d 	daddu	t9,t9,gp
-    10000378:	df398048 	ld	t9,-32696\(t9\)
-    1000037c:	0320f809 	jalr	t9
-    10000380:	00000000 	nop
-    10000384:	df998030 	ld	t9,-32720\(gp\)
-    10000388:	673900e0 	daddiu	t9,t9,224
-    1000038c:	0320f809 	jalr	t9
-    10000390:	00000000 	nop
-    10000394:	3c050000 	lui	a1,0x0
-    10000398:	00bc282d 	daddu	a1,a1,gp
-    1000039c:	dca58060 	ld	a1,-32672\(a1\)
-    100003a0:	3c050000 	lui	a1,0x0
-    100003a4:	00bc282d 	daddu	a1,a1,gp
-    100003a8:	dca58060 	ld	a1,-32672\(a1\)
-    100003ac:	64a5000c 	daddiu	a1,a1,12
-    100003b0:	3c050000 	lui	a1,0x0
-    100003b4:	00bc282d 	daddu	a1,a1,gp
-    100003b8:	dca58060 	ld	a1,-32672\(a1\)
-    100003bc:	3c010002 	lui	at,0x2
-    100003c0:	6421e240 	daddiu	at,at,-7616
-    100003c4:	00a1282d 	daddu	a1,a1,at
-    100003c8:	3c050000 	lui	a1,0x0
-    100003cc:	00bc282d 	daddu	a1,a1,gp
-    100003d0:	dca58060 	ld	a1,-32672\(a1\)
-    100003d4:	00b1282d 	daddu	a1,a1,s1
-    100003d8:	3c050000 	lui	a1,0x0
-    100003dc:	00bc282d 	daddu	a1,a1,gp
-    100003e0:	dca58060 	ld	a1,-32672\(a1\)
-    100003e4:	64a5000c 	daddiu	a1,a1,12
-    100003e8:	00b1282d 	daddu	a1,a1,s1
-    100003ec:	3c050000 	lui	a1,0x0
-    100003f0:	00bc282d 	daddu	a1,a1,gp
-    100003f4:	dca58060 	ld	a1,-32672\(a1\)
-    100003f8:	3c010002 	lui	at,0x2
-    100003fc:	6421e240 	daddiu	at,at,-7616
-    10000400:	00a1282d 	daddu	a1,a1,at
+    100002bc:	df858030 	ld	a1,-32720\(gp\)
+    100002c0:	64a5e99c 	daddiu	a1,a1,-5732
+    100002c4:	00b1282d 	daddu	a1,a1,s1
+    100002c8:	df858028 	ld	a1,-32728\(gp\)
+    100002cc:	dca5075c 	ld	a1,1884\(a1\)
+    100002d0:	df858028 	ld	a1,-32728\(gp\)
+    100002d4:	dca50768 	ld	a1,1896\(a1\)
+    100002d8:	df858028 	ld	a1,-32728\(gp\)
+    100002dc:	00b1282d 	daddu	a1,a1,s1
+    100002e0:	dca5075c 	ld	a1,1884\(a1\)
+    100002e4:	df858028 	ld	a1,-32728\(gp\)
+    100002e8:	00b1282d 	daddu	a1,a1,s1
+    100002ec:	dca50768 	ld	a1,1896\(a1\)
+    100002f0:	df818028 	ld	at,-32728\(gp\)
+    100002f4:	0025082d 	daddu	at,at,a1
+    100002f8:	dc25077e 	ld	a1,1918\(at\)
+    100002fc:	df818028 	ld	at,-32728\(gp\)
+    10000300:	0025082d 	daddu	at,at,a1
+    10000304:	fc250794 	sd	a1,1940\(at\)
+    10000308:	df818028 	ld	at,-32728\(gp\)
+    1000030c:	6421075c 	daddiu	at,at,1884
+    10000310:	88250000 	lwl	a1,0\(at\)
+    10000314:	98250003 	lwr	a1,3\(at\)
+    10000318:	df818028 	ld	at,-32728\(gp\)
+    1000031c:	64210768 	daddiu	at,at,1896
+    10000320:	88250000 	lwl	a1,0\(at\)
+    10000324:	98250003 	lwr	a1,3\(at\)
+    10000328:	df818028 	ld	at,-32728\(gp\)
+    1000032c:	6421075c 	daddiu	at,at,1884
+    10000330:	0031082d 	daddu	at,at,s1
+    10000334:	88250000 	lwl	a1,0\(at\)
+    10000338:	98250003 	lwr	a1,3\(at\)
+    1000033c:	df818028 	ld	at,-32728\(gp\)
+    10000340:	64210768 	daddiu	at,at,1896
+    10000344:	0031082d 	daddu	at,at,s1
+    10000348:	88250000 	lwl	a1,0\(at\)
+    1000034c:	98250003 	lwr	a1,3\(at\)
+    10000350:	df818028 	ld	at,-32728\(gp\)
+    10000354:	6421077e 	daddiu	at,at,1918
+    10000358:	0025082d 	daddu	at,at,a1
+    1000035c:	88250000 	lwl	a1,0\(at\)
+    10000360:	98250003 	lwr	a1,3\(at\)
+    10000364:	df818028 	ld	at,-32728\(gp\)
+    10000368:	64210794 	daddiu	at,at,1940
+    1000036c:	0025082d 	daddu	at,at,a1
+    10000370:	a8250000 	swl	a1,0\(at\)
+    10000374:	b8250003 	swr	a1,3\(at\)
+    10000378:	3c050000 	lui	a1,0x0
+    1000037c:	00bc282d 	daddu	a1,a1,gp
+    10000380:	dca58038 	ld	a1,-32712\(a1\)
+    10000384:	df858040 	ld	a1,-32704\(gp\)
+    10000388:	64a50110 	daddiu	a1,a1,272
+    1000038c:	3c190000 	lui	t9,0x0
+    10000390:	033cc82d 	daddu	t9,t9,gp
+    10000394:	df398038 	ld	t9,-32712\(t9\)
+    10000398:	df998040 	ld	t9,-32704\(gp\)
+    1000039c:	67390110 	daddiu	t9,t9,272
+    100003a0:	3c190000 	lui	t9,0x0
+    100003a4:	033cc82d 	daddu	t9,t9,gp
+    100003a8:	df398038 	ld	t9,-32712\(t9\)
+    100003ac:	0411ff58 	bal	10000110 <fn>
+    100003b0:	00000000 	nop
+    100003b4:	df998040 	ld	t9,-32704\(gp\)
+    100003b8:	67390110 	daddiu	t9,t9,272
+    100003bc:	0411ff54 	bal	10000110 <fn>
+    100003c0:	00000000 	nop
+    100003c4:	3c050000 	lui	a1,0x0
+    100003c8:	00bc282d 	daddu	a1,a1,gp
+    100003cc:	dca58048 	ld	a1,-32696\(a1\)
+    100003d0:	3c050000 	lui	a1,0x0
+    100003d4:	00bc282d 	daddu	a1,a1,gp
+    100003d8:	dca58048 	ld	a1,-32696\(a1\)
+    100003dc:	64a5000c 	daddiu	a1,a1,12
+    100003e0:	3c050000 	lui	a1,0x0
+    100003e4:	00bc282d 	daddu	a1,a1,gp
+    100003e8:	dca58048 	ld	a1,-32696\(a1\)
+    100003ec:	3c010001 	lui	at,0x1
+    100003f0:	3421e240 	ori	at,at,0xe240
+    100003f4:	00a1282d 	daddu	a1,a1,at
+    100003f8:	3c050000 	lui	a1,0x0
+    100003fc:	00bc282d 	daddu	a1,a1,gp
+    10000400:	dca58048 	ld	a1,-32696\(a1\)
     10000404:	00b1282d 	daddu	a1,a1,s1
     10000408:	3c050000 	lui	a1,0x0
     1000040c:	00bc282d 	daddu	a1,a1,gp
-    10000410:	dca58060 	ld	a1,-32672\(a1\)
-    10000414:	dca50000 	ld	a1,0\(a1\)
-    10000418:	3c050000 	lui	a1,0x0
-    1000041c:	00bc282d 	daddu	a1,a1,gp
-    10000420:	dca58060 	ld	a1,-32672\(a1\)
-    10000424:	dca5000c 	ld	a1,12\(a1\)
-    10000428:	3c050000 	lui	a1,0x0
-    1000042c:	00bc282d 	daddu	a1,a1,gp
-    10000430:	dca58060 	ld	a1,-32672\(a1\)
+    10000410:	dca58048 	ld	a1,-32696\(a1\)
+    10000414:	64a5000c 	daddiu	a1,a1,12
+    10000418:	00b1282d 	daddu	a1,a1,s1
+    1000041c:	3c050000 	lui	a1,0x0
+    10000420:	00bc282d 	daddu	a1,a1,gp
+    10000424:	dca58048 	ld	a1,-32696\(a1\)
+    10000428:	3c010001 	lui	at,0x1
+    1000042c:	3421e240 	ori	at,at,0xe240
+    10000430:	00a1282d 	daddu	a1,a1,at
     10000434:	00b1282d 	daddu	a1,a1,s1
-    10000438:	dca50000 	ld	a1,0\(a1\)
-    1000043c:	3c050000 	lui	a1,0x0
-    10000440:	00bc282d 	daddu	a1,a1,gp
-    10000444:	dca58060 	ld	a1,-32672\(a1\)
-    10000448:	00b1282d 	daddu	a1,a1,s1
-    1000044c:	dca5000c 	ld	a1,12\(a1\)
-    10000450:	3c010000 	lui	at,0x0
-    10000454:	003c082d 	daddu	at,at,gp
-    10000458:	dc218060 	ld	at,-32672\(at\)
-    1000045c:	0025082d 	daddu	at,at,a1
-    10000460:	dc250022 	ld	a1,34\(at\)
-    10000464:	3c010000 	lui	at,0x0
-    10000468:	003c082d 	daddu	at,at,gp
-    1000046c:	dc218060 	ld	at,-32672\(at\)
-    10000470:	0025082d 	daddu	at,at,a1
-    10000474:	fc250038 	sd	a1,56\(at\)
-    10000478:	3c010000 	lui	at,0x0
-    1000047c:	003c082d 	daddu	at,at,gp
-    10000480:	dc218060 	ld	at,-32672\(at\)
-    10000484:	88250000 	lwl	a1,0\(at\)
-    10000488:	98250003 	lwr	a1,3\(at\)
-    1000048c:	3c010000 	lui	at,0x0
-    10000490:	003c082d 	daddu	at,at,gp
-    10000494:	dc218060 	ld	at,-32672\(at\)
-    10000498:	6421000c 	daddiu	at,at,12
-    1000049c:	88250000 	lwl	a1,0\(at\)
-    100004a0:	98250003 	lwr	a1,3\(at\)
-    100004a4:	3c010000 	lui	at,0x0
-    100004a8:	003c082d 	daddu	at,at,gp
-    100004ac:	dc218060 	ld	at,-32672\(at\)
-    100004b0:	0031082d 	daddu	at,at,s1
+    10000438:	3c050000 	lui	a1,0x0
+    1000043c:	00bc282d 	daddu	a1,a1,gp
+    10000440:	dca58048 	ld	a1,-32696\(a1\)
+    10000444:	dca50000 	ld	a1,0\(a1\)
+    10000448:	3c050000 	lui	a1,0x0
+    1000044c:	00bc282d 	daddu	a1,a1,gp
+    10000450:	dca58048 	ld	a1,-32696\(a1\)
+    10000454:	dca5000c 	ld	a1,12\(a1\)
+    10000458:	3c050000 	lui	a1,0x0
+    1000045c:	00bc282d 	daddu	a1,a1,gp
+    10000460:	dca58048 	ld	a1,-32696\(a1\)
+    10000464:	00b1282d 	daddu	a1,a1,s1
+    10000468:	dca50000 	ld	a1,0\(a1\)
+    1000046c:	3c050000 	lui	a1,0x0
+    10000470:	00bc282d 	daddu	a1,a1,gp
+    10000474:	dca58048 	ld	a1,-32696\(a1\)
+    10000478:	00b1282d 	daddu	a1,a1,s1
+    1000047c:	dca5000c 	ld	a1,12\(a1\)
+    10000480:	3c010000 	lui	at,0x0
+    10000484:	003c082d 	daddu	at,at,gp
+    10000488:	dc218048 	ld	at,-32696\(at\)
+    1000048c:	0025082d 	daddu	at,at,a1
+    10000490:	dc250022 	ld	a1,34\(at\)
+    10000494:	3c010000 	lui	at,0x0
+    10000498:	003c082d 	daddu	at,at,gp
+    1000049c:	dc218048 	ld	at,-32696\(at\)
+    100004a0:	0025082d 	daddu	at,at,a1
+    100004a4:	fc250038 	sd	a1,56\(at\)
+    100004a8:	3c010000 	lui	at,0x0
+    100004ac:	003c082d 	daddu	at,at,gp
+    100004b0:	dc218048 	ld	at,-32696\(at\)
     100004b4:	88250000 	lwl	a1,0\(at\)
     100004b8:	98250003 	lwr	a1,3\(at\)
     100004bc:	3c010000 	lui	at,0x0
     100004c0:	003c082d 	daddu	at,at,gp
-    100004c4:	dc218060 	ld	at,-32672\(at\)
+    100004c4:	dc218048 	ld	at,-32696\(at\)
     100004c8:	6421000c 	daddiu	at,at,12
-    100004cc:	0031082d 	daddu	at,at,s1
-    100004d0:	88250000 	lwl	a1,0\(at\)
-    100004d4:	98250003 	lwr	a1,3\(at\)
-    100004d8:	3c010000 	lui	at,0x0
-    100004dc:	003c082d 	daddu	at,at,gp
-    100004e0:	dc218060 	ld	at,-32672\(at\)
-    100004e4:	64210022 	daddiu	at,at,34
-    100004e8:	0025082d 	daddu	at,at,a1
-    100004ec:	88250000 	lwl	a1,0\(at\)
-    100004f0:	98250003 	lwr	a1,3\(at\)
-    100004f4:	3c010000 	lui	at,0x0
-    100004f8:	003c082d 	daddu	at,at,gp
-    100004fc:	dc218060 	ld	at,-32672\(at\)
-    10000500:	64210038 	daddiu	at,at,56
-    10000504:	0025082d 	daddu	at,at,a1
-    10000508:	a8250000 	swl	a1,0\(at\)
-    1000050c:	b8250003 	swr	a1,3\(at\)
-    10000510:	df858020 	ld	a1,-32736\(gp\)
-    10000514:	64a50794 	daddiu	a1,a1,1940
-    10000518:	df858020 	ld	a1,-32736\(gp\)
-    1000051c:	64a507a0 	daddiu	a1,a1,1952
-    10000520:	df858028 	ld	a1,-32728\(gp\)
-    10000524:	64a5e9d4 	daddiu	a1,a1,-5676
-    10000528:	df858020 	ld	a1,-32736\(gp\)
-    1000052c:	64a50794 	daddiu	a1,a1,1940
-    10000530:	00b1282d 	daddu	a1,a1,s1
-    10000534:	df858020 	ld	a1,-32736\(gp\)
-    10000538:	64a507a0 	daddiu	a1,a1,1952
-    1000053c:	00b1282d 	daddu	a1,a1,s1
+    100004cc:	88250000 	lwl	a1,0\(at\)
+    100004d0:	98250003 	lwr	a1,3\(at\)
+    100004d4:	3c010000 	lui	at,0x0
+    100004d8:	003c082d 	daddu	at,at,gp
+    100004dc:	dc218048 	ld	at,-32696\(at\)
+    100004e0:	0031082d 	daddu	at,at,s1
+    100004e4:	88250000 	lwl	a1,0\(at\)
+    100004e8:	98250003 	lwr	a1,3\(at\)
+    100004ec:	3c010000 	lui	at,0x0
+    100004f0:	003c082d 	daddu	at,at,gp
+    100004f4:	dc218048 	ld	at,-32696\(at\)
+    100004f8:	6421000c 	daddiu	at,at,12
+    100004fc:	0031082d 	daddu	at,at,s1
+    10000500:	88250000 	lwl	a1,0\(at\)
+    10000504:	98250003 	lwr	a1,3\(at\)
+    10000508:	3c010000 	lui	at,0x0
+    1000050c:	003c082d 	daddu	at,at,gp
+    10000510:	dc218048 	ld	at,-32696\(at\)
+    10000514:	64210022 	daddiu	at,at,34
+    10000518:	0025082d 	daddu	at,at,a1
+    1000051c:	88250000 	lwl	a1,0\(at\)
+    10000520:	98250003 	lwr	a1,3\(at\)
+    10000524:	3c010000 	lui	at,0x0
+    10000528:	003c082d 	daddu	at,at,gp
+    1000052c:	dc218048 	ld	at,-32696\(at\)
+    10000530:	64210038 	daddiu	at,at,56
+    10000534:	0025082d 	daddu	at,at,a1
+    10000538:	a8250000 	swl	a1,0\(at\)
+    1000053c:	b8250003 	swr	a1,3\(at\)
     10000540:	df858028 	ld	a1,-32728\(gp\)
-    10000544:	64a5e9d4 	daddiu	a1,a1,-5676
-    10000548:	00b1282d 	daddu	a1,a1,s1
-    1000054c:	df858020 	ld	a1,-32736\(gp\)
-    10000550:	dca50794 	ld	a1,1940\(a1\)
-    10000554:	df858020 	ld	a1,-32736\(gp\)
-    10000558:	dca507a0 	ld	a1,1952\(a1\)
-    1000055c:	df858020 	ld	a1,-32736\(gp\)
+    10000544:	64a507d4 	daddiu	a1,a1,2004
+    10000548:	df858028 	ld	a1,-32728\(gp\)
+    1000054c:	64a507e0 	daddiu	a1,a1,2016
+    10000550:	df858030 	ld	a1,-32720\(gp\)
+    10000554:	64a5ea14 	daddiu	a1,a1,-5612
+    10000558:	df858028 	ld	a1,-32728\(gp\)
+    1000055c:	64a507d4 	daddiu	a1,a1,2004
     10000560:	00b1282d 	daddu	a1,a1,s1
-    10000564:	dca50794 	ld	a1,1940\(a1\)
-    10000568:	df858020 	ld	a1,-32736\(gp\)
+    10000564:	df858028 	ld	a1,-32728\(gp\)
+    10000568:	64a507e0 	daddiu	a1,a1,2016
     1000056c:	00b1282d 	daddu	a1,a1,s1
-    10000570:	dca507a0 	ld	a1,1952\(a1\)
-    10000574:	df818020 	ld	at,-32736\(gp\)
-    10000578:	0025082d 	daddu	at,at,a1
-    1000057c:	dc250794 	ld	a1,1940\(at\)
-    10000580:	df818020 	ld	at,-32736\(gp\)
-    10000584:	0025082d 	daddu	at,at,a1
-    10000588:	fc2507cc 	sd	a1,1996\(at\)
-    1000058c:	df818020 	ld	at,-32736\(gp\)
-    10000590:	64210794 	daddiu	at,at,1940
-    10000594:	88250000 	lwl	a1,0\(at\)
-    10000598:	98250003 	lwr	a1,3\(at\)
-    1000059c:	df818020 	ld	at,-32736\(gp\)
-    100005a0:	642107a0 	daddiu	at,at,1952
-    100005a4:	88250000 	lwl	a1,0\(at\)
-    100005a8:	98250003 	lwr	a1,3\(at\)
-    100005ac:	df818020 	ld	at,-32736\(gp\)
-    100005b0:	64210794 	daddiu	at,at,1940
-    100005b4:	0031082d 	daddu	at,at,s1
-    100005b8:	88250000 	lwl	a1,0\(at\)
-    100005bc:	98250003 	lwr	a1,3\(at\)
-    100005c0:	df818020 	ld	at,-32736\(gp\)
-    100005c4:	642107a0 	daddiu	at,at,1952
-    100005c8:	0031082d 	daddu	at,at,s1
-    100005cc:	88250000 	lwl	a1,0\(at\)
-    100005d0:	98250003 	lwr	a1,3\(at\)
-    100005d4:	df818020 	ld	at,-32736\(gp\)
-    100005d8:	642107b6 	daddiu	at,at,1974
-    100005dc:	0025082d 	daddu	at,at,a1
-    100005e0:	88250000 	lwl	a1,0\(at\)
-    100005e4:	98250003 	lwr	a1,3\(at\)
-    100005e8:	df818020 	ld	at,-32736\(gp\)
-    100005ec:	642107cc 	daddiu	at,at,1996
-    100005f0:	0025082d 	daddu	at,at,a1
-    100005f4:	a8250000 	swl	a1,0\(at\)
-    100005f8:	b8250003 	swr	a1,3\(at\)
-    100005fc:	3c050000 	lui	a1,0x0
-    10000600:	00bc282d 	daddu	a1,a1,gp
-    10000604:	dca58050 	ld	a1,-32688\(a1\)
-    10000608:	df858030 	ld	a1,-32720\(gp\)
-    1000060c:	64a506e0 	daddiu	a1,a1,1760
-    10000610:	3c190000 	lui	t9,0x0
-    10000614:	033cc82d 	daddu	t9,t9,gp
-    10000618:	df398050 	ld	t9,-32688\(t9\)
-    1000061c:	df998030 	ld	t9,-32720\(gp\)
-    10000620:	673906e0 	daddiu	t9,t9,1760
-    10000624:	3c190000 	lui	t9,0x0
-    10000628:	033cc82d 	daddu	t9,t9,gp
-    1000062c:	df398050 	ld	t9,-32688\(t9\)
-    10000630:	0320f809 	jalr	t9
-    10000634:	00000000 	nop
-    10000638:	df998030 	ld	t9,-32720\(gp\)
-    1000063c:	673906e0 	daddiu	t9,t9,1760
-    10000640:	0320f809 	jalr	t9
-    10000644:	00000000 	nop
-    10000648:	3c050000 	lui	a1,0x0
-    1000064c:	00bc282d 	daddu	a1,a1,gp
-    10000650:	dca58058 	ld	a1,-32680\(a1\)
-    10000654:	1000fea2 	b	100000e0 <fn>
-    10000658:	00000000 	nop
-    1000065c:	3c050000 	lui	a1,0x0
-    10000660:	00bc282d 	daddu	a1,a1,gp
-    10000664:	dca58060 	ld	a1,-32672\(a1\)
-    10000668:	dca50000 	ld	a1,0\(a1\)
-    1000066c:	1000001c 	b	100006e0 <fn2>
-    10000670:	00000000 	nop
-    10000674:	df858020 	ld	a1,-32736\(gp\)
-    10000678:	64a5071c 	daddiu	a1,a1,1820
-    1000067c:	1000fe98 	b	100000e0 <fn>
-    10000680:	00000000 	nop
-    10000684:	df858020 	ld	a1,-32736\(gp\)
-    10000688:	64a507a0 	daddiu	a1,a1,1952
-    1000068c:	10000014 	b	100006e0 <fn2>
-    10000690:	00000000 	nop
-    10000694:	df858028 	ld	a1,-32728\(gp\)
-    10000698:	64a5e95c 	daddiu	a1,a1,-5796
-    1000069c:	1000fe90 	b	100000e0 <fn>
+    10000570:	df858030 	ld	a1,-32720\(gp\)
+    10000574:	64a5ea14 	daddiu	a1,a1,-5612
+    10000578:	00b1282d 	daddu	a1,a1,s1
+    1000057c:	df858028 	ld	a1,-32728\(gp\)
+    10000580:	dca507d4 	ld	a1,2004\(a1\)
+    10000584:	df858028 	ld	a1,-32728\(gp\)
+    10000588:	dca507e0 	ld	a1,2016\(a1\)
+    1000058c:	df858028 	ld	a1,-32728\(gp\)
+    10000590:	00b1282d 	daddu	a1,a1,s1
+    10000594:	dca507d4 	ld	a1,2004\(a1\)
+    10000598:	df858028 	ld	a1,-32728\(gp\)
+    1000059c:	00b1282d 	daddu	a1,a1,s1
+    100005a0:	dca507e0 	ld	a1,2016\(a1\)
+    100005a4:	df818028 	ld	at,-32728\(gp\)
+    100005a8:	0025082d 	daddu	at,at,a1
+    100005ac:	dc2507f6 	ld	a1,2038\(at\)
+    100005b0:	df818028 	ld	at,-32728\(gp\)
+    100005b4:	0025082d 	daddu	at,at,a1
+    100005b8:	fc25080c 	sd	a1,2060\(at\)
+    100005bc:	df818028 	ld	at,-32728\(gp\)
+    100005c0:	642107d4 	daddiu	at,at,2004
+    100005c4:	88250000 	lwl	a1,0\(at\)
+    100005c8:	98250003 	lwr	a1,3\(at\)
+    100005cc:	df818028 	ld	at,-32728\(gp\)
+    100005d0:	642107e0 	daddiu	at,at,2016
+    100005d4:	88250000 	lwl	a1,0\(at\)
+    100005d8:	98250003 	lwr	a1,3\(at\)
+    100005dc:	df818028 	ld	at,-32728\(gp\)
+    100005e0:	642107d4 	daddiu	at,at,2004
+    100005e4:	0031082d 	daddu	at,at,s1
+    100005e8:	88250000 	lwl	a1,0\(at\)
+    100005ec:	98250003 	lwr	a1,3\(at\)
+    100005f0:	df818028 	ld	at,-32728\(gp\)
+    100005f4:	642107e0 	daddiu	at,at,2016
+    100005f8:	0031082d 	daddu	at,at,s1
+    100005fc:	88250000 	lwl	a1,0\(at\)
+    10000600:	98250003 	lwr	a1,3\(at\)
+    10000604:	df818028 	ld	at,-32728\(gp\)
+    10000608:	642107f6 	daddiu	at,at,2038
+    1000060c:	0025082d 	daddu	at,at,a1
+    10000610:	88250000 	lwl	a1,0\(at\)
+    10000614:	98250003 	lwr	a1,3\(at\)
+    10000618:	df818028 	ld	at,-32728\(gp\)
+    1000061c:	6421080c 	daddiu	at,at,2060
+    10000620:	0025082d 	daddu	at,at,a1
+    10000624:	a8250000 	swl	a1,0\(at\)
+    10000628:	b8250003 	swr	a1,3\(at\)
+    1000062c:	3c050000 	lui	a1,0x0
+    10000630:	00bc282d 	daddu	a1,a1,gp
+    10000634:	dca58050 	ld	a1,-32688\(a1\)
+    10000638:	df858040 	ld	a1,-32704\(gp\)
+    1000063c:	64a50710 	daddiu	a1,a1,1808
+    10000640:	3c190000 	lui	t9,0x0
+    10000644:	033cc82d 	daddu	t9,t9,gp
+    10000648:	df398050 	ld	t9,-32688\(t9\)
+    1000064c:	df998040 	ld	t9,-32704\(gp\)
+    10000650:	67390710 	daddiu	t9,t9,1808
+    10000654:	3c190000 	lui	t9,0x0
+    10000658:	033cc82d 	daddu	t9,t9,gp
+    1000065c:	df398050 	ld	t9,-32688\(t9\)
+    10000660:	0411002b 	bal	10000710 <fn2>
+    10000664:	00000000 	nop
+    10000668:	df998040 	ld	t9,-32704\(gp\)
+    1000066c:	67390710 	daddiu	t9,t9,1808
+    10000670:	04110027 	bal	10000710 <fn2>
+    10000674:	00000000 	nop
+    10000678:	3c050000 	lui	a1,0x0
+    1000067c:	00bc282d 	daddu	a1,a1,gp
+    10000680:	dca58020 	ld	a1,-32736\(a1\)
+    10000684:	1000fea2 	b	10000110 <fn>
+    10000688:	00000000 	nop
+    1000068c:	3c050000 	lui	a1,0x0
+    10000690:	00bc282d 	daddu	a1,a1,gp
+    10000694:	dca58048 	ld	a1,-32696\(a1\)
+    10000698:	dca50000 	ld	a1,0\(a1\)
+    1000069c:	1000001c 	b	10000710 <fn2>
     100006a0:	00000000 	nop
-    100006a4:	df858020 	ld	a1,-32736\(gp\)
-    100006a8:	dca50794 	ld	a1,1940\(a1\)
-    100006ac:	1000000c 	b	100006e0 <fn2>
+    100006a4:	df858028 	ld	a1,-32728\(gp\)
+    100006a8:	64a5075c 	daddiu	a1,a1,1884
+    100006ac:	1000fe98 	b	10000110 <fn>
     100006b0:	00000000 	nop
-    100006b4:	df858020 	ld	a1,-32736\(gp\)
-    100006b8:	dca50728 	ld	a1,1832\(a1\)
-    100006bc:	1000fe88 	b	100000e0 <fn>
+    100006b4:	df858028 	ld	a1,-32728\(gp\)
+    100006b8:	64a507e0 	daddiu	a1,a1,2016
+    100006bc:	10000014 	b	10000710 <fn2>
     100006c0:	00000000 	nop
-    100006c4:	df818020 	ld	at,-32736\(gp\)
-    100006c8:	0025082d 	daddu	at,at,a1
-    100006cc:	dc2507b6 	ld	a1,1974\(at\)
-    100006d0:	10000003 	b	100006e0 <fn2>
-    100006d4:	00000000 	nop
+    100006c4:	df858030 	ld	a1,-32720\(gp\)
+    100006c8:	64a5e99c 	daddiu	a1,a1,-5732
+    100006cc:	1000fe90 	b	10000110 <fn>
+    100006d0:	00000000 	nop
+    100006d4:	df858028 	ld	a1,-32728\(gp\)
+    100006d8:	dca507d4 	ld	a1,2004\(a1\)
+    100006dc:	1000000c 	b	10000710 <fn2>
+    100006e0:	00000000 	nop
+    100006e4:	df858028 	ld	a1,-32728\(gp\)
+    100006e8:	dca50768 	ld	a1,1896\(a1\)
+    100006ec:	1000fe88 	b	10000110 <fn>
+    100006f0:	00000000 	nop
+    100006f4:	df818028 	ld	at,-32728\(gp\)
+    100006f8:	0025082d 	daddu	at,at,a1
+    100006fc:	dc2507f6 	ld	a1,2038\(at\)
+    10000700:	10000003 	b	10000710 <fn2>
+    10000704:	00000000 	nop
+	\.\.\.
+
+0000000010000710 <fn2>:
 	\.\.\.
 Disassembly of section \.data:
 
-00000000101006e0 <_fdata>:
+0000000010010720 <_fdata>:
 	\.\.\.
 
-000000001010071c <dg1>:
+000000001001075c <dg1>:
 	\.\.\.
 
-0000000010100758 <sp2>:
+0000000010010798 <sp2>:
 	\.\.\.
 
-0000000010100794 <dg2>:
+00000000100107d4 <dg2>:
 	\.\.\.
 Disassembly of section \.got:
 
-00000000101007d0 <_GLOBAL_OFFSET_TABLE_>:
+0000000010010810 <_GLOBAL_OFFSET_TABLE_>:
+	\.\.\.
+    10010818:	80000000 	.*
 	\.\.\.
-    101007d8:	80000000 	.*
-    101007dc:	00000000 	.*
-    101007e0:	00000000 	.*
-    101007e4:	10100000 	.*
-    101007e8:	00000000 	.*
-    101007ec:	10120000 	.*
-    101007f0:	00000000 	.*
-    101007f4:	10000000 	.*
-    101007f8:	00000000 	.*
+    10010824:	1001075c 	.*
+    10010828:	00000000 	.*
+    1001082c:	10010000 	.*
+    10010830:	00000000 	.*
+    10010834:	10030000 	.*
+    10010838:	00000000 	.*
+    1001083c:	10000110 	.*
+    10010840:	00000000 	.*
+    10010844:	10000000 	.*
+    10010848:	00000000 	.*
+    1001084c:	100107d4 	.*
+    10010850:	00000000 	.*
+    10010854:	10000710 	.*
+    10010858:	00000000 	.*
 	\.\.\.
-    1010080c:	100000e0 	.*
-    10100810:	00000000 	.*
-    10100814:	100006e0 	.*
-    10100818:	00000000 	.*
-    1010081c:	1010071c 	.*
-    10100820:	00000000 	.*
-    10100824:	10100794 	.*
diff --git a/ld/testsuite/ld-mips-elf/emit-relocs-1a.s b/ld/testsuite/ld-mips-elf/emit-relocs-1a.s
index 9176f97..35c3a6f 100644
--- a/ld/testsuite/ld-mips-elf/emit-relocs-1a.s
+++ b/ld/testsuite/ld-mips-elf/emit-relocs-1a.s
@@ -1,4 +1,5 @@
 	.text
+	.align	4
 	.globl	_start
 _start:
 	jr	$31
@@ -14,6 +15,7 @@ C:	.4byte	0x100
 D:	.4byte	0x200
 
 	.data
+	.align	4
 E:	.4byte	E
 	.4byte	E + 0x1000
 	.4byte	A
diff --git a/ld/testsuite/ld-mips-elf/emit-relocs-1b.s b/ld/testsuite/ld-mips-elf/emit-relocs-1b.s
index 0e88c14..82229c1 100644
--- a/ld/testsuite/ld-mips-elf/emit-relocs-1b.s
+++ b/ld/testsuite/ld-mips-elf/emit-relocs-1b.s
@@ -9,6 +9,7 @@ C:	.4byte	0x300
 D:	.4byte	0x200
 
 	.data
+	.align	4
 E:	.4byte	E
 	.4byte	E + 0x1000
 	.4byte	A
diff --git a/ld/testsuite/ld-mips-elf/jalbal.s b/ld/testsuite/ld-mips-elf/jalbal.s
index 4273b9f..acffabb 100644
--- a/ld/testsuite/ld-mips-elf/jalbal.s
+++ b/ld/testsuite/ld-mips-elf/jalbal.s
@@ -15,4 +15,7 @@ s3:
 	nop
 	jal	s2
 	nop
-	nop
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+	.align	2
+	.space	8
diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
index ffcb9c4..f50eae4 100644
--- a/ld/testsuite/ld-mips-elf/mips-elf.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf.exp
@@ -53,10 +53,39 @@ if {![istarget mips*-*-*] || ![is_elf_format]} {
     return
 }
 
-set has_newabi [expr [istarget *-*-irix6*] || [istarget mips64*-*-linux*]]
+set has_newabi [expr [istarget *-*-irix6*] \
+		     || [istarget mips64*-*-linux*] \
+		     || [istarget mips*-sde-elf*]]
 set linux_gnu [expr [istarget mips*-*-linux*]]
 set embedded_elf [expr [istarget mips*-*-elf]]
 
+# Set defaults.
+set abi_asflags(o32) ""
+set abi_asflags(n32) "-n32 -EB"
+set abi_asflags(n64) "-64 -EB"
+set abi_ldflags(o32) ""
+set abi_ldflags(n32) -melf32bmipn32
+set abi_ldflags(n64) -melf64bmip
+
+# Override as needed.
+if { [istarget *-*-irix6*] } {
+    set abi_asflags(o32) "-32 -EB"
+    set abi_ldflags(o32) -melf32bsmip
+} elseif { [istarget mips64*-linux*] } {
+    set abi_asflags(o32) "-32 -EB"
+    set abi_ldflags(o32) -melf32btsmip
+} elseif { [istarget mips64*-*freebsd*] } {
+    set abi_asflags(o32) "-32 -EB"
+    set abi_ldflags(o32) -melf32btsmip_fbsd
+}
+if { [istarget mips*-*-linux*] || [istarget mips*-sde-elf*] } {
+    set abi_ldflags(n32) -melf32btsmipn32
+    set abi_ldflags(n64) -melf64btsmip
+} elseif { [istarget mips64*-*freebsd*] } {
+    set abi_ldflags(n32) -melf32btsmipn32_fbsd
+    set abi_ldflags(n64) -melf64btsmip_fbsd
+}
+
 if { $linux_gnu } {
     run_ld_link_tests [list \
 	[list "Dummy shared library for MIPS16 PIC test 1" \
@@ -106,17 +135,6 @@ if { $linux_gnu } {
 	      "mips16-pic-4"]]
 }
 
-if { [istarget mips64*-linux-gnu] } {
-    set o32_as_flags "-32 -EB"
-    set o32_ld_flags "-melf32btsmip"
-} elseif { [istarget mips64*-*freebsd*] } {
-    set o32_as_flags "-32 -EB"
-    set o32_ld_flags "-melf32btsmip_fbsd"
-} else {
-    set o32_as_flags ""
-    set o32_ld_flags ""
-}
-
 # Check MIPS16 markings being passed through link.
 run_dump_test "mips16-1"
 
@@ -167,14 +185,28 @@ if { $linux_gnu } {
 }
 
 if $has_newabi {
-    run_dump_test "elf-rel-got-n32"
-    run_dump_test "elf-rel-xgot-n32"
+    if { $embedded_elf } {
+	run_dump_test "elf-rel-got-n32-embed" \
+					[list [list ld $abi_ldflags(n32)]]
+	run_dump_test "elf-rel-xgot-n32-embed" \
+					[list [list ld $abi_ldflags(n32)]]
+    } else {
+	run_dump_test "elf-rel-got-n32" [list [list ld $abi_ldflags(n32)]]
+	run_dump_test "elf-rel-xgot-n32" [list [list ld $abi_ldflags(n32)]]
+    }
     if { $linux_gnu } {
-	run_dump_test "elf-rel-got-n64-linux"
-	run_dump_test "elf-rel-xgot-n64-linux"
+	run_dump_test "elf-rel-got-n64-linux" \
+					[list [list ld $abi_ldflags(n64)]]
+	run_dump_test "elf-rel-xgot-n64-linux" \
+					[list [list ld $abi_ldflags(n64)]]
+    } elseif { $embedded_elf } {
+	run_dump_test "elf-rel-got-n64-embed" \
+					[list [list ld $abi_ldflags(n64)]]
+	run_dump_test "elf-rel-xgot-n64-embed" \
+					[list [list ld $abi_ldflags(n64)]]
     } else {
-	run_dump_test "elf-rel-got-n64"
-	run_dump_test "elf-rel-xgot-n64"
+	run_dump_test "elf-rel-got-n64" [list [list ld $abi_ldflags(n64)]]
+	run_dump_test "elf-rel-xgot-n64" [list [list ld $abi_ldflags(n64)]]
     }
 
     run_dump_test "relax-jalr-n32"
@@ -309,11 +341,8 @@ if $embedded_elf {
     run_dump_test "reloc-1-rel"
 }
 if $has_newabi {
-    run_dump_test "reloc-1-n32"
-    if $linux_gnu {
-	# Uses a linux-specific ld -m switch
-	run_dump_test "reloc-1-n64"
-    }
+    run_dump_test "reloc-1-n32" [list [list ld $abi_ldflags(n32)]]
+    run_dump_test "reloc-1-n64" [list [list ld $abi_ldflags(n64)]]
 }
 run_dump_test "reloc-2"
 run_dump_test "reloc-merge-lo16"
@@ -324,16 +353,21 @@ if {$has_newabi} {
 run_dump_test "reloc-4"
 run_dump_test "reloc-5"
 if { $has_newabi } {
-    run_ld_link_tests {
-	{"reloc test 6a" "-shared"
-	 "-n32" "reloc-6a.s"
-	 {}
-	 "reloc-6a.so"}
-	{"reloc test 6b" "tmpdir/reloc-6a.so"
-	 "-n32" "reloc-6b.s"
-	 {}
-	 "reloc-6b"}
-    }
+    run_ld_link_tests [list \
+	[list \
+	    "reloc test 6a" \
+	    "-shared $abi_ldflags(n32)" \
+	    "-n32" \
+	    "reloc-6a.s" \
+	    {} \
+	    "reloc-6a.so"] \
+	[list \
+	    "reloc test 6b" \
+	    "$abi_ldflags(n32) tmpdir/reloc-6a.so" \
+	    "-n32" \
+	    "reloc-6b.s" \
+	    {} \
+	    "reloc-6b"]]
 }
 
 if {$has_newabi && $linux_gnu} {
@@ -361,7 +395,7 @@ if {$linux_gnu} {
 run_dump_test "jaloverflow"
 run_dump_test "jaloverflow-2"
 if {$has_newabi} {
-    run_dump_test "jalbal"
+    run_dump_test "jalbal" [list [list ld $abi_ldflags(n32)]]
 }
 
 run_dump_test "mode-change-error-1"
@@ -503,8 +537,8 @@ if {[istarget mips*-*-linux*]} {
 
 set mips16_call_global_test [list \
     [list "Global calls from mips16" \
-	 "$o32_ld_flags -T no-shared-1.ld" \
-	 "$o32_as_flags -mips32r2" \
+	 "$abi_ldflags(o32) -T no-shared-1.ld" \
+	 "$abi_asflags(o32) -mips32r2" \
 	 {mips16-call-global-1.s mips16-call-global-2.s mips16-call-global-3.s} \
 	 {{objdump -dr mips16-call-global.d}} \
 	 "mips16-call-global"]]
@@ -513,8 +547,8 @@ run_ld_link_tests $mips16_call_global_test
 
 set mips16_intermix_test [list \
     [list "Intermixing mips32 and mips16 functions" \
-	 "$o32_ld_flags" \
-	 "$o32_as_flags -mips32r2" \
+	 "$abi_ldflags(o32)" \
+	 "$abi_asflags(o32) -mips32r2" \
 	 {mips16-intermix-1.s mips16-intermix-2.s} \
 	 {{objdump -t mips16-intermix.d}} \
 	 "mips16-intermix"]]
diff --git a/ld/testsuite/ld-mips-elf/reloc-1-n64.d b/ld/testsuite/ld-mips-elf/reloc-1-n64.d
index 2cfbe9a..6057c83 100644
--- a/ld/testsuite/ld-mips-elf/reloc-1-n64.d
+++ b/ld/testsuite/ld-mips-elf/reloc-1-n64.d
@@ -1,6 +1,6 @@
 #source: reloc-1a.s -mabi=64 -EB
 #source: reloc-1b.s -mabi=64 -EB
-#ld: -melf64btsmip -r
+#ld: -r
 #readelf: --relocs
 
 Relocation section '\.rela\.text' .*
diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index de0f7ad..0444a38 100644
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -436,7 +436,7 @@ proc ld_simple_link_defsyms {} {
     return $flags
 }
 
-# run_dump_test FILE
+# run_dump_test FILE (optional:) EXTRA_OPTIONS
 # Copied from gas testsuite, tweaked and further extended.
 #
 # Assemble a .s file, then run some utility on it and check the output.
@@ -461,6 +461,12 @@ proc ld_simple_link_defsyms {} {
 # list ends with the first line that doesn't match the above syntax
 # (hmm, not great for error detection).
 #
+# The optional EXTRA_OPTIONS argument to `run_dump_test' is a list of
+# two-element lists.  The first element of each is an option name, and
+# the second additional arguments to be added on to the end of the
+# option list as given in FILE.d.  (If omitted, no additional options
+# are added.)
+#
 # The interesting options are:
 #
 #   name: TEST-NAME
@@ -508,6 +514,11 @@ proc ld_simple_link_defsyms {} {
 #       More than one "source" directive can be given, which is useful
 #       when testing linking.
 #
+#   dump: DUMP
+#	Match against DUMP.d.  If omitted, this defaults to FILE.d.  This
+#	is useful if several .d files differ by options only.  Options are
+#	always read from FILE.d.
+#
 #   xfail: TARGET
 #       The test is expected to fail on TARGET.  This may occur more than
 #       once.
@@ -539,7 +550,7 @@ proc ld_simple_link_defsyms {} {
 # regexps in FILE.d.  `regexp_diff' is defined in binutils-common.exp;
 # see further comments there.
 #
-proc run_dump_test { name } {
+proc run_dump_test { name {extra_options {}} } {
     global subdir srcdir
     global OBJDUMP NM AS OBJCOPY READELF LD
     global OBJDUMPFLAGS NMFLAGS ASFLAGS OBJCOPYFLAGS READELFFLAGS LDFLAGS
@@ -579,6 +590,7 @@ proc run_dump_test { name } {
     set opts(name) {}
     set opts(PROG) {}
     set opts(source) {}
+    set opts(dump) {}
     set opts(error) {}
     set opts(warning) {}
     set opts(objcopy_linked_file) {}
@@ -641,6 +653,24 @@ proc run_dump_test { name } {
 	    }
 	}
     }
+
+    foreach i $extra_options {
+	set opt_name [lindex $i 0]
+	set opt_val [lindex $i 1]
+	if ![info exists opts($opt_name)] {
+	    perror "unknown option $opt_name given in extra_opts"
+	    unresolved $subdir/$name
+	    return
+	}
+	# Add extra option to end of existing option, adding space
+	# if necessary.
+	if { ![regexp "warning|error" $opt_name]
+	     && [string length $opts($opt_name)] } {
+	    append opts($opt_name) " "
+	}
+	append opts($opt_name) $opt_val
+    }
+
     foreach opt { as ld } {
 	regsub {\[big_or_little_endian\]} $opts($opt) \
 	    [big_or_little_endian] opts($opt)
@@ -721,6 +751,12 @@ proc run_dump_test { name } {
 	}
     }
 
+    if { $opts(dump) == "" } {
+	set dfile ${file}.d
+    } else {
+	set dfile $srcdir/$subdir/$opts(dump)
+    }
+
     # Time to setup xfailures.
     foreach targ $opts(xfail) {
 	setup_xfail $targ
@@ -876,7 +912,7 @@ proc run_dump_test { name } {
     }
 
     if { $verbose > 2 } then { verbose "output is [file_contents $dumpfile]" 3 }
-    if { [regexp_diff $dumpfile "${file}.d"] } then {
+    if { [regexp_diff $dumpfile "${dfile}"] } then {
 	fail $testname
 	if { $verbose == 2 } then { verbose "output is [file_contents $dumpfile]" 2 }
 	return