* lib/ld-lib.exp (run_ld_link_tests): Add another argument, pass

	its contents to ar_simple_create and ld_simple_link after
	objfiles.
	* ld-aarch64/aarch64-elf.exp: Adjust accordingly.
	* ld-alpha/alpha.exp: Likewise.
	* ld-arm/arm-elf.exp: Likewise.
	* ld-arm/export-class.exp: Likewise.
	* ld-elf/comm-data.exp: Likewise.
	* ld-elf/eh-group.exp: Likewise.
	* ld-elf/elf.exp: Likewise.
	* ld-elf/export-class.exp: Likewise.
	* ld-elfvers/vers.exp: Likewise.
	* ld-frv/tls.exp: Likewise.
	* ld-i386/export-class.exp: Likewise.
	* ld-i386/i386.exp: Likewise.
	* ld-ia64/ia64.exp: Likewise.
	* ld-libs/libs.exp: Likewise.
	* ld-m68k/m68k.exp: Likewise.
	* ld-metag/metag.exp: Likewise.
	* ld-mips-elf/comm-data.exp: Likewise.
	* ld-mips-elf/export-class.exp: Likewise.
	* ld-mips-elf/mips-elf.exp: Likewise.
	* ld-mn10300/mn10300.exp: Likewise.
	* ld-pe/pe-compile.exp: Likewise.
	* ld-pe/pe.exp: Likewise.
	* ld-plugin/plugin.exp: Likewise.
	* ld-powerpc/aix52.exp: Likewise.
	* ld-powerpc/export-class.exp: Likewise.
	* ld-powerpc/powerpc.exp: Likewise.
	* ld-s390/s390.exp: Likewise.
	* ld-sh/sh-vxworks.exp: Likewise.
	* ld-sh/sh64/sh64.exp: Likewise.
	* ld-sparc/sparc.exp: Likewise.
	* ld-tic6x/tic6x.exp: Likewise.
	* ld-tilegx/tilegx.exp: Likewise.
	* ld-tilepro/tilepro.exp: Likewise.
	* ld-undefined/entry.exp: Likewise.
	* ld-vax-elf/vax-elf.exp: Likewise.
	* ld-x86-64/dwarfreloc.exp: Likewise.
	* ld-x86-64/export-class.exp: Likewise.
	* ld-x86-64/x86-64.exp: Likewise.
	* ld-xc16x/xc16x.exp: Likewise.
	* ld-xstormy16/xstormy16.exp: Likewise.
	* ld-xtensa/xtensa.exp: Likewise.

3 files changed, 59 insertions, 59 deletions

diff --git a/ld/testsuite/ld-mips-elf/comm-data.exp b/ld/testsuite/ld-mips-elf/comm-data.exp
index 943e852..28ca290 100644
--- a/ld/testsuite/ld-mips-elf/comm-data.exp
+++ b/ld/testsuite/ld-mips-elf/comm-data.exp
@@ -43,7 +43,7 @@ proc mips_comm_data_test { abi flag emul reloc } {
     run_ld_link_tests [list \
 	[list \
 	    "$testname (auxiliary shared object build)" \
-	    "$LDFLAGS -shared" \
+	    "$LDFLAGS -shared" "" \
 	    "$AFLAGS -call_shared" \
 	    { ../ld-elf/comm-data1.s } \
 	    { \
@@ -64,7 +64,7 @@ proc mips_comm_data_test { abi flag emul reloc } {
     run_ld_link_tests [list \
 	[list \
 	    "$testname" \
-	    "$LDFLAGS $ZFLAG -Ltmpdir -lmips-$abi-$reloc-comm-data" \
+	    "$LDFLAGS $ZFLAG -Ltmpdir -lmips-$abi-$reloc-comm-data" "" \
 	    "$AFLAGS -call_nonpic" \
 	    { ../ld-elf/comm-data2.s } \
 	    { \
diff --git a/ld/testsuite/ld-mips-elf/export-class.exp b/ld/testsuite/ld-mips-elf/export-class.exp
index b7ce07c..150cc41 100644
--- a/ld/testsuite/ld-mips-elf/export-class.exp
+++ b/ld/testsuite/ld-mips-elf/export-class.exp
@@ -44,7 +44,7 @@ proc mips_export_class_test { abi flag emul } {
     run_ld_link_tests [list \
 	[list \
 	    "$testname (auxiliary shared object)" \
-	    "$LDFLAGS -shared -version-script ../ld-elf/export-class-lib.ver" \
+	    "$LDFLAGS -shared -version-script ../ld-elf/export-class-lib.ver" "" \
 	    "$AFLAGS" \
 	    { ../ld-elf/export-class-lib.s } \
 	    {} \
@@ -58,7 +58,7 @@ proc mips_export_class_test { abi flag emul } {
     run_ld_link_tests [list \
 	[list \
 	    "$testname (initial static object)" \
-	    "$LDFLAGS -r" \
+	    "$LDFLAGS -r" "" \
 	    "$AFLAGS" \
 	    { ../ld-elf/export-class-ref.s } \
 	    {} \
@@ -75,7 +75,7 @@ proc mips_export_class_test { abi flag emul } {
     run_ld_link_tests [list \
 	[list \
 	    "$testname (final shared object)" \
-	    "$LDFLAGS -shared -Tdata=0x12340000 tmpdir/mips-$abi-export-class-ref-r.o tmpdir/mips-$abi-export-class-lib.so" \
+	    "$LDFLAGS -shared -Tdata=0x12340000 tmpdir/mips-$abi-export-class-ref-r.o tmpdir/mips-$abi-export-class-lib.so" "" \
 	    "$AFLAGS" \
 	    { ../ld-elf/export-class-dep.s ../ld-elf/export-class-def.s } \
 	    [list \
diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
index 9860488..902ae00 100644
--- a/ld/testsuite/ld-mips-elf/mips-elf.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf.exp
@@ -22,23 +22,23 @@
 
 if {[istarget "mips*-*-vxworks"]} {
     set mipsvxtests {
-	{"VxWorks shared library test 1" "-shared -Tvxworks1.ld"
+	{"VxWorks shared library test 1" "-shared -Tvxworks1.ld" ""
 	 "-mips2" {vxworks1-lib.s}
 	 {{readelf --relocs vxworks1-lib.rd} {objdump -dr vxworks1-lib.dd}
 	  {readelf --symbols vxworks1-lib.nd} {readelf -d vxworks1-lib.td}}
 	 "libvxworks1.so"}
 	{"VxWorks executable test 1 (dynamic)" \
-	 "tmpdir/libvxworks1.so -Tvxworks1.ld -q --force-dynamic"
+	 "tmpdir/libvxworks1.so -Tvxworks1.ld -q --force-dynamic" ""
 	 "-mips2" {vxworks1.s}
 	 {{readelf --relocs vxworks1.rd} {objdump -dr vxworks1.dd}}
 	 "vxworks1"}
 	{"VxWorks executable test 2 (dynamic)" \
-	 "-Tvxworks1.ld -q --force-dynamic"
+	 "-Tvxworks1.ld -q --force-dynamic" ""
 	 "-mips2" {vxworks2.s}
 	 {{readelf --segments vxworks2.sd}}
 	 "vxworks2"}
 	{"VxWorks executable test 2 (static)"
-	 "-Tvxworks1.ld"
+	 "-Tvxworks1.ld" ""
 	 "-mips2" {vxworks2.s}
 	 {{readelf --segments vxworks2-static.sd}}
 	 "vxworks2"}
@@ -89,20 +89,20 @@ if { [istarget mips*-*-linux*] || [istarget mips*-sde-elf*] } {
 if { $linux_gnu } {
     run_ld_link_tests [list \
 	[list "Dummy shared library for MIPS16 PIC test 1" \
-	      "-shared -melf32btsmip" \
+	      "-shared -melf32btsmip" "" \
 	      "-EB -32 -mips1" \
 	      { mips16-pic-1-dummy.s } \
 	      {} \
 	      "mips16-pic-1-dummy.so"] \
 	[list "MIPS16 PIC test 1" \
-	      "-melf32btsmip -T mips16-pic-1.ld tmpdir/mips16-pic-1-dummy.so" \
+	      "-melf32btsmip -T mips16-pic-1.ld tmpdir/mips16-pic-1-dummy.so" "" \
 	      "-EB -32 -mips1 -I $srcdir/$subdir" \
 	      { mips16-pic-1a.s mips16-pic-1b.s } \
 	      { { objdump { -dr -j.text } mips16-pic-1.dd }
 		{ readelf -A mips16-pic-1.gd } } \
 	      "mips16-pic-1"] \
 	[list "MIPS16 PIC test 2" \
-	      "-melf32btsmip -T mips16-pic-1.ld -shared" \
+	      "-melf32btsmip -T mips16-pic-1.ld -shared" "" \
 	      "-EB -32 -mips1 -I $srcdir/$subdir" \
 	      { mips16-pic-2a.s mips16-pic-2b.s } \
 	      { { objdump { -dr -j.text } mips16-pic-2.dd } \
@@ -112,7 +112,7 @@ if { $linux_gnu } {
 		{ readelf -d mips16-pic-2.ad } } \
 	     "mips16-pic-2"] \
 	[list "MIPS16 PIC test 3" \
-	      "-melf32btsmip -T mips16-pic-1.ld tmpdir/mips16-pic-1-dummy.so" \
+	      "-melf32btsmip -T mips16-pic-1.ld tmpdir/mips16-pic-1-dummy.so" "" \
 	      "-EB -32 -mips1 -I $srcdir/$subdir" \
 	      { mips16-pic-3a.s mips16-pic-3b.s } \
 	      { { objdump -dr mips16-pic-3.dd } \
@@ -120,7 +120,7 @@ if { $linux_gnu } {
 		{ readelf -A mips16-pic-3.gd } } \
 	      "mips16-pic-3"] \
 	[list "MIPS16 PIC test 4 (shared library)" \
-	      "-shared -melf32btsmip -T mips16-pic-1.ld --version-script mips16-pic-4.ver" \
+	      "-shared -melf32btsmip -T mips16-pic-1.ld --version-script mips16-pic-4.ver" "" \
 	      "-EB -32 -mips1" \
 	      { mips16-pic-4a.s mips16-pic-4b.s } \
 	      { { objdump -dr mips16-pic-4a.dd } \
@@ -128,7 +128,7 @@ if { $linux_gnu } {
 		{ readelf -A mips16-pic-4a.gd } } \
 	      "mips16-pic-4.so"] \
 	[list "MIPS16 PIC test 4 (executable)" \
-	      "-melf32btsmip -T mips16-pic-1.ld tmpdir/mips16-pic-4.so" \
+	      "-melf32btsmip -T mips16-pic-1.ld tmpdir/mips16-pic-4.so" "" \
 	      "-EB -32 -mips1" \
 	      { mips16-pic-4c.s } \
 	      { { objdump -dr mips16-pic-4b.dd } } \
@@ -147,19 +147,19 @@ run_dump_test "jalx-1"
 if { $linux_gnu } {
     run_ld_link_tests [list \
 	[list "Dummy shared library for JALX test 2" \
-	      "-shared -nostdlib -melf32btsmip" \
+	      "-shared -nostdlib -melf32btsmip" "" \
 	      "-G0 -EB -mmicromips -no-mdebug -mabi=32 -march=mips32r2 -KPIC" \
 	      { jalx-2-printf.s } \
 	      {} \
 	      "libjalx-2.so"] \
 	[list "Dummy external function for JALX test 2" \
-	      "-r -melf32btsmip" \
+	      "-r -melf32btsmip" "" \
 	      "-G0 -EB -no-mdebug -mabi=32 -march=mips32r2 -mno-shared -call_nonpic" \
 	      { jalx-2-ex.s } \
 	      {} \
 	      "jalx-2-ex.o.r"] \
 	[list "MIPS JALX test 2" \
-	      "-nostdlib -T jalx-2.ld tmpdir/libjalx-2.so tmpdir/jalx-2-ex.o.r -melf32btsmip" \
+	      "-nostdlib -T jalx-2.ld tmpdir/libjalx-2.so tmpdir/jalx-2-ex.o.r -melf32btsmip" "" \
 	      "-G0 -EB -mmicromips -no-mdebug -mabi=32 -march=mips32r2 -mno-shared -call_nonpic" \
 	      { jalx-2-main.s } \
 	      { { objdump -d jalx-2.dd } } \
@@ -232,19 +232,19 @@ if { $linux_gnu } {
     # The third test checks that we do the same when linking the
     # result of the first link (with no other source files).
     run_ld_link_tests {
-	{"PIC and non-PIC test 1 (relocatable)" "-r -melf32btsmip"
+	{"PIC and non-PIC test 1 (relocatable)" "-r -melf32btsmip" ""
 	 "-32 -EB -mips2" {pic-and-nonpic-1a.s pic-and-nonpic-1b.s}
 	 {{objdump -dr pic-and-nonpic-1-rel.dd}
 	  {readelf --symbols pic-and-nonpic-1-rel.nd}}
 	 "pic-and-nonpic-1-rel.o"}
 	{"PIC and non-PIC test 1 (static 1)"
-	 "-melf32btsmip -Tpic-and-nonpic-1.ld"
+	 "-melf32btsmip -Tpic-and-nonpic-1.ld" ""
 	 "-32 -EB -mips2" {pic-and-nonpic-1a.s pic-and-nonpic-1b.s}
 	 {{objdump -dr pic-and-nonpic-1.dd}
 	  {readelf --symbols pic-and-nonpic-1.nd}}
 	 "pic-and-nonpic-1-static1.o"}
 	{"PIC and non-PIC test 1 (static 2)"
-	 "-melf32btsmip -Tpic-and-nonpic-1.ld tmpdir/pic-and-nonpic-1-rel.o"
+	 "-melf32btsmip -Tpic-and-nonpic-1.ld tmpdir/pic-and-nonpic-1-rel.o" ""
 	 "" {}
 	 {{objdump -dr pic-and-nonpic-1.dd}
 	  {readelf --symbols pic-and-nonpic-1.nd}}
@@ -253,14 +253,14 @@ if { $linux_gnu } {
     run_dump_test "pic-and-nonpic-2"
     run_ld_link_tests {
 	{"PIC and non-PIC test 3 (shared library)"
-	 "-melf32btsmip -shared -Tpic-and-nonpic-3a.ld"
+	 "-melf32btsmip -shared -Tpic-and-nonpic-3a.ld" ""
 	 "-32 -EB -mips2" {pic-and-nonpic-3a.s}
 	 {{readelf --segments pic-and-nonpic-3a.sd}
 	  {readelf -A pic-and-nonpic-3a.gd}
 	  {objdump -dr pic-and-nonpic-3a.dd}}
 	 "pic-and-nonpic-3a.so"}
 	{"PIC and non-PIC test 3 (executable)"
-	 "-melf32btsmip -Tpic-and-nonpic-3b.ld tmpdir/pic-and-nonpic-3a.so"
+	 "-melf32btsmip -Tpic-and-nonpic-3b.ld tmpdir/pic-and-nonpic-3a.so" ""
 	 "-32 -EB -mips2" {pic-and-nonpic-3b.s}
 	 {{readelf --segments pic-and-nonpic-3b.sd}
 	  {objdump -dr pic-and-nonpic-3b.dd}
@@ -274,12 +274,12 @@ if { $linux_gnu } {
     run_dump_test "pic-and-nonpic-3-error"
     run_ld_link_tests {
 	{"PIC and non-PIC test 4 (shared library)"
-	 "-melf32btsmip -shared -Tpic-and-nonpic-3a.ld"
+	 "-melf32btsmip -shared -Tpic-and-nonpic-3a.ld" ""
 	 "-32 -EB -mips2" {pic-and-nonpic-4a.s}
 	 {}
 	 "pic-and-nonpic-4a.so"}
 	{"PIC and non-PIC test 4 (executable)"
-	 "-melf32btsmip -Tpic-and-nonpic-4b.ld tmpdir/pic-and-nonpic-4a.so"
+	 "-melf32btsmip -Tpic-and-nonpic-4b.ld tmpdir/pic-and-nonpic-4a.so" ""
 	 "-32 -EB -mips2" {pic-and-nonpic-4b.s}
 	 {{readelf --segments pic-and-nonpic-4b.sd}
 	  {objdump -dr pic-and-nonpic-4b.dd}
@@ -292,7 +292,7 @@ if { $linux_gnu } {
     run_dump_test "pic-and-nonpic-4-error"
     run_ld_link_tests {
 	{"PIC and non-PIC test 5 (executable)"
-	 "-melf32btsmip -Tpic-and-nonpic-5b.ld tmpdir/pic-and-nonpic-3a.so tmpdir/pic-and-nonpic-4a.so"
+	 "-melf32btsmip -Tpic-and-nonpic-5b.ld tmpdir/pic-and-nonpic-3a.so tmpdir/pic-and-nonpic-4a.so" ""
 	 "-32 -EB -mips2" {pic-and-nonpic-5a.s pic-and-nonpic-5b.s}
 	 {{readelf --segments pic-and-nonpic-5b.sd}
 	  {objdump -dr pic-and-nonpic-5b.dd}
@@ -311,12 +311,12 @@ if { $linux_gnu } {
     foreach { abi flag emul } $abis {
 	run_ld_link_tests [list \
 	    [list "PIC and non-PIC test 6 ($abi shared library)" \
-		 "-m$emul -shared -Tpic-and-nonpic-3a.ld" \
+		 "-m$emul -shared -Tpic-and-nonpic-3a.ld" "" \
 		 "$flag -EB -mips3" \
 		 [list "pic-and-nonpic-6-${abi}a.s"] {} \
 		 "pic-and-nonpic-6-${abi}.so"] \
 	    [list "PIC and non-PIC test 6 ($abi executable)" \
-		 "-m$emul -Tpic-and-nonpic-6.ld tmpdir/pic-and-nonpic-6-${abi}.so" \
+		 "-m$emul -Tpic-and-nonpic-6.ld tmpdir/pic-and-nonpic-6-${abi}.so" "" \
 		 "$flag -EB -mips3" \
 		 [list "pic-and-nonpic-6-${abi}b.s" \
 		      "pic-and-nonpic-6-${abi}c.s"] \
@@ -341,7 +341,7 @@ if { $linux_gnu } {
 	run_ld_link_tests [list \
 	    [list \
 		"_gp scope test ($abi shared library)" \
-		"$abi_ldflags($abi) -shared" \
+		"$abi_ldflags($abi) -shared" "" \
 		"$abi_asflags($abi) -KPIC" \
 		{ gp-hidden-lib.s } \
 		[list \
@@ -350,7 +350,7 @@ if { $linux_gnu } {
 		"gp-hidden-lib-${abi}.so"] \
 	    [list \
 		"_gp scope test ($abi versioned library)" \
-		"$abi_ldflags($abi) -shared -version-script gp-hidden-ver.ver tmpdir/gp-hidden-lib-${abi}.so" \
+		"$abi_ldflags($abi) -shared -version-script gp-hidden-ver.ver tmpdir/gp-hidden-lib-${abi}.so" "" \
 		"$abi_asflags($abi) -KPIC" \
 		{ gp-hidden-ver.s } \
 		[list \
@@ -359,7 +359,7 @@ if { $linux_gnu } {
 		"gp-hidden-ver-${abi}.so"] \
 	    [list \
 		"_gp scope test ($abi executable)" \
-		"$abi_ldflags($abi) -e 0 -rpath-link . tmpdir/gp-hidden-ver-${abi}.so" \
+		"$abi_ldflags($abi) -e 0 -rpath-link . tmpdir/gp-hidden-ver-${abi}.so" "" \
 		"$abi_asflags($abi) -call_nonpic" \
 		{ gp-hidden.s } \
 		[list \
@@ -394,14 +394,14 @@ if { $has_newabi } {
     run_ld_link_tests [list \
 	[list \
 	    "reloc test 6a" \
-	    "-shared $abi_ldflags(n32)" \
+	    "-shared $abi_ldflags(n32)" "" \
 	    "$abi_asflags(n32)" \
 	    "reloc-6a.s" \
 	    {} \
 	    "reloc-6a.so"] \
 	[list \
 	    "reloc test 6b" \
-	    "$abi_ldflags(n32) tmpdir/reloc-6a.so" \
+	    "$abi_ldflags(n32) tmpdir/reloc-6a.so" "" \
 	    "$abi_asflags(n32)" \
 	    "reloc-6b.s" \
 	    {} \
@@ -421,7 +421,7 @@ if {$embedded_elf} {
 if {$linux_gnu} {
     set eh_frame5_test {
 	{"MIPS eh-frame 5"
-	 "-melf32btsmip -shared -Teh-frame5.ld"
+	 "-melf32btsmip -shared -Teh-frame5.ld" ""
 	 "-32 -EB"
 	 {eh-frame5.s}
 	 {{readelf {--relocs -wf} eh-frame5.d}}
@@ -455,12 +455,12 @@ if { $linux_gnu } {
     run_dump_test "got-page-3"
     run_ld_link_tests [subst {
 	{"GOT page 4 (one file)" "-shared $abi_ldflags(o32) -T got-page-1.ld"
-	 "$abi_asflags(o32) -mips2" {got-page-4b.s}
+	 "" "$abi_asflags(o32) -mips2" {got-page-4b.s}
 	 {{objdump -dr got-page-4a.d}
 	  {readelf -A got-page-4a.got}}
 	 "got-page-4a.so"}
 	{"GOT page 4 (two files)" "-shared $abi_ldflags(o32) -T got-page-1.ld"
-	 "$abi_asflags(o32) -mips2" {got-page-4a.s got-page-4b.s}
+	 "" "$abi_asflags(o32) -mips2" {got-page-4a.s got-page-4b.s}
 	 {{objdump -dr got-page-4b.d}
 	  {readelf -A got-page-4b.got}}
 	 "got-page-4b.so"}
@@ -468,24 +468,24 @@ if { $linux_gnu } {
     if $has_newabi {
         run_ld_link_tests [subst {
 	    {"GOT page 5" "-shared $abi_ldflags(n32) -T got-page-1.ld"
-	     "$abi_asflags(n32)" {got-page-5.s}
+	     "" "$abi_asflags(n32)" {got-page-5.s}
 	     {{objdump -dr got-page-5.d}
 	      {readelf -A got-page-5.got}}
 	     "got-page-5.so"}
 	    {"GOT page 6" "-shared $abi_ldflags(n32) -T got-page-1.ld"
-	     "$abi_asflags(n32)" {got-page-6.s}
+	     "" "$abi_asflags(n32)" {got-page-6.s}
 	     {{objdump -dr got-page-6.d}
 	      {readelf -A got-page-6.got}}
 	     "got-page-6.so"}
 	    {"GOT page 7 (order 1)" "-shared $abi_ldflags(n32) -T got-page-1.ld"
-	     "$abi_asflags(n32)"
+	     "" "$abi_asflags(n32)"
 	     {got-page-7a.s got-page-7b.s got-page-7c.s got-page-7d.s
 	      got-page-7e.s}
 	     {{objdump -dr got-page-7.d}
 	      {readelf -A got-page-7.got}}
 	     "got-page-7a.so"}
 	    {"GOT page 7 (order 2)" "-shared $abi_ldflags(n32) -T got-page-1.ld"
-	     "$abi_asflags(n32)"
+	     "" "$abi_asflags(n32)"
 	     {got-page-7e.s got-page-7a.s got-page-7b.s got-page-7c.s
 	      got-page-7d.s}
 	     {{objdump -dr got-page-7.d}
@@ -520,7 +520,7 @@ if {[istarget mips*-*-linux*]} {
 	 run_ld_link_tests \
 	     [list [list \
 			"Stub for dynsym 0x$dynsym" \
-			"-shared -melf32btsmip -T stub-dynsym-1.ld" \
+			"-shared -melf32btsmip -T stub-dynsym-1.ld" "" \
 			[concat \
 			     "-EB -march=mips1 -32 -KPIC" \
 			     "--defsym base_syms=$base_syms" \
@@ -536,8 +536,8 @@ if {[istarget mips*-*-linux*]} {
 # For tests which may involve multiple files, use run_ld_link_tests.
 
 # List contains test-items with 3 items followed by 2 lists:
-# 0:name 1:ld options 2:assembler options
-# 3:filenames of assembler files 4: action and options. 5: name of output file
+# 0:name 1:ld early options 2:ld late options 3:assembler options
+# 4:filenames of assembler files 5: action and options. 6: name of output file
 
 # Actions:
 # objdump: Apply objdump options on result.  Compare with regex (last arg).
@@ -545,64 +545,64 @@ if {[istarget mips*-*-linux*]} {
 # readelf: Apply readelf options on result.  Compare with regex (last arg).
 
 set mips_tls_tests {
-    {"Static executable with TLS" "-static -melf32btsmip -T mips-dyn.ld"
+    {"Static executable with TLS" "-static -melf32btsmip -T mips-dyn.ld" ""
      "-EB -march=mips1 -32 -KPIC" {tlsbin-o32.s}
      {{objdump {-dr -m mips:isa32r2} tlsbin-o32.d} {objdump -srj.got tlsbin-o32.got}}
      "tls-static-o32"}
-    {"Shared library with TLS" "-shared -melf32btsmip -T mips-lib.ld"
+    {"Shared library with TLS" "-shared -melf32btsmip -T mips-lib.ld" ""
      "-EB -march=mips1 -32 -KPIC" {tlslib-o32.s}
      {{objdump {-dr -m mips:isa32r2} tlslib-o32.d} {objdump -Rsj.got tlslib-o32.got}}
      "tlslib-o32.so"}
     {"Dynamic executable with TLS"
-     "-melf32btsmip -T mips-dyn.ld tmpdir/tlslib-o32.so"
+     "-melf32btsmip -T mips-dyn.ld tmpdir/tlslib-o32.so" ""
      "-EB -march=mips1 -32 -KPIC" {tlsdyn-o32.s}
      {{objdump {-dr -m mips:isa32r2} tlsdyn-o32.d} {objdump -Rsj.got tlsdyn-o32.got}}
      "tls-dynamic-o32"}
     {"Shared library with multiple GOTs and TLS"
-     "-shared -melf32btsmip -T mips-lib.ld"
+     "-shared -melf32btsmip -T mips-lib.ld" ""
      "-EB -march=mips1 -32 -KPIC" {tls-multi-got-1-1.s tls-multi-got-1-2.s}
      {{readelf {-d -r} tls-multi-got-1.r}
       {objdump {-dr -m mips:isa32r2} tls-multi-got-1.d}
       {objdump -Rsj.got tls-multi-got-1.got}}
      "tlslib-multi.so"}
     {"Shared library with TLS and versioning"
-     "-shared -melf32btsmip -T mips-lib.ld --version-script tlslib.ver"
+     "-shared -melf32btsmip -T mips-lib.ld --version-script tlslib.ver" ""
      "-EB -march=mips1 -32 -KPIC" {tlslib-o32.s}
      {{objdump {-dr -m mips:isa32r2} tlslib-o32.d} {objdump -Rsj.got tlslib-o32-ver.got}}
      "tlslib-o32-ver.so"}
     {"Dynamic executable with TLS and versioning"
-     "-melf32btsmip -T mips-dyn.ld tmpdir/tlslib-o32-ver.so"
+     "-melf32btsmip -T mips-dyn.ld tmpdir/tlslib-o32-ver.so" ""
      "-EB -march=mips1 -32 -KPIC" {tlsdyn-o32.s tlsdyn-o32-2.s}
      {{objdump {-dr -m mips:isa32r2} tlsdyn-o32-1.d} {objdump -Rsj.got tlsdyn-o32-1.got}}
      "tls-dynamic-o32-ver"}
     {"Dynamic executable with TLS and versioning (order 2)"
-     "-melf32btsmip -T mips-dyn.ld tmpdir/tlsdyn-o32.o tmpdir/tlslib-o32-ver.so tmpdir/tlsdyn-o32-2.o"
+     "-melf32btsmip -T mips-dyn.ld tmpdir/tlsdyn-o32.o tmpdir/tlslib-o32-ver.so tmpdir/tlsdyn-o32-2.o" ""
      "-EB -march=mips1 -32 -KPIC" {}
      {{objdump {-dr -m mips:isa32r2} tlsdyn-o32-2.d} {objdump -Rsj.got tlsdyn-o32-2.got}}
      "tls-dynamic-o32-ver-2"}
     {"Dynamic executable with TLS and versioning (order 3)"
-     "-melf32btsmip -T mips-dyn.ld tmpdir/tlsdyn-o32-2.o tmpdir/tlslib-o32-ver.so tmpdir/tlsdyn-o32.o"
+     "-melf32btsmip -T mips-dyn.ld tmpdir/tlsdyn-o32-2.o tmpdir/tlslib-o32-ver.so tmpdir/tlsdyn-o32.o" ""
      "-EB -march=mips1 -32 -KPIC" {}
      {{objdump {-dr -m mips:isa32r2} tlsdyn-o32-3.d} {objdump -Rsj.got tlsdyn-o32-3.got}}
      "tls-dynamic-o32-ver-3"}
     {"Shared library with TLS and hidden symbols"
-     "-shared -melf32btsmip -T mips-lib.ld --version-script tlslib-hidden.ver"
+     "-shared -melf32btsmip -T mips-lib.ld --version-script tlslib-hidden.ver" ""
      "-EB -march=mips1 -32 -KPIC" {tlslib-o32.s}
      {{objdump {-dr -m mips:isa32r2} tlslib-o32.d} {objdump -Rsj.got tlslib-o32-hidden.got}}
      "tlslib-o32-hidden.so"}
     {"Shared library with TLS and hidden symbols (2)"
-     "-shared -melf32btsmip -T mips-lib.ld"
+     "-shared -melf32btsmip -T mips-lib.ld" ""
      "-EB -march=mips1 -32 -KPIC" {tls-hidden2a.s tls-hidden2b.s}
      {{objdump -drj.text tls-hidden2.d} {objdump -sj.got tls-hidden2-got.d}}
      "tls-hidden2.so"}
     {"Shared library with TLS and hidden symbols (3)"
-     "-shared -melf32btsmip -T tls-hidden3.ld"
+     "-shared -melf32btsmip -T tls-hidden3.ld" ""
      "-EB -march=mips2 -32 -KPIC" {tls-hidden3a.s tls-hidden3b.s}
      {{objdump -dj.text tls-hidden3.d} {objdump -sj.got tls-hidden3.got}
       {readelf --relocs tls-hidden3.r}}
      "tls-hidden3.so"}
     {"Shared library with TLS and hidden symbols (4)"
-     "-shared -melf32btsmip -T tls-hidden3.ld"
+     "-shared -melf32btsmip -T tls-hidden3.ld" ""
      "-EB -march=mips2 -32 -KPIC" {tls-hidden4a.s tls-hidden4b.s}
      {{objdump -sj.got tls-hidden4.got} {readelf --relocs tls-hidden4.r}}
      "tls-hidden4.so"}
@@ -614,7 +614,7 @@ if {[istarget mips*-*-linux*]} {
 
 set mips16_call_global_test [list \
     [list "Global calls from mips16" \
-	 "$abi_ldflags(o32) -T no-shared-1.ld" \
+	 "$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}} \
@@ -624,7 +624,7 @@ run_ld_link_tests $mips16_call_global_test
 
 set mips16_intermix_test [list \
     [list "Intermixing mips32 and mips16 functions" \
-	 "$abi_ldflags(o32)" \
+	 "$abi_ldflags(o32)" "" \
 	 "$abi_asflags(o32) -mips32r2" \
 	 {mips16-intermix-1.s mips16-intermix-2.s} \
 	 {{objdump -t mips16-intermix.d}} \
@@ -669,7 +669,7 @@ run_dump_test "attr-gnu-4-51"
 if { $linux_gnu } {
     run_ld_link_tests {
 	{"GOT and versioning 1"
-	 "-shared -melf32btsmip --version-script got-vers-1.ver"
+	 "-shared -melf32btsmip --version-script got-vers-1.ver" ""
 	 "-EB -mips2 -32" {got-vers-1a.s got-vers-1b.s}
 	 {{readelf -d got-vers-1.dd}
 	  {readelf --symbols got-vers-1.sd}
@@ -701,7 +701,7 @@ foreach { abi } $abis {
     run_ld_link_tests [list \
 	[list \
 	    "MIPS export class call relocation test ($abi)" \
-	    "$abi_ldflags($abi) -shared -Ttext $loadaddr -T export-class-call16.ld" \
+	    "$abi_ldflags($abi) -shared -Ttext $loadaddr -T export-class-call16.ld" "" \
 	    "$abi_asflags($abi) -mips3 -KPIC" \
 	    [list export-class-call16-${abi}.s export-class-call16-def.s] \
 	    [list \