Add -Wno-trampolines as needed

diff --git a/ChangeLog b/ChangeLog
index 71c8298..a979d86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-08  Richard Henderson  <rth@redhat.com>
+
+       * elf/Makefile (CFLAGS-tst-execstack-mod.c): Add -Wno-trampolines
+       (CFLAGS-tst-execstack-prog.c): Likewise.
+       * nptl/Makefile (CFLAGS-tst-execstack-mod.c): Likewise.
+
 2015-01-08  Chung-Lin Tang  <cltang@codesourcery.com>
            Sandra Loosemore  <sandra@codesourcery.com>
            Andrew Jenner  <andrew@codesourcery.com>

diff --git a/elf/Makefile b/elf/Makefile
index 11d6865..e5b142c 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-trampolines
+CFLAGS-tst-execstack-mod.c += -Wno-trampolines
 endif
 
 LDFLAGS-tst-array2 = $(no-as-needed)

diff --git a/nptl/Makefile b/nptl/Makefile
index 86c44b2..ce2d0e4 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-trampolines
 
 $(objpfx)tst-fini1mod.so: $(shared-thread-library)