Use -Wno-error=trampolines

With gcc 4.9 we see

tst-execstack-mod.c: In function ‘tryme’:
tst-execstack-mod.c:16:8: error: trampoline generated for nested function ‘callback’ [-Werror=trampolines]
   void callback (void) { ok = true; }
           ^
	   cc1: all warnings being treated as errors

where of course the testcases require the use of trampolines.

diff --git a/ChangeLog b/ChangeLog
index 1b08fb4a10c1cb963af38f284560856e73483178..79391085ad302bf319a362441abbce6f10fec3ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-03  Richard Henderson  <rth@redhat.com>
+
+       * elf/Makefile (CFLAGS-tst-execstack-mod.c): Add -Wno-error=trapolines
+       (CFLAGS-tst-execstack-prog.c): Likewise.
+       * nptl/Makefile (CFLAGS-tst-execstack-mod.c): Likewise.
+
 2015-01-02  Joseph Myers  <joseph@codesourcery.com>
 
        [BZ #17748]

diff --git a/elf/Makefile b/elf/Makefile
index 11d6865baf4e6a48d8b203b13f30fa6ecac9abf1..09ab68de33e1b6e209b48270c47844d3dbc74bd6 100644 (file)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -861,6 +861,8 @@ $(objpfx)tst-execstack-needed: $(objpfx)tst-execstack-mod.so
 LDFLAGS-tst-execstack-needed = -Wl,-z,noexecstack
 
 LDFLAGS-tst-execstack-prog = -Wl,-z,execstack
+CFLAGS-tst-execstack-prog.c += -Wno-error=trampolines
+CFLAGS-tst-execstack-mod.c += -Wno-error=trampolines
 endif
 
 LDFLAGS-tst-array2 = $(no-as-needed)

diff --git a/nptl/Makefile b/nptl/Makefile
index 86c44b2b9b3a5c56da0cd28a6e778b135067ad34..dbb2d869f7acabc8aa12e12360ca934176db2f4c 100644 (file)
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -619,6 +619,7 @@ tst-exec4-ARGS = $(host-test-program-cmd)
 $(objpfx)tst-execstack: $(libdl)
 $(objpfx)tst-execstack.out: $(objpfx)tst-execstack-mod.so
 LDFLAGS-tst-execstack = -Wl,-z,noexecstack
+CFLAGS-tst-execstack-mod.c += -Wno-error=trampolines
 
 $(objpfx)tst-fini1mod.so: $(shared-thread-library)