Commit eeaf3b6b authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] m68k: M68k module loader

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k: Add missing relocation support to module loader (from Matthias Urlichs)
parent 1f768a03
...@@ -82,9 +82,38 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, ...@@ -82,9 +82,38 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
unsigned int relsec, unsigned int relsec,
struct module *me) struct module *me)
{ {
printk(KERN_ERR "module %s: ADD RELOCATION unsupported\n", unsigned int i;
me->name); Elf32_Rela *rel = (void *)sechdrs[relsec].sh_addr;
return -ENOEXEC; Elf32_Sym *sym;
uint32_t *location;
DEBUGP("Applying relocate_add section %u to %u\n", relsec,
sechdrs[relsec].sh_info);
for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
/* This is where to make the change */
location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
+ rel[i].r_offset;
/* This is the symbol it is referring to. Note that all
undefined symbols have been resolved. */
sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
+ ELF32_R_SYM(rel[i].r_info);
switch (ELF32_R_TYPE(rel[i].r_info)) {
case R_68K_32:
/* We add the value into the location given */
*location = rel[i].r_addend + sym->st_value;
break;
case R_68K_PC32:
/* Add the value, subtract its postition */
*location = rel[i].r_addend + sym->st_value - (uint32_t)location;
break;
default:
printk(KERN_ERR "module %s: Unknown relocation: %u\n",
me->name, ELF32_R_TYPE(rel[i].r_info));
return -ENOEXEC;
}
}
return 0;
} }
int module_finalize(const Elf_Ehdr *hdr, int module_finalize(const Elf_Ehdr *hdr,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment