From 3d3436ae68a907f656a07604eb7e10a50e1c8f85 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@hack.frob.com>
Date: Thu, 28 Mar 2013 15:33:57 -0700
Subject: [PATCH] Consolidate declarations of _dl_phdr, _dl_phnum.

---
 ChangeLog                           | 6 ++++++
 csu/libc-tls.c                      | 4 ----
 elf/dl-iteratephdr.c                | 4 ----
 sysdeps/generic/ldsodefs.h          | 6 ++++++
 sysdeps/mach/hurd/i386/init-first.c | 4 ----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f21bf51e1f..2689884951 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2013-03-28  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/generic/ldsodefs.h [!SHARED] (_dl_phdr, _dl_phnum):
+	Declare them here.
+	* elf/dl-iteratephdr.c [!SHARED] (_dl_phdr, _dl_phnum): Not here.
+	* csu/libc-tls.c: Nor here.
+	* sysdeps/mach/hurd/i386/init-first.c (init1): Nor here.
+
 	* sysdeps/posix/libc_fatal.c: Don't include <sys/syslog.h>.
 	(__libc_message): Never call vsyslog.
 
diff --git a/csu/libc-tls.c b/csu/libc-tls.c
index 5fa39eb8d1..2a195019cc 100644
--- a/csu/libc-tls.c
+++ b/csu/libc-tls.c
@@ -28,10 +28,6 @@
  #error makefile bug, this file is for static only
 #endif
 
-extern ElfW(Phdr) *_dl_phdr;
-extern size_t _dl_phnum;
-
-
 dtv_t _dl_static_dtv[2 + TLS_SLOTINFO_SURPLUS];
 
 
diff --git a/elf/dl-iteratephdr.c b/elf/dl-iteratephdr.c
index 13d815ce6e..609b9000e5 100644
--- a/elf/dl-iteratephdr.c
+++ b/elf/dl-iteratephdr.c
@@ -92,10 +92,6 @@ weak_alias (__dl_iterate_phdr, dl_iterate_phdr);
 
 #else
 
-/* dl-support.c defines these and initializes them early on.  */
-extern ElfW(Phdr) *_dl_phdr;
-extern size_t _dl_phnum;
-
 int
 dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
 				  size_t size, void *data), void *data)
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 9944555dd3..89db552542 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -601,6 +601,12 @@ extern const struct rtld_global_ro _rtld_global_ro
 #endif
 #undef EXTERN
 
+#ifndef SHARED
+/* dl-support.c defines these and initializes them early on.  */
+extern ElfW(Phdr) *_dl_phdr;
+extern size_t _dl_phnum;
+#endif
+
 #ifdef IS_IN_rtld
 /* This is the initial value of GL(dl_error_catch_tsd).
    A non-TLS libpthread will change it.  */
diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c
index c51737b488..3cfddce15f 100644
--- a/sysdeps/mach/hurd/i386/init-first.c
+++ b/sysdeps/mach/hurd/i386/init-first.c
@@ -106,10 +106,6 @@ init1 (int argc, char *arg0, ...)
   char **argv = &arg0;
   char **envp = &argv[argc + 1];
   struct hurd_startup_data *d;
-#ifndef SHARED
-  extern ElfW(Phdr) *_dl_phdr;
-  extern size_t _dl_phnum;
-#endif
 
   while (*envp)
     ++envp;