summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-01-04 07:11:05 +0000
committerUlrich Drepper <drepper@redhat.com>2005-01-04 07:11:05 +0000
commit3fb2606af3b1ab6e6bef7065c65eaca197d73a89 (patch)
tree6b5d86899fb2085d5a529de11242ef9ac0b0e09d
parentd410d5dc00490030ae22198f113c4709966cd2e0 (diff)
downloadglibc-3fb2606af3b1ab6e6bef7065c65eaca197d73a89.tar.gz
Update.
* sysdeps/generic/libc-start.c [SHARED] (__libc_start_main): Don't initialize __environ again.
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/generic/libc-start.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 49fee27fe4..8b94978ae1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2005-01-03 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/generic/libc-start.c [SHARED] (__libc_start_main): Don't
+ initialize __environ again.
+
* sysdeps/unix/sysv/linux/init-first.c: Clean file up. Don't
define unnecessary wrappers or aliases of static functions.
diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c
index fc9df40996..ad5ebe0911 100644
--- a/sysdeps/generic/libc-start.c
+++ b/sysdeps/generic/libc-start.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998-2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1998-2003, 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
@@ -106,9 +106,9 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
__libc_multiple_libcs = &_dl_starting_up && !_dl_starting_up;
+#ifndef SHARED
INIT_ARGV_and_ENVIRON;
-#ifndef SHARED
/* Store the lowest stack address. This is done in ld.so if this is
the code for the DSO. */
__libc_stack_end = stack_end;