Remove spurious delta in kernel lto patch.
This commit is contained in:
parent
b3fd2f8ff9
commit
bee341650a
@ -2553,100 +2553,3 @@ diff -rup binutils-2.26.orig/ld/testsuite/ld-plugin/lto.exp binutils-2.26/ld/tes
|
||||
|
||||
run_cc_link_tests $lto_link_symbol_tests
|
||||
|
||||
diff -rup binutils-2.26.orig/ld/testsuite/ld-plugin/lto.exp.orig binutils-2.26/ld/testsuite/ld-plugin/lto.exp.orig
|
||||
--- binutils-2.26.orig/ld/testsuite/ld-plugin/lto.exp.orig 2016-02-19 09:35:36.805003880 +0000
|
||||
+++ binutils-2.26/ld/testsuite/ld-plugin/lto.exp.orig 2016-02-19 09:35:54.929106657 +0000
|
||||
@@ -79,6 +79,15 @@ set lto_link_tests [list \
|
||||
[list "Build liblto-3.a" \
|
||||
"" "-flto $lto_fat" \
|
||||
{lto-3b.c} {} "liblto-3.a"] \
|
||||
+ [list "Compile 4a" \
|
||||
+ "" "-flto $lto_fat" \
|
||||
+ {lto-4a.c} {} ""] \
|
||||
+ [list "Compile 4b" \
|
||||
+ "" "-O2" \
|
||||
+ {lto-4b.c} {} ""] \
|
||||
+ [list "Compile 4c" \
|
||||
+ "" "-O2" \
|
||||
+ {lto-4c.c} {} ""] \
|
||||
[list "Compile 5a" \
|
||||
"" "-flto $lto_fat" \
|
||||
{lto-5a.c} {} ""] \
|
||||
@@ -94,6 +103,12 @@ set lto_link_tests [list \
|
||||
[list "Compile 9" \
|
||||
"" "-O2 -finline -flto" \
|
||||
{lto-9.cc} {} "" "c++"] \
|
||||
+ [list "Compile 10a" \
|
||||
+ "" "-O2" \
|
||||
+ {lto-10a.c} {} ""] \
|
||||
+ [list "Compile 10b" \
|
||||
+ "" "-O2 -flto $lto_fat" \
|
||||
+ {lto-10b.c} {} ""] \
|
||||
[list "Compile 11a" \
|
||||
"" "-O -flto" \
|
||||
{lto-11a.c} {} ""] \
|
||||
@@ -291,9 +306,21 @@ set lto_run_tests [list \
|
||||
[list "LTO 3c" \
|
||||
"-O2 -flto -fuse-linker-plugin tmpdir/lto-3a.o tmpdir/lto-3c.o -Wl,--whole-archive tmpdir/liblto-3.a -Wl,--no-whole-archive tmpdir/liblto-3.a" "" \
|
||||
{dummy.c} "lto-3d.exe" "lto-3.out" "" "c"] \
|
||||
+ [list "LTO 4a" \
|
||||
+ "-O2 -flto -fuse-linker-plugin tmpdir/lto-4r-a.o" "" \
|
||||
+ {dummy.c} "lto-4a.exe" "lto-4.out" "" "c"] \
|
||||
+ [list "LTO 4c" \
|
||||
+ "-O2 -flto -fuse-linker-plugin tmpdir/lto-4r-c.o" "" \
|
||||
+ {dummy.c} "lto-4c.exe" "lto-4.out" "" "c"] \
|
||||
+ [list "LTO 4d" \
|
||||
+ "-O2 -flto -fuse-linker-plugin tmpdir/lto-4r-d.o" "" \
|
||||
+ {dummy.c} "lto-4d.exe" "lto-4.out" "" "c"] \
|
||||
[list "LTO 5" \
|
||||
"-O2 -flto -fuse-linker-plugin tmpdir/lto-5.o" "" \
|
||||
{dummy.c} "lto-5.exe" "lto-5.out" "" "c"] \
|
||||
+ [list "LTO 10" \
|
||||
+ "-O2 -flto -fuse-linker-plugin tmpdir/lto-10.o" "" \
|
||||
+ {dummy.c} "lto-10.exe" "lto-10.out" "" "c"] \
|
||||
[list "LTO 11" \
|
||||
"-O -flto -fuse-linker-plugin tmpdir/liblto-11.a" "" \
|
||||
{dummy.c} "lto-11.exe" "lto-11.out" "" "c"] \
|
||||
@@ -378,6 +405,15 @@ if { [is_elf_format] && [check_lto_share
|
||||
}
|
||||
}
|
||||
|
||||
+set testname "Build liblto-4.a"
|
||||
+remote_file host delete "tmpdir/liblto-4.a"
|
||||
+set catch_output [run_host_cmd "$ar" "rc tmpdir/liblto-4.a tmpdir/lto-4a.o tmpdir/lto-4b.o tmpdir/lto-4c.o"]
|
||||
+if {![string match "" $catch_output]} {
|
||||
+ unresolved $testname
|
||||
+ restore_notify
|
||||
+ return
|
||||
+}
|
||||
+
|
||||
set testname "Build liblto-11.a"
|
||||
remote_file host delete "tmpdir/liblto-11.a"
|
||||
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"]
|
||||
@@ -416,11 +452,26 @@ if { [at_least_gcc_version 4 7] } {
|
||||
}
|
||||
}
|
||||
|
||||
+# Fedora specific binutils patches break some of the tests that follow...
|
||||
+restore_notify
|
||||
+return
|
||||
+
|
||||
+
|
||||
# Run "ld -r" to generate inputs for complex LTO tests.
|
||||
run_dump_test "lto-3r"
|
||||
remote_exec host "mv" "tmpdir/dump tmpdir/lto-3.o"
|
||||
+run_dump_test "lto-4r-a"
|
||||
+remote_exec host "mv" "tmpdir/dump tmpdir/lto-4r-a.o"
|
||||
+run_dump_test "lto-4r-b"
|
||||
+remote_exec host "mv" "tmpdir/dump tmpdir/lto-4r-b.o"
|
||||
+run_dump_test "lto-4r-c"
|
||||
+remote_exec host "mv" "tmpdir/dump tmpdir/lto-4r-c.o"
|
||||
+run_dump_test "lto-4r-d"
|
||||
+remote_exec host "mv" "tmpdir/dump tmpdir/lto-4r-d.o"
|
||||
run_dump_test "lto-5r"
|
||||
remote_exec host "mv" "tmpdir/dump tmpdir/lto-5.o"
|
||||
+run_dump_test "lto-10r"
|
||||
+remote_exec host "mv" "tmpdir/dump tmpdir/lto-10.o"
|
||||
|
||||
run_cc_link_tests $lto_link_symbol_tests
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user