From 897aea504d5f5ba75b021e0a817d4ea9337a378d Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Tue, 19 Feb 2013 01:10:06 +0000 Subject: * 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. --- ld/testsuite/lib/ld-lib.exp | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'ld/testsuite/lib') diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index 0b156a1..4cd671d 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -1000,12 +1000,13 @@ proc ar_simple_create { ar aropts target objects } { # List contains test-items with 3 items followed by 2 lists, one item and # one optional item: # 0:name -# 1:ld/ar options -# 2:assembler options -# 3:filenames of assembler files -# 4:list of actions, options and expected outputs. -# 5:name of output file -# 6:compiler flags (optional) +# 1:ld/ar leading options, placed before object files +# 2:ld/ar trailing options, placed after object files +# 3:assembler options +# 4:filenames of assembler files +# 5:list of actions, options and expected outputs. +# 6:name of output file +# 7:compiler flags (optional) # # Actions: { command command-line-options file-containg-expected-output-regexps } # Commands: @@ -1041,11 +1042,12 @@ proc run_ld_link_tests { ldtests } { } set ld_options [lindex $testitem 1] - set as_options [lindex $testitem 2] - set src_files [lindex $testitem 3] - set actions [lindex $testitem 4] - set binfile tmpdir/[lindex $testitem 5] - set cflags [lindex $testitem 6] + set ld_after [lindex $testitem 2] + set as_options [lindex $testitem 3] + set src_files [lindex $testitem 4] + set actions [lindex $testitem 5] + set binfile tmpdir/[lindex $testitem 6] + set cflags [lindex $testitem 7] set objfiles {} set is_unresolved 0 set failed 0 @@ -1054,6 +1056,7 @@ proc run_ld_link_tests { ldtests } { # verbose -log "Testname is $testname" # verbose -log "ld_options is $ld_options" +# verbose -log "ld_after is $ld_after" # verbose -log "as_options is $as_options" # verbose -log "src_files is $src_files" # verbose -log "actions is $actions" @@ -1087,10 +1090,10 @@ proc run_ld_link_tests { ldtests } { } if { [regexp ".*\\.a$" $binfile] } { - if { ![ar_simple_create $ar $ld_options $binfile "$objfiles"] } { + if { ![ar_simple_create $ar $ld_options $binfile "$objfiles $ld_after"] } { set failed 1 } - } elseif { ![ld_simple_link $ld $binfile "-L$srcdir/$subdir $ld_options $objfiles"] } { + } elseif { ![ld_simple_link $ld $binfile "-L$srcdir/$subdir $ld_options $objfiles $ld_after"] } { set maybe_failed 1 set ld_output "$exec_output" } -- cgit v1.1