diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | elf/Makefile | 2 | ||||
| -rw-r--r-- | nptl/Makefile | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 1b08fb4a10..79391085ad 100644 --- 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 11d6865baf..09ab68de33 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-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 86c44b2b9b..dbb2d869f7 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-error=trampolines $(objpfx)tst-fini1mod.so: $(shared-thread-library) |