summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <natanael.copa@gmail.com>2009-11-27 16:12:43 +0000
committerAustin Foxley <austinf@cetoncorp.com>2009-11-27 10:02:22 -0800
commit86d7dae85bcea17c5eb01a6f2416c7dde4dc7266 (patch)
tree85a29ce088297f98f1f0f6c4bde7984253c039f7
parent9ec568d46da86768787782a83e3351f350970d6e (diff)
define local stack_chk_guard for nptl
Signed-off-by: Natanael Copa <natanael.copa@gmail.com> Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
-rw-r--r--libc/misc/internals/__uClibc_main.c3
1 files changed, 2 insertions, 1 deletions
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