Make a small revision to the api between the elf linker core and the

elf_reloc() backends for two reasons.  First, to support the possibility
of there being two elf linkers in the kernel (eg: amd64), and second, to
pass the relocbase explicitly (for relocating .o format kld files).

1 files changed, 4 insertions, 3 deletions

diff --git a/sys/sys/linker.h b/sys/sys/linker.h
index 3ea5718..1815c47 100644
--- a/sys/sys/linker.h
+++ b/sys/sys/linker.h
@@ -241,10 +241,11 @@ extern int kld_debug;
 
 #endif
 
+typedef Elf_Addr elf_lookup_fn(linker_file_t, Elf_Word, int);
+
 /* Support functions */
-int	elf_reloc(linker_file_t _lf, const void *_rel, int _type);
-int	elf_reloc_local(linker_file_t _lf, const void *_rel, int _type);
-Elf_Addr elf_lookup(linker_file_t, Elf_Word, int);
+int	elf_reloc(linker_file_t _lf, Elf_Addr base, const void *_rel, int _type, elf_lookup_fn _lu);
+int	elf_reloc_local(linker_file_t _lf, Elf_Addr base, const void *_rel, int _type, elf_lookup_fn _lu);
 const Elf_Sym *elf_get_sym(linker_file_t _lf, Elf_Word _symidx);
 const char *elf_get_symname(linker_file_t _lf, Elf_Word _symidx);