aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-01-04 06:43:50 +0000
committerUlrich Drepper <drepper@redhat.com>2005-01-04 06:43:50 +0000
commit9a6bed32d0e43dee3d2afe97bcae505e339cf54d (patch)
treea4103ba27574ac7a0683343af0b3c78e3efb2192
parenta1194e831a38a7a2e4ff8a758b89b45fe5831d78 (diff)
downloadglibc-9a6bed32d0e43dee3d2afe97bcae505e339cf54d.zip
glibc-9a6bed32d0e43dee3d2afe97bcae505e339cf54d.tar.gz
glibc-9a6bed32d0e43dee3d2afe97bcae505e339cf54d.tar.bz2
Clean file up. Don't define unnecessary wrappers or aliases of static functions.
-rw-r--r--sysdeps/unix/sysv/linux/init-first.c40
1 files changed, 13 insertions, 27 deletions
diff --git a/sysdeps/unix/sysv/linux/init-first.c b/sysdeps/unix/sysv/linux/init-first.c
index f002712..7f0b963 100644
--- a/sysdeps/unix/sysv/linux/init-first.c
+++ b/sysdeps/unix/sysv/linux/init-first.c
@@ -1,5 +1,5 @@
/* Initialization code run first thing by the ELF startup code. Linux version.
- Copyright (C) 1995-1999,2000,01,02,03,2004 Free Software Foundation, Inc.
+ Copyright (C) 1995-2004, 2005 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
@@ -29,9 +29,6 @@
#include <ldsodefs.h>
-/* The function is called from assembly stubs the compiler can't see. */
-static void init (int, char **, char **) __attribute__ ((used));
-
/* Set nonzero if we have to be prepared for more then one libc being
used in the process. Safe assumption if initializer never runs. */
int __libc_multiple_libcs attribute_hidden = 1;
@@ -42,9 +39,19 @@ int __libc_argc attribute_hidden;
char **__libc_argv attribute_hidden;
-static void
-init (int argc, char **argv, char **envp)
+void
+attribute_hidden
+__libc_init_first (int argc, char **argv, char **envp)
+{
+#ifdef SHARED
+ /* For DSOs we do not need __libc_init_first but instead _init. */
+}
+
+void
+attribute_hidden
+_init (int argc, char **argv, char **envp)
{
+#endif
#ifdef USE_NONOPTION_FLAGS
extern void __getopt_clean_environment (char **);
#endif
@@ -88,27 +95,6 @@ init (int argc, char **argv, char **envp)
#endif
}
-#ifdef SHARED
-
-strong_alias (init, _init);
-
-extern void __libc_init_first (void);
-
-void
-__libc_init_first (void)
-{
-}
-
-#else
-extern void __libc_init_first (int argc, char **argv, char **envp);
-
-void
-__libc_init_first (int argc, char **argv, char **envp)
-{
- init (argc, argv, envp);
-}
-#endif
-
/* This function is defined here so that if this file ever gets into
ld.so we will get a link error. Having this file silently included