aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--elf/Makefile2
-rw-r--r--nptl/Makefile1
3 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 71c8298215..a979d86d61 100644
--- 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 11d6865baf..e5b142c7c6 100644
--- 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 86c44b2b9b..ce2d0e4ddd 100644
--- 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)