diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-09-12 16:26:54 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-09-12 16:26:54 +0000 |
| commit | 83584a7af898dd93c48600fe850d150c51b10899 (patch) | |
| tree | 0affa8ffee374ab83e40501d8d8967a03569c44d /libc/csu | |
| parent | 04b4d23592609edcd19fd5a461bbe6d3cc677b5b (diff) | |
Merge changes between r2424 and r3467 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@3468 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/csu')
| -rw-r--r-- | libc/csu/libc-start.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libc/csu/libc-start.c b/libc/csu/libc-start.c index 0ed993651..a14ed7161 100644 --- a/libc/csu/libc-start.c +++ b/libc/csu/libc-start.c @@ -138,16 +138,14 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), functions are using thread functions if these are available and we need to setup errno. */ __pthread_initialize_minimal (); -#endif -# ifndef SHARED /* Set up the stack checker's canary. */ uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard (); -# ifdef THREAD_SET_STACK_GUARD +# ifdef THREAD_SET_STACK_GUARD THREAD_SET_STACK_GUARD (stack_chk_guard); -# else +# else __stack_chk_guard = stack_chk_guard; -# endif +# endif #endif /* Register the destructor of the dynamic linker if there is any. */ |