From 86d7dae85bcea17c5eb01a6f2416c7dde4dc7266 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 27 Nov 2009 16:12:43 +0000 Subject: define local stack_chk_guard for nptl Signed-off-by: Natanael Copa Signed-off-by: Austin Foxley --- libc/misc/internals/__uClibc_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c index 85dbe7123..cb2c6ed14 100644 --- a/libc/misc/internals/__uClibc_main.c +++ b/libc/misc/internals/__uClibc_main.c @@ -203,10 +203,11 @@ void __uClibc_init(void) #ifndef SHARED # ifdef __UCLIBC_HAS_SSP__ /* Set up the stack checker's canary. */ - stack_chk_guard = _dl_setup_stack_chk_guard(); # ifdef THREAD_SET_STACK_GUARD + uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard(); THREAD_SET_STACK_GUARD (stack_chk_guard); # ifdef __UCLIBC_HAS_SSP_COMPAT__ + stack_chk_guard = _dl_setup_stack_chk_guard(); __guard = stack_chk_guard; # endif # else -- cgit v1.2.3