diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | debug/Makefile | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index d134e1f29d..3bfd61a44a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2018-07-05 Florian Weimer <fweimer@redhat.com> + Carlos O'Donell <carlos@redhat.com> + + * debug/Makefile (CFLAGS-stack_chk_fail_local.c): Remove + $(no-stack-protector). stack_chk_fail_local.c can be compiled + with stack protector enabled because there is no risk of infinite + recursion. + 2018-07-05 Maciej W. Rozycki <macro@mips.com> [BZ #19818] 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) |