diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-02-05 17:59:45 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-02-05 17:59:45 +0000 |
| commit | fbeabbdc554f256444af02146bec6b76541c75a8 (patch) | |
| tree | 1b92c9867abb92a68a34073eda060e66750f032c /libc/csu | |
| parent | 1e1eaa2d6be863fbfa1526a0b42e7fb0f1b042e0 (diff) | |
Merge changes between r1192 and r1382 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@1383 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/csu')
| -rw-r--r-- | libc/csu/libc-start.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libc/csu/libc-start.c b/libc/csu/libc-start.c index 634844759..0ed993651 100644 --- a/libc/csu/libc-start.c +++ b/libc/csu/libc-start.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2003, 2004, 2005, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1998-2006, 2007 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 @@ -225,7 +225,7 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), { /* Remove the thread-local data. */ # ifdef SHARED - __libc_pthread_functions.ptr__nptl_deallocate_tsd (); + PTHFCT_CALL (ptr__nptl_deallocate_tsd, ()); # else extern void __nptl_deallocate_tsd (void) __attribute ((weak)); __nptl_deallocate_tsd (); @@ -235,7 +235,8 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), terminate the entire process. */ result = 0; # ifdef SHARED - unsigned int *const ptr = __libc_pthread_functions.ptr_nthreads; + unsigned int *ptr = __libc_pthread_functions.ptr_nthreads; + PTR_DEMANGLE (ptr); # else extern unsigned int __nptl_nthreads __attribute ((weak)); unsigned int *const ptr = &__nptl_nthreads; |