diff options
| author | Roland McGrath <roland@gnu.org> | 2005-02-16 12:31:10 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-02-16 12:31:10 +0000 |
| commit | 833861be818bb5d45ab0c47370b84068dfb2fedf (patch) | |
| tree | 2f1754a415c378f6b067f9158cc42df24d4641d2 /csu | |
| parent | c397a0064061e28a00eea873669e59f3983db791 (diff) | |
import later fedora-branch tweaks
Diffstat (limited to 'csu')
| -rw-r--r-- | csu/Makefile | 4 | ||||
| -rw-r--r-- | csu/elf-init.c | 7 | ||||
| -rw-r--r-- | csu/version.c | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/csu/Makefile b/csu/Makefile index 20709c3c8d..fbbfe0050a 100644 --- a/csu/Makefile +++ b/csu/Makefile @@ -1,5 +1,5 @@ # Makefile for csu code for GNU C library. -# Copyright (C) 1995-2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1995-2003, 2004 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 @@ -54,13 +54,11 @@ include ../Makeconfig ifeq (yes,$(build-shared)) extra-objs += S$(start-installed-name) install-lib += S$(start-installed-name) -generated += start.os endif ifeq (yes,$(build-bounded)) extra-objs += b$(start-installed-name) install-lib += b$(start-installed-name) -generated += start.ob endif ifneq ($(start-installed-name),$(static-start-installed-name)) diff --git a/csu/elf-init.c b/csu/elf-init.c index dbd2a91cb7..c538627dfd 100644 --- a/csu/elf-init.c +++ b/csu/elf-init.c @@ -1,5 +1,5 @@ /* Startup support for ELF initializers/finalizers in the main executable. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003 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 @@ -104,13 +104,9 @@ __libc_csu_init (void) #endif } -/* This function should not be used anymore. We run the executable's - destructor now just like any other. We cannot remove the function, - though. */ void __libc_csu_fini (void) { -#if 0 #ifdef HAVE_INITFINI_ARRAY size_t i = __fini_array_end - __fini_array_start; while (i-- > 0) @@ -118,5 +114,4 @@ __libc_csu_fini (void) #endif _fini (); -#endif } diff --git a/csu/version.c b/csu/version.c index 606246a6e1..1104fa9137 100644 --- a/csu/version.c +++ b/csu/version.c @@ -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) 2005 Free Software Foundation, Inc.\n\ +Copyright (C) 2004 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\ |