Scrub up a few things I forgot. Add a few more cleanups.

 -Erik

6 files changed, 80 insertions, 42 deletions

diff --git a/ldso/ldso/boot1.c b/ldso/ldso/boot1.c
index 2824fa4e2..cbf6b1aae 100644
--- a/ldso/ldso/boot1.c
+++ b/ldso/ldso/boot1.c
@@ -95,7 +95,6 @@
 #include "sysdep.h" /* before elf.h to get ELF_USES_RELOCA right */
 #include <elf.h>
 #include "linuxelf.h"
-#include "link.h"
 #include "hash.h"
 #include "syscall.h"
 #include "string.h"
diff --git a/ldso/ldso/hash.h b/ldso/ldso/hash.h
index 9cd2894f8..043b64aca 100644
--- a/ldso/ldso/hash.h
+++ b/ldso/ldso/hash.h
@@ -1,4 +1,38 @@
-#include "link.h"
+#ifndef _HASH_H_
+#define _HASH_H_
+
+#include "elf.h"
+
+/* Header file that describes the internal data structures used by the
+ * ELF dynamic linker.  */
+
+struct link_map
+{
+  /* These entries must be in this order to be compatible with the
+   * interface used by gdb to obtain the list of symbols. */
+  unsigned long l_addr;	/* address at which object is mapped */
+  char *l_name;		/* full name of loaded object */
+  Elf32_Dyn *l_ld;	/* dynamic structure of object */
+  struct link_map *l_next;
+  struct link_map *l_prev;
+};
+
+/* The DT_DEBUG entry in the .dynamic section is given the address of
+ * this structure. gdb can pick this up to obtain the correct list of
+ * loaded modules. */
+struct r_debug
+{
+  int r_version;		/* debugging info version no */
+  struct link_map *r_map;	/* address of link_map */
+  unsigned long r_brk;		/* address of update routine */
+  enum
+  {
+    RT_CONSISTENT,
+    RT_ADD,
+    RT_DELETE
+  } r_state;
+  unsigned long r_ldbase;	/* base addr of ld.so */
+};
 
 #ifndef RTLD_NEXT
 #define RTLD_NEXT	((void*)-1)
@@ -94,3 +128,8 @@ static inline int _dl_symbol(char * name)
 #define DL_BAD_HANDLE 9
 #define DL_NO_SYMBOL 10
 
+
+
+#endif /* _HASH_H_ */
+
+
diff --git a/ldso/ldso/ld-uClibc.c b/ldso/ldso/ld-uClibc.c
index 2824fa4e2..cbf6b1aae 100644
--- a/ldso/ldso/ld-uClibc.c
+++ b/ldso/ldso/ld-uClibc.c
@@ -95,7 +95,6 @@
 #include "sysdep.h" /* before elf.h to get ELF_USES_RELOCA right */
 #include <elf.h>
 #include "linuxelf.h"
-#include "link.h"
 #include "hash.h"
 #include "syscall.h"
 #include "string.h"
diff --git a/ldso/ldso/ld_hash.h b/ldso/ldso/ld_hash.h
index 9cd2894f8..043b64aca 100644
--- a/ldso/ldso/ld_hash.h
+++ b/ldso/ldso/ld_hash.h
@@ -1,4 +1,38 @@
-#include "link.h"
+#ifndef _HASH_H_
+#define _HASH_H_
+
+#include "elf.h"
+
+/* Header file that describes the internal data structures used by the
+ * ELF dynamic linker.  */
+
+struct link_map
+{
+  /* These entries must be in this order to be compatible with the
+   * interface used by gdb to obtain the list of symbols. */
+  unsigned long l_addr;	/* address at which object is mapped */
+  char *l_name;		/* full name of loaded object */
+  Elf32_Dyn *l_ld;	/* dynamic structure of object */
+  struct link_map *l_next;
+  struct link_map *l_prev;
+};
+
+/* The DT_DEBUG entry in the .dynamic section is given the address of
+ * this structure. gdb can pick this up to obtain the correct list of
+ * loaded modules. */
+struct r_debug
+{
+  int r_version;		/* debugging info version no */
+  struct link_map *r_map;	/* address of link_map */
+  unsigned long r_brk;		/* address of update routine */
+  enum
+  {
+    RT_CONSISTENT,
+    RT_ADD,
+    RT_DELETE
+  } r_state;
+  unsigned long r_ldbase;	/* base addr of ld.so */
+};
 
 #ifndef RTLD_NEXT
 #define RTLD_NEXT	((void*)-1)
@@ -94,3 +128,8 @@ static inline int _dl_symbol(char * name)
 #define DL_BAD_HANDLE 9
 #define DL_NO_SYMBOL 10
 
+
+
+#endif /* _HASH_H_ */
+
+
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index 2824fa4e2..cbf6b1aae 100644
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -95,7 +95,6 @@
 #include "sysdep.h" /* before elf.h to get ELF_USES_RELOCA right */
 #include <elf.h>
 #include "linuxelf.h"
-#include "link.h"
 #include "hash.h"
 #include "syscall.h"
 #include "string.h"
diff --git a/ldso/ldso/link.h b/ldso/ldso/link.h
deleted file mode 100644
index adaa20e4a..000000000
--- a/ldso/ldso/link.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef _LINK_H
-#define _LINK_H
-
-#include "elf.h"
-
-/* Header file that describes the internal data structures used by the
- * ELF dynamic linker.  */
-
-struct link_map
-{
-  /* These entries must be in this order to be compatible with the
-   * interface used by gdb to obtain the list of symbols. */
-  unsigned long l_addr;	/* address at which object is mapped */
-  char *l_name;		/* full name of loaded object */
-  Elf32_Dyn *l_ld;	/* dynamic structure of object */
-  struct link_map *l_next;
-  struct link_map *l_prev;
-};
-
-/* The DT_DEBUG entry in the .dynamic section is given the address of
- * this structure. gdb can pick this up to obtain the correct list of
- * loaded modules. */
-struct r_debug
-{
-  int r_version;		/* debugging info version no */
-  struct link_map *r_map;	/* address of link_map */
-  unsigned long r_brk;		/* address of update routine */
-  enum
-  {
-    RT_CONSISTENT,
-    RT_ADD,
-    RT_DELETE
-  } r_state;
-  unsigned long r_ldbase;	/* base addr of ld.so */
-};
-
-#endif /* _LINK_H */