diff options
author | Jakub Jelinek <jakub@redhat.com> | 2006-10-29 22:03:29 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2006-10-29 22:03:29 +0000 |
commit | 8dd5fcaca8ce7e43ed49879235f08d45d2a4a2e5 (patch) | |
tree | 196eec145dc3a6fb925a5b07d831b21d761d7c20 /csu/libc-start.c | |
parent | 48b752c9f6499f0de89766c94b3b1bedbfd6476e (diff) |
Updated to fedora-glibc-20061029T2155cvs/fedora-glibc-2_5_90-3
Diffstat (limited to 'csu/libc-start.c')
-rw-r--r-- | csu/libc-start.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/csu/libc-start.c b/csu/libc-start.c index 194db6b1ec..634844759d 100644 --- a/csu/libc-start.c +++ b/csu/libc-start.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2003, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1998-2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -30,11 +30,7 @@ extern int __libc_multiple_libcs; #include <tls.h> #ifndef SHARED # include <dl-osinfo.h> -extern void __pthread_initialize_minimal (void) -# if !(USE_TLS - 0) && !defined NONTLS_INIT_TP - __attribute__ ((weak)) -# endif - ; +extern void __pthread_initialize_minimal (void); # ifndef THREAD_SET_STACK_GUARD /* Only exported for architectures that don't store the stack guard canary in thread local area. */ @@ -140,13 +136,8 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), /* Initialize the thread library at least a bit since the libgcc functions are using thread functions if these are available and - we need to setup errno. If there is no thread library and we - handle TLS the function is defined in the libc to initialized the - TLS handling. */ -# if !(USE_TLS - 0) && !defined NONTLS_INIT_TP - if (__pthread_initialize_minimal) -# endif - __pthread_initialize_minimal (); + we need to setup errno. */ + __pthread_initialize_minimal (); #endif # ifndef SHARED |