Fix spurious failures in ld-plugin/lto.exp

* ld-plugin/lto.exp: Make "-Wp," prefix optional when filtering
out _FORTIFY_SOURCE.
("Build libdummy.a 9", "PR ld/12696"): Mark as c++.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 4d0fe20f0c506267d186061a7f54a181917c5f50..cbc12f62fa093975fb0f683bda68a0e5528ff700 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-05  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * ld-plugin/lto.exp: Make "-Wp," prefix optional when filtering
+       out _FORTIFY_SOURCE.
+       ("Build libdummy.a 9", "PR ld/12696"): Mark as c++.
+
 2014-04-04  Alan Modra  <amodra@gmail.com>
 
        * ld-scripts/fill.d, * ld-scripts/fill.t, * ld-scripts/fill_0.s,

diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
index 53543a6f253bf4979eaf3dd1ba3c32555fc86f72..1a525fce8e11b1dfc73ddd289c45069c56886e49 100644 (file)
--- a/ld/testsuite/ld-plugin/lto.exp
+++ b/ld/testsuite/ld-plugin/lto.exp
@@ -28,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
@@ -69,7 +69,7 @@ set lto_link_tests {
    {lto-6.c} {} "lto-6.exe" "c"}
   {"Build libdummy.a 9"
    "" "-O2 -finline -flto"
-   {lto-9.cc} {} "libdummy.a"}
+   {lto-9.cc} {} "libdummy.a" "c++"}
   {"Build libdummy.a 11a"
    "" "-O -flto"
    {lto-11a.c} {} "libdummy.a"}
@@ -105,7 +105,7 @@ set lto_link_tests {
    {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"}
+   {pr12696-1.cc} {} "pr12696-1r.o" "c++"}
   {"Build libdummy.a PR ld/12758"
    "" ""
    {pr12758a.s} {} "libdummy.a"}