Remove __environ definition.

diff --git a/sysdeps/mach/start.c b/sysdeps/mach/start.c
index 26abc23..c2ea3e3 100644 (file)
--- a/sysdeps/mach/start.c
+++ b/sysdeps/mach/start.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1993, 1994, 1995 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
@@ -31,11 +31,6 @@ int __data_start = 0;
 
 volatile int errno;
 
-#ifndef        HAVE_GNU_LD
-#define        __environ       environ
-#endif
-char **__environ;
-
 extern void __mach_init (void);
 extern void __libc_init (int argc, char **argv, char **envp);
 extern int main (int argc, char **argv, char **envp);

diff --git a/sysdeps/stub/start.c b/sysdeps/stub/start.c
index b8bb04b..9d41201 100644 (file)
--- a/sysdeps/stub/start.c
+++ b/sysdeps/stub/start.c
@@ -6,11 +6,10 @@
    This file should be prepared to be the first thing in the text section (on
    Unix systems), or otherwise appropriately special.  */
 
-volatile int errno;
-
-#ifndef HAVE_GNU_LD
-#undef environ
-#define __environ environ
+/* The first piece of initialized data.  */
+int __data_start = 0;
+#ifdef HAVE_WEAK_SYMBOLS
+weak_alias (__data_start, data_start)
 #endif
 
-char **__environ;
+volatile int errno;