1 files changed, 6 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]