summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authortv <tv@NetBSD.org>1998-07-15 11:26:28 +0000
committertv <tv@NetBSD.org>1998-07-15 11:26:28 +0000
commit3ecc6b044e46c77b6c5009bfff08a161bdfff471 (patch)
tree412a4d7a398e0fc8214afd355570eaf8b7d69e78 /libexec
parent8babb8290cf5c3606ad45a15beb65b5dfd17afe5 (diff)
Some local changes accidentally made it into the last commit; back that
part out (noticed by mycroft; thanks!)
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ld.elf_so/rtld.c20
1 files changed, 5 insertions, 15 deletions
diff --git a/libexec/ld.elf_so/rtld.c b/libexec/ld.elf_so/rtld.c
index d56d52f1f07..5636cf79e61 100644
--- a/libexec/ld.elf_so/rtld.c
+++ b/libexec/ld.elf_so/rtld.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.8 1998/07/14 22:18:37 tv Exp $ */
+/* $NetBSD: rtld.c,v 1.9 1998/07/15 11:26:28 tv Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -89,23 +89,13 @@ Search_Path *_rtld_paths;
char *__progname;
char **environ;
-#ifdef sparc
-Elf_Addr *_rtld_self_GOT;
-#endif
-
-#ifndef OLD_GOT
+#ifdef OLD_GOT
+extern Elf_Addr _GLOBAL_OFFSET_TABLE_[];
+#else
+extern Elf_Addr _GLOBAL_OFFSET_TABLE_[];
extern Elf_Dyn _DYNAMIC;
#endif
-void _rtld_test(void);
-void _rtld_test(void) { xprintf("%p\n", _GLOBAL_OFFSET_TABLE_); }
-
-void _dynamicprint(u_long *);
-void _dynamicprint(u_long *ptr) {
- while (*ptr)
- xprintf("%p, %p\n", *ptr++, *ptr++);
-}
-
static void
_rtld_call_fini_functions(
Obj_Entry *first)