d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert the elf loader to the new linker set layout for elf files.

Browse Source 
This should make dependencies at load time work like before.  Oops.

Noticed by:	markm
This commit is contained in:
Peter Wemm 2001-06-19 07:41:07 +00:00
parent 357f511a58
commit 5c9321595d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/boot/common/load_elf.c
View File

@ -570,17 +570,18 @@ elf_parse_modmetadata(struct preloaded_file *fp, elf_file_t ef)
{
struct mod_metadata md;
Elf_Sym sym;
char *s, *v, **p;
long entries;
char *s, *v, **p, **p_stop;
int modcnt;
if (elf_lookup_symbol(fp, ef, "modmetadata_set", &sym) != 0)
if (elf_lookup_symbol(fp, ef, "__start_set_modmetadata_set", &sym) != 0)
return ENOENT;
COPYOUT(sym.st_value + ef->off, &entries, sizeof(entries));
p = (char **)(sym.st_value + ef->off);
if (elf_lookup_symbol(fp, ef, "__stop_set_modmetadata_set", &sym) != 0)
return ENOENT;
p_stop = (char **)(sym.st_value + ef->off);
modcnt = 0;
p = (char **)(sym.st_value + ef->off + sizeof(entries));
while (entries--) {
while (p < p_stop) {
COPYOUT(p++, &v, sizeof(v));
COPYOUT(v + ef->off, &md, sizeof(md));
switch(md.md_type) {