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

1 files changed, 20 insertions, 20 deletions

diff --git a/ld/testsuite/ld-sparc/sparc.exp b/ld/testsuite/ld-sparc/sparc.exp
index 2ecded2..3caa494 100644
--- a/ld/testsuite/ld-sparc/sparc.exp
+++ b/ld/testsuite/ld-sparc/sparc.exp
@@ -24,23 +24,23 @@
 
 if {[istarget "sparc-*-vxworks"]} {
     set sparcvxworkstests {
-	{"VxWorks shared library test 1" "-shared -Tvxworks1.ld"
+	{"VxWorks shared library test 1" "-shared -Tvxworks1.ld" ""
 	 "-KPIC" {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" ""
 	 "" {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" ""
 	 "" {vxworks2.s}
 	 {{readelf --segments vxworks2.sd}}
 	 "vxworks2"}
 	{"VxWorks executable test 2 (static)"
-	 "-Tvxworks1.ld"
+	 "-Tvxworks1.ld" ""
 	 "" {vxworks2.s}
 	 {{readelf --segments vxworks2-static.sd}}
 	 "vxworks2"}
@@ -58,8 +58,8 @@ if { !([istarget "sparc*-*-elf*"]
 }
 
 # 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).
@@ -67,58 +67,58 @@ if { !([istarget "sparc*-*-elf*"]
 # readelf: Apply readelf options on result.  Compare with regex (last arg).
 
 set sparctests {
-    {"32-bit: TLS -fpic -shared transitions" "-shared -melf32_sparc"
+    {"32-bit: TLS -fpic -shared transitions" "-shared -melf32_sparc" ""
      "--32 -K PIC" {tlssunpic32.s tlspic.s}
      {{readelf -WSsrl tlssunpic32.rd} {objdump -drj.text tlssunpic32.dd}
       {objdump -sj.got tlssunpic32.sd} {objdump -sj.tdata tlssunpic32.td}}
       "libtlssunpic32.so"}
-    {"32-bit: Helper shared library" "-shared -melf32_sparc"
+    {"32-bit: Helper shared library" "-shared -melf32_sparc" ""
      "--32 -K PIC" {tlslib.s} {} "libtlslib32.so"}
-    {"32-bit: Another helper shared library" "-shared -melf32_sparc"
+    {"32-bit: Another helper shared library" "-shared -melf32_sparc" ""
      "--32 -K PIC" {tlssunbinpic32.s} {} "libtlssunbinpic32.so"}
     {"32-bit: TLS -fpic and -fno-pic exec transitions"
-     "-melf32_sparc tmpdir/libtlslib32.so tmpdir/tlssunbinpic32.o"
+     "-melf32_sparc tmpdir/libtlslib32.so tmpdir/tlssunbinpic32.o" ""
      "--32" {tlssunbin32.s}
      {{readelf -WSsrl tlssunbin32.rd} {objdump -drj.text tlssunbin32.dd}
       {objdump -sj.got tlssunbin32.sd} {objdump -sj.tdata tlssunbin32.td}}
       "tlssunbin32"}
-    {"32-bit: TLS -fno-pic -shared" "-shared -melf32_sparc"
+    {"32-bit: TLS -fno-pic -shared" "-shared -melf32_sparc" ""
      "--32" {tlssunnopic32.s tlsnopic.s}
      {{readelf -WSsrl tlssunnopic32.rd} {objdump -drj.text tlssunnopic32.dd}
       {objdump -sj.got tlssunnopic32.sd}} "libtlssunnopic32.so"}
-    {"32-bit: TLS in debug sections" "-melf32_sparc"
+    {"32-bit: TLS in debug sections" "-melf32_sparc" ""
      "--32" {tlsg32.s}
      {{objdump -sj.debug_foobar tlsg32.sd}} "tlsg32"}
-    {"32-bit: GOTDATA relocations" "-shared -melf32_sparc"
+    {"32-bit: GOTDATA relocations" "-shared -melf32_sparc" ""
      "--32 -K PIC" {gotop32.s}
      {{readelf -WSsrl gotop32.rd} {objdump -drj.text gotop32.dd}
       {objdump -sj.got gotop32.sd} {objdump -sj.data gotop32.td}}
      "libgotop32.so"}
 }
 set sparc64tests {
-    {"64-bit: TLS -fpic -shared transitions" "-shared -melf64_sparc"
+    {"64-bit: TLS -fpic -shared transitions" "-shared -melf64_sparc" ""
      "--64 -Av9 -K PIC" {tlssunpic64.s tlspic.s}
      {{readelf -WSsrl tlssunpic64.rd} {objdump -drj.text tlssunpic64.dd}
       {objdump -sj.got tlssunpic64.sd} {objdump -sj.tdata tlssunpic64.td}}
       "libtlssunpic64.so"}
-    {"64-bit: Helper shared library" "-shared -melf64_sparc"
+    {"64-bit: Helper shared library" "-shared -melf64_sparc" ""
      "--64 -Av9 -K PIC" {tlslib.s} {} "libtlslib64.so"}
-    {"64-bit: Another helper shared library" "-shared -melf64_sparc"
+    {"64-bit: Another helper shared library" "-shared -melf64_sparc" ""
      "--64 -Av9 -K PIC" {tlssunbinpic64.s} {} "libtlssunbinpic64.so"}
     {"64-bit: TLS -fpic and -fno-pic exec transitions"
-     "-melf64_sparc tmpdir/libtlslib64.so tmpdir/tlssunbinpic64.o"
+     "-melf64_sparc tmpdir/libtlslib64.so tmpdir/tlssunbinpic64.o" ""
      "--64 -Av9" {tlssunbin64.s}
      {{readelf -WSsrl tlssunbin64.rd} {objdump -drj.text tlssunbin64.dd}
       {objdump -sj.got tlssunbin64.sd} {objdump -sj.tdata tlssunbin64.td}}
       "tlssunbin64"}
-    {"64-bit: TLS -fno-pic -shared" "-shared -melf64_sparc"
+    {"64-bit: TLS -fno-pic -shared" "-shared -melf64_sparc" ""
      "--64 -Av9" {tlssunnopic64.s tlsnopic.s}
      {{readelf -WSsrl tlssunnopic64.rd} {objdump -drj.text tlssunnopic64.dd}
       {objdump -sj.got tlssunnopic64.sd}} "libtlssunnopic64.so"}
-    {"64-bit: TLS in debug sections" "-melf64_sparc"
+    {"64-bit: TLS in debug sections" "-melf64_sparc" ""
      "--64 -Av9" {tlsg64.s}
      {{objdump -sj.debug_foobar tlsg64.sd}} "tlsg64"}
-    {"64-bit: GOTDATA relocations" "-shared -melf64_sparc"
+    {"64-bit: GOTDATA relocations" "-shared -melf64_sparc" ""
      "--64 -K PIC" {gotop64.s}
      {{readelf -WSsrl gotop64.rd} {objdump -drj.text gotop64.dd}
       {objdump -sj.got gotop64.sd} {objdump -sj.data gotop64.td}}