From 7cbb738d218fad3bc91deebfd8ce5f3918592b84 Mon Sep 17 00:00:00 2001
From: Nick Alcock <nick.alcock@oracle.com>
Date: Mon, 26 Dec 2016 10:09:00 +0100
Subject: [PATCH] Link a non-libc-using test with -fno-stack-protector [BZ
 #7065]

This test cannot reference __stack_chk_fail because it is not linked
with libc at all.
---
 ChangeLog    | 6 ++++++
 elf/Makefile | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 10d5a377183..918c6f97c67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-26  Nick Alcock  <nick.alcock@oracle.com>
+
+	[BZ #7065]
+	* elf/Makefile (CFLAGS-filtmod1.c): Use $(no-stack-protector) for
+	non-libc-linking testcase.
+
 2016-12-26  Nick Alcock  <nick.alcock@oracle.com>
 	    Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 	    Florian Weimer  <fweimer@redhat.com>
diff --git a/elf/Makefile b/elf/Makefile
index 04d5f0721c5..8a2ce02cd50 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -792,6 +792,9 @@ $(objpfx)filtmod1.so: $(objpfx)filtmod1.os $(objpfx)filtmod2.so
 		  $< -Wl,-F,$(objpfx)filtmod2.so
 $(objpfx)filter: $(objpfx)filtmod1.so
 
+# This does not link against libc.
+CFLAGS-filtmod1.c = $(no-stack-protector)
+
 $(objpfx)unload: $(libdl)
 $(objpfx)unload.out: $(objpfx)unloadmod.so
 
-- 
2.47.2