summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2001-09-03 04:37:55 +0000
committerPeter Wemm <peter@FreeBSD.org>2001-09-03 04:37:55 +0000
commit00dda5e82b657d17cf1b133ad82b024068a01bba (patch)
tree85a415a3c1ff534f20690cf82daed5fdb41a1555 /sys
parent005ee369ed699486e92afc405db25a065b5a6253 (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/link_elf.c7
-rw-r--r--sys/kern/link_elf_obj.c7
2 files changed, 6 insertions, 8 deletions
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index 0f6a87a2fe7b..d07528141476 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -161,9 +161,7 @@ r_debug_state(struct r_debug *dummy_one __unused,
/*
* The kernel symbol table starts here.
*/
-#ifndef __ia64__
extern struct _dynamic _DYNAMIC;
-#endif
static void
link_elf_init(void* arg)
@@ -186,7 +184,7 @@ link_elf_init(void* arg)
#else
dp = 0;
#endif
- if (dp) {
+ if (1) {
modname = NULL;
modptr = preload_search_by_type("elf kernel");
if (modptr)
@@ -205,7 +203,8 @@ link_elf_init(void* arg)
#endif
ef->dynamic = dp;
- parse_dynamic(ef);
+ if (dp)
+ parse_dynamic(ef);
linker_kernel_file->address = (caddr_t) KERNBASE;
linker_kernel_file->size = -(intptr_t)linker_kernel_file->address;
diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c
index 0f6a87a2fe7b..d07528141476 100644
--- a/sys/kern/link_elf_obj.c
+++ b/sys/kern/link_elf_obj.c
@@ -161,9 +161,7 @@ r_debug_state(struct r_debug *dummy_one __unused,
/*
* The kernel symbol table starts here.
*/
-#ifndef __ia64__
extern struct _dynamic _DYNAMIC;
-#endif
static void
link_elf_init(void* arg)
@@ -186,7 +184,7 @@ link_elf_init(void* arg)
#else
dp = 0;
#endif
- if (dp) {
+ if (1) {
modname = NULL;
modptr = preload_search_by_type("elf kernel");
if (modptr)
@@ -205,7 +203,8 @@ link_elf_init(void* arg)
#endif
ef->dynamic = dp;
- parse_dynamic(ef);
+ if (dp)
+ parse_dynamic(ef);
linker_kernel_file->address = (caddr_t) KERNBASE;
linker_kernel_file->size = -(intptr_t)linker_kernel_file->address;