9 files changed, 11 insertions, 42 deletions
diff --git a/sysdeps/mach/hurd/start.c b/sysdeps/mach/hurd/start.c
index 91be7eaefe..10d6e72228 100644
--- a/sysdeps/mach/hurd/start.c
+++ b/sysdeps/mach/hurd/start.c
@@ -46,9 +46,6 @@ unsigned long int *__hurd_sigthread_variables;
 vm_address_t _hurd_stack_base;
 vm_size_t _hurd_stack_size;
 
-char **__environ;
-weak_alias (__environ, environ)
-
 /* Things that want to be run before _hurd_init or much anything else.
    Importantly, these are called before anything tries to use malloc.  */
 DEFINE_HOOK (_hurd_preinit_hook, (void));
diff --git a/sysdeps/mach/start.c b/sysdeps/mach/start.c
index 26abc23f53..c2ea3e3b7b 100644
--- 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 b8bb04bbb4..9d412011f9 100644
--- 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;
diff --git a/sysdeps/unix/make_errlist.c b/sysdeps/unix/make_errlist.c
index 40b4f820c0..705dcfe88a 100644
--- a/sysdeps/unix/make_errlist.c
+++ b/sysdeps/unix/make_errlist.c
@@ -31,7 +31,7 @@ main ()
   puts ("#include \"ansidecl.h\"\n#include <stddef.h>\n");
   puts ("\n/* This is a list of all known `errno' codes.  */\n");
 
-  puts ("#ifndef HAVE_GNU_LD");
+  puts ("#ifndef HAVE_WEAK_SYMBOLS");
   puts ("#define _sys_nerr\tsys_nerr");
   puts ("#define _sys_errlist\tsys_errlist");
   puts ("#endif");
diff --git a/sysdeps/unix/sparc/start.c b/sysdeps/unix/sparc/start.c
index e0f39f5b73..f8567d2103 100644
--- a/sysdeps/unix/sparc/start.c
+++ b/sysdeps/unix/sparc/start.c
@@ -42,15 +42,6 @@ weak_alias (__data_start, data_start)
 
 VOLATILE int errno;
 
-#ifdef	HAVE_WEAK_SYMBOLS
-weak_alias (__environ, environ)
-#else
-#undef	environ
-#define	__environ	environ
-#endif
-
-char **__environ;
-
 extern void EXFUN(__libc_init, (int argc, char **argv, char **envp));
 extern int EXFUN(main, (int argc, char **argv, char **envp));
 
diff --git a/sysdeps/unix/start.c b/sysdeps/unix/start.c
index da7ec71ffb..feb5f44fb8 100644
--- a/sysdeps/unix/start.c
+++ b/sysdeps/unix/start.c
@@ -37,15 +37,11 @@ weak_alias (__data_start, data_start)
 
 VOLATILE int errno;
 
-#ifdef	HAVE_WEAK_SYMBOLS
-weak_alias (__environ, environ)
-#else
+#ifndef	HAVE_WEAK_SYMBOLS
 #undef	environ
 #define	__environ	environ
 #endif
 
-char **__environ;
-
 extern void EXFUN(__libc_init, (int argc, char **argv, char **envp));
 extern int EXFUN(main, (int argc, char **argv, char **envp));
 
diff --git a/sysdeps/unix/sysv/irix4/start.c b/sysdeps/unix/sysv/irix4/start.c
index 4382e6f855..cd86f85244 100644
--- a/sysdeps/unix/sysv/irix4/start.c
+++ b/sysdeps/unix/sysv/irix4/start.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 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
@@ -30,13 +30,6 @@ int __data_start = 0;
 
 VOLATILE int errno = 0;
 
-#ifndef	HAVE_GNU_LD
-#undef	environ
-#define	__environ	environ
-#endif
-
-char **__environ;
-
 extern void EXFUN(__libc_init, (int argc, char **argv, char **envp));
 extern int EXFUN(main, (int argc, char **argv, char **envp));
 
diff --git a/sysdeps/unix/sysv/sysv4/dup2.c b/sysdeps/unix/sysv/sysv4/dup2.c
index c7015fce7e..7d36e0e352 100644
--- a/sysdeps/unix/sysv/sysv4/dup2.c
+++ b/sysdeps/unix/sysv/sysv4/dup2.c
@@ -1,4 +1,2 @@
 /* SVR4 uses the POSIX dup2.  */
-#include <sysdeps/posix/__dup2.c>
-
-weak_alias (__dup2, dup2)
+#include <sysdeps/posix/dup2.c>
diff --git a/sysdeps/unix/sysv/sysv4/sigaltstack.S b/sysdeps/unix/sysv/sysv4/sigaltstack.S
index e7e4060fba..f7cf0d57f4 100644
--- a/sysdeps/unix/sysv/sysv4/sigaltstack.S
+++ b/sysdeps/unix/sysv/sysv4/sigaltstack.S
@@ -1,2 +1,2 @@
 /* SVR4 uses the BSD 4.4 sigaltstack syscall.  */
-#include <sysdeps/unix/bsd/bsd4.4/sigaltstk.S>
+#include <sysdeps/unix/bsd/bsd4.4/sigaltstack.S>