This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Fix spurious failures in ld-plugin/lto.exp


Fix a few spurious failures in ld-plugin/lto.exp:

- Remove -D_FORTIFY_SOURCE also without -Wp, prefix
- Make sure to use CXXFLAGS for C++ tests, since CFLAGS may contain
  flags not suitable for C++

Andreas.

	* 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/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
index 53543a6..1a525fc 100644
--- 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"}
-- 
1.9.1

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]