diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-01-17 10:42:43 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-01-17 10:42:43 +0000 |
| commit | af98d46f5a025ae33c60ddb1a5edc753fb714bc5 (patch) | |
| tree | 24a3c5cb0bfc6163b52ae74ac205f0e175beee87 /csu | |
| parent | 1f09da09fed864c91288ff91295114fa5202edaa (diff) | |
Updated to fedora-glibc-20070117T0857
Diffstat (limited to 'csu')
| -rw-r--r-- | csu/libc-start.c | 7 | ||||
| -rw-r--r-- | csu/version.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/csu/libc-start.c b/csu/libc-start.c index 634844759d..0ed993651e 100644 --- a/csu/libc-start.c +++ b/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; diff --git a/csu/version.c b/csu/version.c index 1b98c4a7e9..f7a8fb35e9 100644 --- a/csu/version.c +++ b/csu/version.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-2002, 2003, 2004, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1992-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 @@ -25,7 +25,7 @@ static const char __libc_version[] = VERSION; static const char banner[] = "GNU C Library "RELEASE" release version "VERSION", by Roland McGrath et al.\n\ -Copyright (C) 2006 Free Software Foundation, Inc.\n\ +Copyright (C) 2007 Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions.\n\ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\ PARTICULAR PURPOSE.\n\ |