1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 71c8298215..a979d86d61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-08  Richard Henderson  <rth@redhat.com>
+
+	* 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  <cltang@codesourcery.com>
 	    Sandra Loosemore  <sandra@codesourcery.com>
 	    Andrew Jenner  <andrew@codesourcery.com>