* 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, 58 insertions, 58 deletions

diff --git a/ld/testsuite/ld-powerpc/aix52.exp b/ld/testsuite/ld-powerpc/aix52.exp
index 2f00cff2c4..9241159a22 100644
--- a/ld/testsuite/ld-powerpc/aix52.exp
+++ b/ld/testsuite/ld-powerpc/aix52.exp
@@ -57,7 +57,7 @@ proc run_aix_test { size name ldopts asopts sources tools output } {
     }
     regsub -all {SIZE} $tools $size tools
     run_ld_link_tests [list [list "$name ($size-bit)" \
-				 $ldopts \
+				 $ldopts "" \
 				 "$asopts -a$size --defsym size=$size" \
 				 $sources \
 				 $tools \
diff --git a/ld/testsuite/ld-powerpc/export-class.exp b/ld/testsuite/ld-powerpc/export-class.exp
index c1106bf079..5b721fcd2f 100644
--- a/ld/testsuite/ld-powerpc/export-class.exp
+++ b/ld/testsuite/ld-powerpc/export-class.exp
@@ -53,7 +53,7 @@ proc powerpc_export_class_test { abi 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 } \
 	    {} \
@@ -67,7 +67,7 @@ proc powerpc_export_class_test { abi emul } {
     run_ld_link_tests [list \
 	[list \
 	    "$testname (initial static object)" \
-	    "$LDFLAGS -r" \
+	    "$LDFLAGS -r" "" \
 	    "$AFLAGS" \
 	    { ../ld-elf/export-class-ref.s } \
 	    {} \
@@ -84,7 +84,7 @@ proc powerpc_export_class_test { abi emul } {
     run_ld_link_tests [list \
 	[list \
 	    "$testname (final shared object)" \
-	    "$LDFLAGS -shared -Tdata=0x12340000 tmpdir/powerpc-$abi-export-class-ref-r.o tmpdir/powerpc-$abi-export-class-lib.so" \
+	    "$LDFLAGS -shared -Tdata=0x12340000 tmpdir/powerpc-$abi-export-class-ref-r.o tmpdir/powerpc-$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-powerpc/powerpc.exp b/ld/testsuite/ld-powerpc/powerpc.exp
index 8e9b17900f..f022b9538b 100644
--- a/ld/testsuite/ld-powerpc/powerpc.exp
+++ b/ld/testsuite/ld-powerpc/powerpc.exp
@@ -26,37 +26,37 @@ if { ![istarget "powerpc*-*-*"]	} {
 
 if {[istarget "*-*-vxworks"]} {
     set ppcvxtests {
-	{"VxWorks shared library test 1 (default script)" "-shared"
+	{"VxWorks shared library test 1 (default script)" "-shared" ""
 	 "-mregnames" {vxworks1-lib.s}
 	 {{readelf --segments vxworks1-lib.sd}}
 	 "libvxworks1.so"}
-	{"VxWorks shared library test 1" "-shared -Tvxworks1.ld"
+	{"VxWorks shared library test 1" "-shared -Tvxworks1.ld" ""
 	 "-mregnames" {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" ""
 	 "-mregnames" {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" ""
 	 "-mregnames" {vxworks2.s}
 	 {{readelf --segments vxworks2.sd}}
 	 "vxworks2"}
 	{"VxWorks executable test 2 (static)"
-	 "-Tvxworks1.ld"
+	 "-Tvxworks1.ld" ""
 	 "-mregnames" {vxworks2.s}
 	 {{readelf --segments vxworks2-static.sd}}
 	 "vxworks2"}
 	{"VxWorks relax test"
-	 "-Tvxworks1.ld --relax -q"
+	 "-Tvxworks1.ld --relax -q" ""
 	 "-mregnames" {vxworks-relax.s}
 	 {{readelf --relocs vxworks-relax.rd}}
 	 "vxworks-relax"}
 	{"VxWorks relocatable relax test"
-	 "-Tvxworks1.ld -r --relax -q"
+	 "-Tvxworks1.ld -r --relax -q" ""
 	 "-mregnames" {vxworks-relax-2.s}
 	 {{readelf --relocs vxworks-relax-2.rd}}
 	 "vxworks-relax-2"}
@@ -90,8 +90,8 @@ proc supports_ppc64 { } {
 }
 
 # 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).
@@ -99,145 +99,145 @@ proc supports_ppc64 { } {
 # readelf: Apply readelf options on result.  Compare with regex (last arg).
 
 set ppcelftests {
-    {"Reloc section order" "-melf32ppc -shared -z nocombreloc" "-a32" {reloc.s}
+    {"Reloc section order" "-melf32ppc -shared -z nocombreloc" "" "-a32" {reloc.s}
      {{objdump -hw reloc.d}} "reloc.so"}
-    {"APUinfo section processing" "-melf32ppc"
+    {"APUinfo section processing" "-melf32ppc" ""
      "-a32 -me500" {apuinfo1.s apuinfo-nul.s apuinfo2.s}
     {{readelf -x2 apuinfo.rd}} "apuinfo"}
-    {"APUinfo NULL section processing" "-melf32ppc"
+    {"APUinfo NULL section processing" "-melf32ppc" ""
      "-a32 -me500" {apuinfo-nul1.s apuinfo-nul.s}
     {{readelf -x2 apuinfo-nul.rd}} "apuinfo"}
-    {"TLS32 static exec" "-melf32ppc" "-a32"  {tls32.s tlslib32.s}
+    {"TLS32 static exec" "-melf32ppc" "" "-a32"  {tls32.s tlslib32.s}
      {{objdump -dr tls32.d} {objdump -sj.got tls32.g}
       {objdump -sj.tdata tls32.t}}
      "tls32"}
-    {"TLS32 helper shared library" "-shared -melf32ppc tmpdir/tlslib32.o" "" {}
+    {"TLS32 helper shared library" "-shared -melf32ppc tmpdir/tlslib32.o" "" "" {}
      {} "libtlslib32.so"}
-    {"TLS32 dynamic exec" "-melf32ppc --no-ld-generated-unwind-info tmpdir/tls32.o tmpdir/libtlslib32.so" "" {}
+    {"TLS32 dynamic exec" "-melf32ppc --no-ld-generated-unwind-info tmpdir/tls32.o tmpdir/libtlslib32.so" "" "" {}
      {{readelf -WSsrl tlsexe32.r} {objdump -dr tlsexe32.d}
       {objdump -sj.got tlsexe32.g} {objdump -sj.tdata tlsexe32.t}}
       "tlsexe32"}
-    {"TLS32 shared" "-shared -melf32ppc --no-ld-generated-unwind-info tmpdir/tls32.o" "" {}
+    {"TLS32 shared" "-shared -melf32ppc --no-ld-generated-unwind-info tmpdir/tls32.o" "" "" {}
      {{readelf -WSsrl tlsso32.r} {objdump -dr tlsso32.d}
       {objdump -sj.got tlsso32.g} {objdump -sj.tdata tlsso32.t}}
       "tls32.so"}
-    {"TLS32 markers" "-melf32ppc" "-a32"  {tlsmark32.s tlslib32.s}
+    {"TLS32 markers" "-melf32ppc" "" "-a32"  {tlsmark32.s tlslib32.s}
      {{objdump -dr tlsmark32.d}}
       "tlsmark32"}
-    {"TLS32 opt 1" "-melf32ppc" "-a32"  {tlsopt1_32.s tlslib32.s}
+    {"TLS32 opt 1" "-melf32ppc" "" "-a32"  {tlsopt1_32.s tlslib32.s}
      {{objdump -dr tlsopt1_32.d}}
       "tlsopt1_32"}
-    {"TLS32 opt 2" "-melf32ppc" "-a32"  {tlsopt2_32.s tlslib32.s}
+    {"TLS32 opt 2" "-melf32ppc" "" "-a32"  {tlsopt2_32.s tlslib32.s}
      {{objdump -dr tlsopt2_32.d}}
       "tlsopt2_32"}
-    {"TLS32 opt 3" "-melf32ppc" "-a32"  {tlsopt3_32.s tlslib32.s}
+    {"TLS32 opt 3" "-melf32ppc" "" "-a32"  {tlsopt3_32.s tlslib32.s}
      {{objdump -dr tlsopt3_32.d}}
       "tlsopt3_32"}
-    {"TLS32 opt 4" "-melf32ppc" "-a32"  {tlsopt4_32.s tlslib32.s}
+    {"TLS32 opt 4" "-melf32ppc" "" "-a32"  {tlsopt4_32.s tlslib32.s}
      {{objdump -dr tlsopt4_32.d}}
       "tlsopt4_32"}
-    {"Shared library with global symbol" "-shared -melf32ppc" "-a32" {sdalib.s}
+    {"Shared library with global symbol" "-shared -melf32ppc" "" "-a32" {sdalib.s}
      {} "sdalib.so"}
-    {"Dynamic application with SDA" "-melf32ppc tmpdir/sdalib.so" "-a32" {sdadyn.s}
+    {"Dynamic application with SDA" "-melf32ppc tmpdir/sdalib.so" "" "-a32" {sdadyn.s}
      {{objdump -R sdadyn.d}} "sdadyn"}
-    {"relaxing" "-melf32ppc --relax -Ttext=0 --defsym far=0x80001234 --defsym near=0x00004320" "-a32" "relax.s"
+    {"relaxing" "-melf32ppc --relax -Ttext=0 --defsym far=0x80001234 --defsym near=0x00004320" "" "-a32" "relax.s"
      {{objdump -dr relax.d}}
       "relax"}
-    {"relocatable relaxing" "-melf32ppc -r --relax" "-a32" "relax.s"
+    {"relocatable relaxing" "-melf32ppc -r --relax" "" "-a32" "relax.s"
      {{objdump -dr relaxr.d}}
       "relax"}
 }
 
 set ppc64elftests {
-    {"TLS static exec" "-melf64ppc" "-a64"  {tls.s tlslib.s}
+    {"TLS static exec" "-melf64ppc" "" "-a64"  {tls.s tlslib.s}
      {{objdump -dr tls.d} {objdump -sj.got tls.g} {objdump -sj.tdata tls.t}}
       "tls"}
-    {"TLS helper shared library" "-shared -melf64ppc tmpdir/tlslib.o" "" {}
+    {"TLS helper shared library" "-shared -melf64ppc tmpdir/tlslib.o" "" "" {}
      {} "libtlslib.so"}
-    {"TLS helper old shared lib" "-shared -melf64ppc" "-a64" {oldtlslib.s}
+    {"TLS helper old shared lib" "-shared -melf64ppc" "" "-a64" {oldtlslib.s}
      {} "liboldlib.so"}
-    {"TLS dynamic exec" "-melf64ppc --no-ld-generated-unwind-info tmpdir/tls.o tmpdir/libtlslib.so" "" {}
+    {"TLS dynamic exec" "-melf64ppc --no-ld-generated-unwind-info tmpdir/tls.o tmpdir/libtlslib.so" "" "" {}
      {{readelf -WSsrl tlsexe.r} {objdump -dr tlsexe.d}
       {objdump -sj.got tlsexe.g} {objdump -sj.tdata tlsexe.t}}
       "tlsexe"}
-    {"TLS dynamic old" "-melf64ppc --no-ld-generated-unwind-info tmpdir/tls.o tmpdir/liboldlib.so" "" {}
+    {"TLS dynamic old" "-melf64ppc --no-ld-generated-unwind-info tmpdir/tls.o tmpdir/liboldlib.so" "" "" {}
      {{readelf -WSsrl tlsexe.r} {objdump -dr tlsexe.d}
       {objdump -sj.got tlsexe.g} {objdump -sj.tdata tlsexe.t}}
       "tlsexeold"}
-    {"TLS shared" "-shared -melf64ppc --no-ld-generated-unwind-info tmpdir/tls.o" "" {}
+    {"TLS shared" "-shared -melf64ppc --no-ld-generated-unwind-info tmpdir/tls.o" "" "" {}
      {{readelf -WSsrl tlsso.r} {objdump -dr tlsso.d}
       {objdump -sj.got tlsso.g} {objdump -sj.tdata tlsso.t}}
       "tls.so"}
-    {"TLSTOC static exec" "-melf64ppc tmpdir/tlslib.o " "-a64"  {tlstoc.s}
+    {"TLSTOC static exec" "-melf64ppc tmpdir/tlslib.o " "" "-a64"  {tlstoc.s}
      {{objdump -dr tlstoc.d} {objdump -sj.got tlstoc.g}
       {objdump -sj.tdata tlstoc.t}}
       "tlstoc"}
-    {"TLSTOC dynamic exec" "-melf64ppc --no-ld-generated-unwind-info tmpdir/tlstoc.o tmpdir/libtlslib.so"
+    {"TLSTOC dynamic exec" "-melf64ppc --no-ld-generated-unwind-info tmpdir/tlstoc.o tmpdir/libtlslib.so" ""
      "" {}
      {{readelf -WSsrl tlsexetoc.r} {objdump -dr tlsexetoc.d}
       {objdump -sj.got tlsexetoc.g} {objdump -sj.tdata tlsexetoc.t}}
       "tlsexetoc"}
-    {"TLSTOC dynamic old" "-melf64ppc --no-ld-generated-unwind-info tmpdir/tlstoc.o tmpdir/liboldlib.so"
+    {"TLSTOC dynamic old" "-melf64ppc --no-ld-generated-unwind-info tmpdir/tlstoc.o tmpdir/liboldlib.so" ""
      "" {}
      {{readelf -WSsrl tlsexetoc.r} {objdump -dr tlsexetoc.d}
       {objdump -sj.got tlsexetoc.g} {objdump -sj.tdata tlsexetoc.t}}
       "tlsexetocold"}
-    {"TLSTOC shared" "-shared -melf64ppc --no-ld-generated-unwind-info tmpdir/tlstoc.o" "" {}
+    {"TLSTOC shared" "-shared -melf64ppc --no-ld-generated-unwind-info tmpdir/tlstoc.o" "" "" {}
      {{readelf -WSsrl tlstocso.r} {objdump -dr tlstocso.d}
       {objdump -sj.got tlstocso.g} {objdump -sj.tdata tlstocso.t}}
       "tlstoc.so"}
-    {"TLS markers" "-melf64ppc" "-a64"  {tlsmark.s tlslib.s}
+    {"TLS markers" "-melf64ppc" "" "-a64"  {tlsmark.s tlslib.s}
      {{objdump -dr tlsmark.d}}
       "tlsmark"}
-    {"TLS opt 1" "-melf64ppc" "-a64"  {tlsopt1.s tlslib.s}
+    {"TLS opt 1" "-melf64ppc" "" "-a64"  {tlsopt1.s tlslib.s}
      {{objdump -dr tlsopt1.d}}
       "tlsopt1"}
-    {"TLS opt 2" "-melf64ppc" "-a64"  {tlsopt2.s tlslib.s}
+    {"TLS opt 2" "-melf64ppc" "" "-a64"  {tlsopt2.s tlslib.s}
      {{objdump -dr tlsopt2.d}}
       "tlsopt2"}
-    {"TLS opt 3" "-melf64ppc" "-a64"  {tlsopt3.s tlslib.s}
+    {"TLS opt 3" "-melf64ppc" "" "-a64"  {tlsopt3.s tlslib.s}
      {{objdump -dr tlsopt3.d}}
       "tlsopt3"}
-    {"TLS opt 4" "-melf64ppc" "-a64"  {tlsopt4.s tlslib.s}
+    {"TLS opt 4" "-melf64ppc" "" "-a64"  {tlsopt4.s tlslib.s}
      {{objdump -dr tlsopt4.d}}
       "tlsopt4"}
-    {"sym@tocbase" "-shared -melf64ppc" "-a64" {symtocbase-1.s symtocbase-2.s}
+    {"sym@tocbase" "-shared -melf64ppc" "" "-a64" {symtocbase-1.s symtocbase-2.s}
 	{{objdump -dj.data symtocbase.d}} "symtocbase.so"}
-    {"TOC opt" "-melf64ppc" "-a64"  {tocopt.s}
+    {"TOC opt" "-melf64ppc" "" "-a64"  {tocopt.s}
 	{{ld tocopt.out} {objdump -s tocopt.d}} "tocopt"}
-    {"TOC opt2" "-melf64ppc --defsym x=2" "-a64"  {tocopt2.s}
+    {"TOC opt2" "-melf64ppc --defsym x=2" "" "-a64"  {tocopt2.s}
 	{{ld tocopt2.out} {objdump -s tocopt2.d}} "tocopt2"}
-    {"TOC opt3" "-melf64ppc -no-keep-memory --defsym x=2" "-a64"  {tocopt3.s}
+    {"TOC opt3" "-melf64ppc -no-keep-memory --defsym x=2" "" "-a64"  {tocopt3.s}
 	{{objdump -s tocopt3.d}} "tocopt3"}
-    {"TOC opt4" "-melf64ppc -no-keep-memory --defsym x=2" "-a64"
+    {"TOC opt4" "-melf64ppc -no-keep-memory --defsym x=2" "" "-a64"
         {tocopt4a.s tocopt4b.s} {{objdump -s tocopt4.d}} "tocopt4"}
-    {"TOC opt5" "-melf64ppc" "-a64"  {tocopt5.s}
+    {"TOC opt5" "-melf64ppc" "" "-a64"  {tocopt5.s}
 	{{objdump -s tocopt5.d}} "tocopt5"}
 }
 
 set ppceabitests {
-    {"VLE multiple segments 1" "-T vle-multiseg-1.ld"
+    {"VLE multiple segments 1" "-T vle-multiseg-1.ld" ""
      "-mregnames -mvle" {vle-multiseg.s}
     {{readelf "-l" vle-multiseg-1.d}} "vle-multiseg-1"}
-    {"VLE multiple segments 2" "-T vle-multiseg-2.ld"
+    {"VLE multiple segments 2" "-T vle-multiseg-2.ld" ""
      "-mregnames -mvle" {vle-multiseg.s}
     {{readelf "-l" vle-multiseg-2.d}} "vle-multiseg-2"}
-    {"VLE multiple segments 3" "-T vle-multiseg-3.ld"
+    {"VLE multiple segments 3" "-T vle-multiseg-3.ld" ""
      "-mregnames -mvle" {vle-multiseg.s}
     {{readelf "-l" vle-multiseg-3.d}} "vle-multiseg-3"}
-    {"VLE multiple segments 4" "-T vle-multiseg-4.ld"
+    {"VLE multiple segments 4" "-T vle-multiseg-4.ld" ""
      "-mregnames -mvle" {vle-multiseg.s}
     {{readelf "-l" vle-multiseg-4.d}} "vle-multiseg-4"}
-    {"VLE multiple segments 5" "-T vle-multiseg-5.ld"
+    {"VLE multiple segments 5" "-T vle-multiseg-5.ld" ""
      "-mregnames -mvle" {vle-multiseg.s}
     {{readelf "-l" vle-multiseg-5.d}} "vle-multiseg-5"}
-    {"VLE relocations 1" "-T vle.ld"
+    {"VLE relocations 1" "-T vle.ld" ""
      "-mvle" {vle-reloc-1.s vle-reloc-def-1.s}
     {{objdump "-Mvle -d" vle-reloc-1.d}} "vle-reloc-1"}
-    {"VLE relocations 2" "-T vle.ld"
+    {"VLE relocations 2" "-T vle.ld" ""
      "-mvle" {vle-reloc-2.s vle-reloc-def-2.s}
     {{objdump "-Mvle -d" vle-reloc-2.d}} "vle-reloc-2"}
-    {"VLE relocations 3" "-T vle.ld"
+    {"VLE relocations 3" "-T vle.ld" ""
      "-mvle" {vle-reloc-3.s vle-reloc-def-3.s}
     {{objdump "-Mvle -d" vle-reloc-3.d}} "vle-reloc-3"}
 }