* 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.

4 files changed, 20 insertions, 20 deletions

diff --git a/ld/testsuite/ld-elf/comm-data.exp b/ld/testsuite/ld-elf/comm-data.exp
index 71b856d..e180693 100644
--- a/ld/testsuite/ld-elf/comm-data.exp
+++ b/ld/testsuite/ld-elf/comm-data.exp
@@ -43,7 +43,7 @@ set testname "Common symbol override test"
 run_ld_link_tests [list \
     [list \
 	"$testname (auxiliary shared object build)" \
-	"-shared" \
+	"-shared" "" \
 	"" \
 	{ comm-data1.s } \
 	{ \
@@ -67,7 +67,7 @@ setup_xfail "arm*-*-*" "ld/13802"
 run_ld_link_tests [list \
     [list \
 	"$testname" \
-	"-Ltmpdir -lcomm-data" \
+	"-Ltmpdir -lcomm-data" "" \
 	"$AFLAGS" \
 	{ comm-data2.s } \
 	{ \
@@ -79,7 +79,7 @@ run_ld_link_tests [list \
     ] \
     [list \
 	"$testname 3a" \
-	"-static" \
+	"-static" "" \
 	"" \
 	{ comm-data3a.s comm-data3b.s } \
 	{ \
@@ -89,7 +89,7 @@ run_ld_link_tests [list \
     ] \
     [list \
 	"$testname 3b" \
-	"-static" \
+	"-static" "" \
 	"" \
 	{ comm-data3b.s comm-data3a.s } \
 	{ \
diff --git a/ld/testsuite/ld-elf/eh-group.exp b/ld/testsuite/ld-elf/eh-group.exp
index 6de3ecb..6fe7058 100644
--- a/ld/testsuite/ld-elf/eh-group.exp
+++ b/ld/testsuite/ld-elf/eh-group.exp
@@ -58,7 +58,7 @@ if [is_elf64 "tmpdir/eh-group1size.o"] {
 
 set build_tests_ld [list			\
   [list "Build eh-group1.o"			\
-   "-r" "$as_options"				\
+   "-r" "" "$as_options"			\
    {eh-group1.s eh-group2.s} {} "eh-group.o"]	\
 ]
 
diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp
index 50634c6..236e15b 100644
--- a/ld/testsuite/ld-elf/elf.exp
+++ b/ld/testsuite/ld-elf/elf.exp
@@ -56,23 +56,23 @@ if { [is_remote host] } then {
 if { ![istarget hppa64*-hpux*] } {
     run_ld_link_tests {
 	{"Build symbol3.a"
-	    "" ""
+	    "" "" ""
 	    {symbol3.s} {} "symbol3.a"}
 	{"Build symbol3w.a"
-	    "" ""
+	    "" "" ""
 	    {symbol3w.s} {} "symbol3w.a"}
     }
 
     if { [check_shared_lib_support] } then {
 	run_ld_link_tests {
-	    {"Build pr14170a.o" "" "" "pr14170a.s" {} "pr14170.a" }
+	    {"Build pr14170a.o" "" "" "" "pr14170a.s" {} "pr14170.a" }
 	}
 	setup_xfail "tic6x-*-*"
 	run_ld_link_tests {
 	    {"Build shared library for pr14170"
-		"-shared" "" "pr14170b.s" {} "pr14170.so" }
+		"-shared" "" "" "pr14170b.s" {} "pr14170.so" }
 	    {"PR ld/14170"
-		"tmpdir/pr14170a.o tmpdir/pr14170.so" "" "pr14170c.s"
+		"tmpdir/pr14170a.o tmpdir/pr14170.so" "" "" "pr14170c.s"
 		{ } "pr14170" }
 	}
     }
@@ -88,9 +88,9 @@ if { [check_shared_lib_support] } then {
     setup_xfail "tic6x-*-*"
     run_ld_link_tests {
 	{"Build shared library for next test"
-	    "-shared" "" "note-3.s" {} "note-3.so" }
+	    "-shared" "" "" "note-3.s" {} "note-3.so" }
 	{"Link using broken linker script"
-	    "--script note-3.t tmpdir/note-3.so" "" ""
+	    "--script note-3.t tmpdir/note-3.so" "" "" ""
 	    { { ld "note-3.l" } }
 	    "a.out" }
     }
@@ -108,11 +108,11 @@ if { [istarget *-*-linux*]
      || [istarget *-*-gnu*] } {
     run_ld_link_tests {
 	{"Weak symbols in dynamic objects 1 (support)"
-	    "-shared" "" {weak-dyn-1a.s}
+	    "-shared" "" "" {weak-dyn-1a.s}
 	    {}
 	    "libweakdyn1a.so"}
 	{"Weak symbols in dynamic objects 1 (main test)"
-	    "-shared tmpdir/libweakdyn1a.so -Tweak-dyn-1.ld" "" {weak-dyn-1b.s}
+	    "-shared tmpdir/libweakdyn1a.so -Tweak-dyn-1.ld" "" "" {weak-dyn-1b.s}
 	    {{readelf {--relocs --wide} weak-dyn-1.rd}}
 	    "libweakdyn1b.so"}
     }
@@ -122,7 +122,7 @@ if { [istarget *-*-linux*]
 if { [check_gc_sections_available] && ![istarget "v850-*-*"] } {
     run_ld_link_tests {
 	{"--gc-sections on tls variable"
-	    "--gc-section" "" {tls_gc.s} {} "tls_gc"}
+	    "--gc-section" "" "" {tls_gc.s} {} "tls_gc"}
     }
 }
 
@@ -130,9 +130,9 @@ if { [istarget *-*-*linux*]
      || [istarget *-*-nacl*]
      || [istarget *-*-gnu*] } {
     run_ld_link_tests {
-	{"stack exec" "-z execstack" "" {stack.s}
+	{"stack exec" "-z execstack" "" "" {stack.s}
 	    {{readelf {-Wl} stack-exec.rd}} "stack-exec.exe"}
-	{"stack size" "-z stack-size=0x123400" "" {stack.s}
+	{"stack size" "-z stack-size=0x123400" "" "" {stack.s}
 	    {{readelf {-Wl} stack-size.rd}} "stack-size.exe"}
     }
 }
diff --git a/ld/testsuite/ld-elf/export-class.exp b/ld/testsuite/ld-elf/export-class.exp
index 81ce55a..38c635c 100644
--- a/ld/testsuite/ld-elf/export-class.exp
+++ b/ld/testsuite/ld-elf/export-class.exp
@@ -44,7 +44,7 @@ set testname "Symbol export class test"
 run_ld_link_tests [list \
     [list \
 	"$testname (auxiliary shared object)" \
-	"-shared -version-script export-class-lib.ver" \
+	"-shared -version-script export-class-lib.ver" "" \
 	"" \
 	{ export-class-lib.s } \
 	{} \
@@ -58,7 +58,7 @@ run_ld_link_tests [list \
 run_ld_link_tests [list \
     [list \
 	"$testname (initial static object)" \
-	"-r" \
+	"-r" "" \
 	"" \
 	{ export-class-ref.s } \
 	{} \
@@ -75,7 +75,7 @@ run_ld_link_tests [list \
 run_ld_link_tests [list \
     [list \
 	"$testname (final shared object)" \
-	"-shared -Tdata=0x12340000 tmpdir/export-class-ref-r.o tmpdir/export-class-lib.so" \
+	"-shared -Tdata=0x12340000 tmpdir/export-class-ref-r.o tmpdir/export-class-lib.so" "" \
 	"" \
 	{ export-class-dep.s export-class-def.s } \
 	{ \