From: Richard Henderson <rth@twiddle.net>
Date: Thu, 8 Jan 2015 16:32:06 +0000 (-0800)
Subject: Add -Wno-trampolines as needed
X-Git-Tag: glibc-2.21~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b92058573b4b26ad0700c73d0ba33a796556e7fa;p=thirdparty%2Fglibc.git

Add -Wno-trampolines as needed
---

diff --git a/ChangeLog b/ChangeLog
index 71c82982158..a979d86d612 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>
diff --git a/elf/Makefile b/elf/Makefile
index 11d6865baf4..e5b142c7c67 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-trampolines
+CFLAGS-tst-execstack-mod.c += -Wno-trampolines
 endif
 
 LDFLAGS-tst-array2 = $(no-as-needed)
diff --git a/nptl/Makefile b/nptl/Makefile
index 86c44b2b9b3..ce2d0e4ddd8 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-trampolines
 
 $(objpfx)tst-fini1mod.so: $(shared-thread-library)