diff options
author | Richard Henderson <rth@twiddle.net> | 2015-01-03 12:49:41 -0800 |
---|---|---|
committer | Richard Henderson <rth@twiddle.net> | 2015-01-03 12:49:41 -0800 |
commit | 8b05db5421535e7f99d55afd49b0bce29e41ef03 (patch) | |
tree | 520f328b1ad1543ffbe58b57fc34594a657e8772 | |
parent | b93c2205ec57af3c0491cdb608b53a9b4d7ff57e (diff) | |
download | glibc-rth/tramp.tar.gz glibc-rth/tramp.tar.xz glibc-rth/tramp.zip |
Use -Wno-error=trampolines rth/tramp
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.
-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) |