From 17c34b8f3d79369cfb3a3f9d37109a7051bd8ea4 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sat, 5 Apr 2014 22:03:44 +0200 Subject: [PATCH] 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++. --- ld/testsuite/ChangeLog | 6 ++++++ ld/testsuite/ld-plugin/lto.exp | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 4d0fe20f0c5..cbc12f62fa0 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-04-05 Andreas Schwab + + * 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 * 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 53543a6f253..1a525fce8e1 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"} -- 2.30.2