|
@@ -96,15 +96,13 @@ extern void _start(void);
|
|
|
|
|
|
#ifdef __UCLIBC_HAS_SSP__
|
|
|
# include <dl-osinfo.h>
|
|
|
-uintptr_t stack_chk_guard;
|
|
|
+static uintptr_t stack_chk_guard;
|
|
|
# ifndef THREAD_SET_STACK_GUARD
|
|
|
/* Only exported for architectures that don't store the stack guard canary
|
|
|
* in local thread area. */
|
|
|
uintptr_t __stack_chk_guard attribute_relro;
|
|
|
-# ifdef __UCLIBC_HAS_SSP_COMPAT__
|
|
|
-strong_alias(__stack_chk_guard,__guard)
|
|
|
-# endif
|
|
|
-# elif defined __UCLIBC_HAS_SSP_COMPAT__
|
|
|
+# endif
|
|
|
+# ifdef __UCLIBC_HAS_SSP_COMPAT__
|
|
|
uintptr_t __guard attribute_relro;
|
|
|
# endif
|
|
|
#endif
|
|
@@ -344,12 +342,12 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
|
|
|
stack_chk_guard = _dl_setup_stack_chk_guard ();
|
|
|
# ifdef THREAD_SET_STACK_GUARD
|
|
|
THREAD_SET_STACK_GUARD (stack_chk_guard);
|
|
|
-# ifdef __UCLIBC_HAS_SSP_COMPAT__
|
|
|
- __guard = stack_chk_guard;
|
|
|
-# endif
|
|
|
# else
|
|
|
__stack_chk_guard = stack_chk_guard;
|
|
|
# endif
|
|
|
+# ifdef __UCLIBC_HAS_SSP_COMPAT__
|
|
|
+ __guard = stack_chk_guard;
|
|
|
+# endif
|
|
|
#endif
|
|
|
|
|
|
/* At this point we are now free to examine the user application,
|