X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Ftestsuite%2Fld-plugin%2Flto.exp;h=e7f4427b6f0dc31785eaf4ed7dea708db969ba85;hb=abc868c6090192b9bf3059da81e518bd744b8da3;hp=7ffe955409cd20f942d6d5d86a3a321e27290f1a;hpb=81fbe831fe0239501808446529614a07449695e3;p=deliverable%2Fbinutils-gdb.git

diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
index 7ffe955409..e7f4427b6f 100644
--- a/ld/testsuite/ld-plugin/lto.exp
+++ b/ld/testsuite/ld-plugin/lto.exp
@@ -1,6 +1,5 @@
 # Expect script for ld-plugin LTO tests
-#   Copyright 2011, 2012, 2013
-#   Free Software Foundation, Inc.
+#   Copyright (C) 2011-2014 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -29,8 +28,8 @@ global CFLAGS
 global CXXFLAGS
 set saved_CFLAGS "$CFLAGS"
 set saved_CXXFLAGS "$CXXFLAGS"
-regsub -all "\\-Wp,-D_FORTIFY_SOURCE=\[0-9\]+" $CFLAGS "" CFLAGS
-regsub -all "\\-Wp,-D_FORTIFY_SOURCE=\[0-9\]+" $CXXFLAGS "" CXXFLAGS
+regsub -all "(\\-Wp,)?-D_FORTIFY_SOURCE=\[0-9\]+" $CFLAGS "" CFLAGS
+regsub -all "(\\-Wp,)?-D_FORTIFY_SOURCE=\[0-9\]+" $CXXFLAGS "" CXXFLAGS
 
 proc restore_notify { } {
   global saved_CFLAGS
@@ -44,124 +43,141 @@ set lto_link_tests {
   {"LTO 1"
    "-O2 -flto -fuse-linker-plugin" "-flto -fuse-linker-plugin"
    {lto-1a.c lto-1b.c} {} "lto-1.exe"}
-  {"Build libdummy.a 2"
+  {"Compile 2"
    "" "-O2 -flto -fuse-linker-plugin"
-   {lto-2.c} {} "libdummy.a"}
+   {lto-2.c} {} ""}
   {"LTO 2"
    "-static -O2 -flto -fuse-linker-plugin tmpdir/lto-2.o -lm" ""
    {dummy.c} {} "lto-2.exe"}
-  {"Build libdummy.a 3a"
+  {"Compile 3a"
    "" "-flto"
-   {lto-3a.c} {} "libdummy.a"}
-  {"Build libdummy.a 3c"
+   {lto-3a.c} {} ""}
+  {"Compile 3c"
    "" "-O2"
-   {lto-3c.c} {} "libdummy.a"}
+   {lto-3c.c} {} ""}
   {"Build liblto-3.a"
-   "" "-flto"
+   "" "-flto -ffat-lto-objects"
    {lto-3b.c} {} "liblto-3.a"}
-  {"Build libdummy.a 5a"
+  {"Compile 5a"
    "" "-flto"
-   {lto-5a.c} {} "libdummy.a"}
-  {"Build libdummy.a 5b"
+   {lto-5a.c} {} ""}
+  {"Compile 5b"
    "" "-flto"
-   {lto-5b.c} {} "libdummy.a"}
+   {lto-5b.c} {} ""}
   {"LTO 6"
    "-O2 -flto -fuse-linker-plugin" ""
    {lto-6.c} {} "lto-6.exe" "c"}
-  {"Build libdummy.a 9"
+  {"Compile 9"
    "" "-O2 -finline -flto"
-   {lto-9.cc} {} "libdummy.a"}
-  {"Build libdummy.a 11a"
+   {lto-9.cc} {} "" "c++"}
+  {"Compile 11a"
    "" "-O -flto"
-   {lto-11a.c} {} "libdummy.a"}
-  {"Build libdummy.a 11b"
+   {lto-11a.c} {} ""}
+  {"Compile 11b"
    "" "-O -flto"
-   {lto-11b.c} {} "libdummy.a"}
-  {"Build libdummy.a 11c"
+   {lto-11b.c} {} ""}
+  {"Compile 11c"
    "" "-O"
-   {lto-11c.c} {} "libdummy.a"}
+   {lto-11c.c} {} ""}
   {"Build liblto-12.a"
    "" "-O2 -flto"
    {lto-12c.c} {} "liblto-12.a"}
-  {"Build libdummy.a 12"
+  {"Compile 12"
    "" "-O2 -flto"
-   {lto-12a.c lto-12b.c} {} "libdummy.a"}
-  {"Build libdummy.a 13"
+   {lto-12a.c lto-12b.c} {} ""}
+  {"Compile 13"
    "" "-O2 -flto"
-   {lto-13a.c lto-13b.c} {} "libdummy.a"}
+   {lto-13a.c lto-13b.c} {} ""}
   {"Build liblto-13.a"
    "" "-O2"
    {lto-13c.c} {} "liblto-13.a"}
-  {"Build libdummy.a 14a"
+  {"Compile 14a"
    "" "-flto"
-   {lto-14a.c lto-14b.c} {} "libdummy.a"}
+   {lto-14a.c lto-14b.c} {} ""}
   {"Build liblto-14.a"
    "" "-flto"
    {lto-14c.c} {} "liblto-14.a"}
-  {"Build libdummy.a 15a"
+  {"Compile 15a"
    "" "-flto"
-   {lto-15a.c} {} "libdummy.a"}
+   {lto-15a.c} {} ""}
   {"Build liblto-15.a"
    "" "-flto"
    {lto-15b.c} {} "liblto-15.a"}
   {"PR ld/12696"
    "-O2 -flto -fuse-linker-plugin -r -nostdlib" "-O2 -flto"
-   {pr12696-1.cc} {} "pr12696-1r.o" "c"}
-  {"Build libdummy.a PR ld/12758"
+   {pr12696-1.cc} {} "pr12696-1r.o" "c++"}
+  {"Compile PR ld/12758"
    "" ""
-   {pr12758a.s} {} "libdummy.a"}
+   {pr12758a.s} {} ""}
   {"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" ""
    {dummy.c} {} "pr12758.exe"}
-  {"Build libdummy.a PR ld/12760"
-   "" ""
-   {pr12760a.c} {} "libdummy.a"}
+  {"Compile PR ld/12760"
+   "" "-g -O0"
+   {pr12760a.c} {} ""}
   {"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 libdummy.a PR ld/12942 (1)"
-   "" "-flto -O2"
-   {pr12942a.cc pr12942c.cc} {} "libdummy.a" "c++"}
-  {"Build libdummy.a PR ld/12942 (2)"
-   "" "-O0"
-   {pr12942b.cc} {} "libdummy.a" "c++"}
+   {dummy.c} {} "pr12760.exe" "c" "pr12760a.c:6: 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"
+  {"Compile PR ld/13183"
    "" "-flto -O2"
-   {pr13183b.c} {} "libdummy.a"}
-  {"Build libdummy.a PR ld/13201"
+   {pr13183b.c} {} ""}
+  {"Compile PR ld/13201"
    "" "-flto -O2"
-   {pr13201.c} {} "libdummy.a"}
+   {pr13201.c} {} ""}
   {"PR ld/13287"
    "-flto -fuse-linker-plugin -Wl,--as-needed" "-flto"
    {pr13287.cc} {} "pr13287.exe" "c++"}
   {"PR ld/15323"
    "" "-O2"
-   {pr15323a.c} {} "libdummy.a" "c"}
+   {pr15323a.c} {} "" "c"}
+  {"Compile(1) PR ld/pr16846"
+   "" "-flto"
+   {pr16846a.c pr16846b.c} {} ""}
+  {"Compile(2) PR ld/pr16846"
+   "" ""
+   {pr16846c.c} {} ""}
+  {"PR ld/pr16846(1)"
+   "-flto -fuse-linker-plugin tmpdir/pr16846a.o tmpdir/pr16846b.o tmpdir/pr16846c.o" ""
+   {dummy.c} {} "pr16846a.exe"}
+  {"PR ld/pr16846(2)"
+   "-flto -fuse-linker-plugin tmpdir/pr16846a.o tmpdir/pr16846c.o tmpdir/pr16846b.o" ""
+   {dummy.c} {} "pr16846b.exe"}
+}
+
+if { [at_least_gcc_version 4 7] } {
+    set lto_link_tests [concat $lto_link_tests {
+      {"Compile PR ld/12942 (1)"
+       "" "-flto -O2"
+       {pr12942a.cc pr12942c.cc} {} "" "c++"}
+      {"Compile PR ld/12942 (2)"
+       "" "-O0"
+       {pr12942b.cc} {} "" "c++"}
+    }]
 }
 
 # Generate input files for complex LTO tests for ELF.
 set lto_link_elf_tests {
-  {"Build libdummy.a 7"
+  {"Compile 7"
    "" "-flto -O2"
-   {lto-7a.c lto-7b.c lto-7c.c} {} "libdummy.a"}
+   {lto-7a.c lto-7b.c lto-7c.c} {} ""}
   {"Build liblto-7.so"
    "-shared" "-O2 -fpic"
    {lto-7d.c} {} "liblto-7.so" "c"}
-  {"Build libdummy.a 8a"
+  {"Compile 8a"
    "" "-O2"
-   {lto-8a.c} {} "libdummy.a"}
-  {"Build libdummy.a 8b"
+   {lto-8a.c} {} ""}
+  {"Compile 8b"
    "" "-flto -O2"
-   {lto-8b.c} {} "libdummy.a"}
+   {lto-8b.c} {} ""}
   {"Build liblto-17a.so"
    "-shared -O2 -fpic -flto -fuse-linker-plugin" "-O2 -fpic -flto"
    {lto-17a.c} {{"nm" {} "lto-17a.d"}} "liblto-17a.so" "c"}
@@ -257,12 +273,6 @@ set lto_run_tests {
   {"LTO 15"
    "-O2 -flto -fuse-linker-plugin -Wl,--start-group tmpdir/liblto-15.a tmpdir/lto-15a.o -Wl,--end-group" ""
    {dummy.c} "lto-15.exe" "lto-15.out" "" "c"}
-  {"PR ld/12942 (1)"
-   "-O2 -flto -fuse-linker-plugin tmpdir/pr12942a.o tmpdir/pr12942b.o" ""
-   {dummy.c} "pr12942a.exe" "pr12942.out" "" "c++"}
-  {"PR ld/12942 (2)"
-   "-O2 -flto -fuse-linker-plugin tmpdir/pr12942a.o tmpdir/pr12942c.o" ""
-   {dummy.c} "pr12942c.exe" "pr12942.out" "" "c++"}
   {"PR ld/13066"
    "-O2 -flto -fuse-linker-plugin" ""
    {pr13066.cc} "pr13066.exe" "pr13066.out" "" "c++"}
@@ -274,6 +284,17 @@ set lto_run_tests {
    {pr15323b.c} "pr15323.exe" "pr15323.out" "-flto -O2" "c"}
 }
 
+if { [at_least_gcc_version 4 7] } {
+    set lto_run_tests [concat $lto_run_tests {
+      {"PR ld/12942 (1)"
+       "-O2 -flto -fuse-linker-plugin tmpdir/pr12942a.o tmpdir/pr12942b.o" ""
+       {dummy.c} "pr12942a.exe" "pr12942.out" "" "c++"}
+      {"PR ld/12942 (2)"
+       "-O2 -flto -fuse-linker-plugin tmpdir/pr12942a.o tmpdir/pr12942c.o" ""
+       {dummy.c} "pr12942c.exe" "pr12942.out" "" "c++"}
+    }]
+}
+
 # LTO run-time tests for ELF
 set lto_run_elf_tests {
   {"LTO 7"
@@ -290,12 +311,11 @@ set lto_run_elf_tests {
 run_cc_link_tests $lto_link_tests
 
 # Restrict these to ELF targets that support shared libs and PIC.
-if { [is_elf_format]
-     && [run_host_cmd_yesno $CC "-shared -fPIC $srcdir/$subdir/dummy.c -o tmpdir/t.so"] } {
+if { [is_elf_format] && [check_lto_shared_available] } {
     run_cc_link_tests $lto_link_elf_tests
     set testname "PR ld/15146 (2)"
     set exec_output [run_host_cmd "$CC" "$gcc_gas_flag $gcc_ld_flag -O2 -flto -fuse-linker-plugin -Wl,-rpath-link,. -Wl,--no-copy-dt-needed-entries -Wl,--no-as-needed tmpdir/pr15146d.o tmpdir/pr15146c.so"]
-    if { [ regexp "ltrans.o: undefined reference to symbol 'xxx'" $exec_output ] } {
+    if { [ regexp "undefined reference to symbol 'xxx'" $exec_output ] } {
 	pass $testname
     } {
 	fail $testname
@@ -311,13 +331,15 @@ if {![string match "" $catch_output]} {
     return
 }
 
-# Check expected LTO linker errors.
-set testname "PR ld/12942 (3)"
-set exec_output [run_host_cmd "$CXX" "$gcc_gas_flag $gcc_ld_flag -O2 -flto -fuse-linker-plugin tmpdir/pr12942b.o tmpdir/pr12942a.o"]
-if { [ regexp "pr12942a.h:7: undefined reference to `link_error\\(\\)'" $exec_output ] } {
-    pass $testname
-} {
-    fail $testname
+if { [at_least_gcc_version 4 7] } {
+    # Check expected LTO linker errors.
+    set testname "PR ld/12942 (3)"
+    set exec_output [run_host_cmd "$CXX" "$gcc_gas_flag $gcc_ld_flag -O2 -flto -fuse-linker-plugin tmpdir/pr12942b.o tmpdir/pr12942a.o"]
+    if { [ regexp "undefined reference to `link_error\\(\\)'" $exec_output ] } {
+        pass $testname
+    } {
+        fail $testname
+    }
 }
 
 # Run "ld -r" to generate inputs for complex LTO tests.