diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-08-14 07:38:41 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-08-14 07:38:41 +0000 |
| commit | c67c02731b6507c5351bca70451441d9a26113ef (patch) | |
| tree | afe8d99e55401fe7955475ab97a497cae2e23ab2 /csu | |
| parent | 39762d6a5c0e378f20b28da7450868bfef588fb0 (diff) | |
Updated to fedora-glibc-20070814T0725cvs/fedora-glibc-2_6_90-9
Diffstat (limited to 'csu')
| -rw-r--r-- | csu/libc-start.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/csu/libc-start.c b/csu/libc-start.c index 0ed993651e..d3eadeb704 100644 --- a/csu/libc-start.c +++ b/csu/libc-start.c @@ -138,16 +138,18 @@ 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 + +#ifdef VDSO_SETUP + VDSO_SETUP (); #endif /* Register the destructor of the dynamic linker if there is any. */ |