about summary refs log tree commit diff
path: root/debug
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2018-07-05 19:28:11 +0200
committerFlorian Weimer <fweimer@redhat.com>2018-07-05 19:28:35 +0200
commit38cade0c461e58770749d7e8973f85c79532838a (patch)
tree0773d75774ff2e716f6578e5ec11c8fe9c91385a /debug
parent9449a295ad7e30f3a787421cb22aaa475f950549 (diff)
downloadglibc-38cade0c461e58770749d7e8973f85c79532838a.tar.gz
glibc-38cade0c461e58770749d7e8973f85c79532838a.tar.xz
glibc-38cade0c461e58770749d7e8973f85c79532838a.zip
Compile debug/stack_chk_fail_local.c with stack protector
The resulting object file is statically linked into applications, so
it is desirable to have (formal) stack protector coverage there.
Diffstat (limited to 'debug')
-rw-r--r--debug/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/debug/Makefile b/debug/Makefile
index c6f6feb0ec..506cebc3c4 100644
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -58,10 +58,13 @@ static-only-routines := warning-nop stack_chk_fail_local
 elide-routines.o := stack_chk_fail_local
 
 # Building the stack-protector failure routines with stack protection
-# makes no sense.
+# is not required since we have already failed a stack check and are
+# exiting the process.  However, the local aliases which jump to the
+# real routines should still be compiled with stack protection
+# (stack_chk_fail_local.c), so that the statically linked parts of the
+# library have the expected flags.
 
 CFLAGS-stack_chk_fail.c += $(no-stack-protector)
-CFLAGS-stack_chk_fail_local.c += $(no-stack-protector)
 
 CFLAGS-backtrace.c += -fno-omit-frame-pointer -funwind-tables
 CFLAGS-sprintf_chk.c += $(libio-mtsafe)