Update.

* sysdeps/generic/libc-start.c [SHARED] (__libc_start_main): Don't initialize __environ again.
git-mirror · Jan 4, 2005 · 3fb2606 · 3fb2606
1 parent d410d5d
commit 3fb2606
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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;