@@ -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]
@@ -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)
@@ -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)