diff options
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/lib/lto.exp | 20 |
2 files changed, 25 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 116c676855b..2f2afe0c161 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-10-15 Jie Zhang <jie@codesourcery.com> + + * lib/lto.exp (lto-link-and-maybe-run): Use the default linker + script when relocatable linking. + 2010-10-14 Yao Qi <yao@codesourcery.com> PR target/45447 diff --git a/gcc/testsuite/lib/lto.exp b/gcc/testsuite/lib/lto.exp index 30b6f06001d..57c7a2ebd25 100644 --- a/gcc/testsuite/lib/lto.exp +++ b/gcc/testsuite/lib/lto.exp @@ -163,6 +163,7 @@ proc lto-link-and-maybe-run { testname objlist dest optall optfile optstr } { global testcase global tool global compile_type + global board_info # Check that all of the objects were built successfully. foreach obj [split $objlist] { @@ -177,10 +178,29 @@ proc lto-link-and-maybe-run { testname objlist dest optall optfile optstr } { set options "" lappend options "additional_flags=$optall $optfile" + set target_board [target_info name] + set relocatable 0 + + # Some LTO tests do relocatable linking. Some target boards set + # a linker script which can't be used for relocatable linking. + # Use the default linker script instead. + if { [lsearch -exact [split "$optall $optfile"] "-r"] >= 0 } { + set relocatable 1 + } + + if { $relocatable } { + set saved_ldscript [board_info $target_board ldscript] + set board_info($target_board,ldscript) "" + } + # Link the objects into an executable. set comp_output [${tool}_target_compile "$objlist" $dest executable \ "$options"] + if { $relocatable } { + set board_info($target_board,ldscript) $saved_ldscript + } + # Prune unimportant visibility warnings before checking output. set comp_output [lto_prune_warns $comp_output] |