aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Alcock <nick.alcock@oracle.com>2016-12-26 10:09:00 +0100
committerFlorian Weimer <fweimer@redhat.com>2016-12-26 10:11:05 +0100
commit7cbb738d218fad3bc91deebfd8ce5f3918592b84 (patch)
tree792a6637fe557c32a8ec784e044c891aab96e91e
parent524a8ef2ad76af8ac049293d993a1856b0d888fb (diff)
downloadglibc-7cbb738d218fad3bc91deebfd8ce5f3918592b84.tar
glibc-7cbb738d218fad3bc91deebfd8ce5f3918592b84.tar.gz
glibc-7cbb738d218fad3bc91deebfd8ce5f3918592b84.tar.bz2
glibc-7cbb738d218fad3bc91deebfd8ce5f3918592b84.zip
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.
-rw-r--r--ChangeLog6
-rw-r--r--elf/Makefile3
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 10d5a37718..918c6f97c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
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 04d5f0721c..8a2ce02cd5 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