Submitted By: Bruce Dubbs Date: 2014-07-19 Initial Package Version: 2.24 Upstream Status: Unknown Origin: Arch Linux Description: Fix binutils LTO tests index c5249f0..69946de 100644 --- a/ld/testsuite/ld-plugin/lto.exp +++ b/ld/testsuite/ld-plugin/lto.exp @@ -57,7 +57,7 @@ set lto_link_tests { "" "-O2" {lto-3c.c} {} "libdummy.a"} {"Build liblto-3.a" - "" "-flto" + "" "-flto -ffat-lto-objects" {lto-3b.c} {} "liblto-3.a"} {"Build libdummy.a 5a" "" "-flto" @@ -111,7 +111,7 @@ set lto_link_tests { "" "" {pr12758a.s} {} "libdummy.a"} {"Build libpr12758.a" - "" "-flto -O2" + "" "-flto -O2 -ffat-lto-objects" {pr12758b.c} {} "libpr12758.a"} {"PR ld/12758" "-O2 -Wl,-e,foo -nostdlib -flto -fuse-linker-plugin tmpdir/pr12758a.o -Wl,--start-group tmpdir/libpr12758.a -Wl,--end-group" "" @@ -120,13 +120,13 @@ set lto_link_tests { "" "" {pr12760a.c} {} "libdummy.a"} {"Build libpr12760.a" - "" "-flto -O2" + "" "-flto -O2 -ffat-lto-objects" {pr12760b.c} {} "libpr12760.a"} {"PR ld/12760" "-O2 -Wl,-e,foo -nostdlib -flto -fuse-linker-plugin tmpdir/pr12760a.o -Wl,--start-group tmpdir/libpr12760.a -Wl,--end-group" "" {dummy.c} {} "pr12760.exe" "c" "warning: Bad bar"} {"Build libpr13183.a" - "-T" "-flto -O2" + "-T" "-flto -O2 -ffat-lto-objects" {pr13183a.c} {} "libpr13183.a"} {"Build libdummy.a PR ld/13183" "" "-flto -O2" diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index 8df42ae..175449a 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -1643,7 +1643,7 @@ proc check_lto_available { } { set f [open $src "w"] puts $f "" close $f - set status [remote_exec host $CC "-shared -B[pwd]/tmpdir/ld/ -flto -fuse-linker-plugin $src -o $output"] + set status [remote_exec host $CC "-shared -B[pwd]/tmpdir/ld/ -flto -ffat-lto-objects -fuse-linker-plugin $src -o $output"] if { [lindex $status 0] == 0 } { set lto_available_saved 1 } else { diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp index b14f13c..765d85f 100644 --- a/ld/testsuite/ld-plugin/lto.exp +++ b/ld/testsuite/ld-plugin/lto.exp @@ -324,7 +324,20 @@ if { [is_elf_format] && [check_lto_shared_available] } { set testname "Build liblto-11.a" remote_file host delete "tmpdir/liblto-11.a" -set catch_output [run_host_cmd "$ar" "rc tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"] +set plugin_names { + liblto_plugin.so + liblto_plugin-0.dll + cyglto_plugin-0.dll +} +set plug_opt "" +foreach plug $plugin_names { + set plug_so [run_host_cmd $CC "--print-prog-name $plug"] + if { $plug_so ne $plug } then { + set plug_opt "--plugin $plug_so" + break + } +} +set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"] if {![string match "" $catch_output]} { unresolved $testname restore_notify