From b92058573b4b26ad0700c73d0ba33a796556e7fa Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Thu, 8 Jan 2015 08:32:06 -0800 Subject: Add -Wno-trampolines as needed --- ChangeLog | 6 ++++++ elf/Makefile | 2 ++ nptl/Makefile | 1 + 3 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 71c8298215..a979d86d61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-01-08 Richard Henderson + + * 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 Sandra Loosemore Andrew Jenner 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) -- cgit 1.4.1