diff options
| author | kib <kib@FreeBSD.org> | 2015-09-27 01:33:43 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2015-09-27 01:33:43 +0000 |
| commit | b44e8c14438c6602432ef5d490df5fd818d5a1db (patch) | |
| tree | 606c7d952a5108145e2f9e88a6ecd9c4b0d13664 /sys/amd64 | |
| parent | 8a6fcabbcf4777957124f6be9ba9dba42b68a9b7 (diff) | |
| download | FreeBSD-src-b44e8c14438c6602432ef5d490df5fd818d5a1db.zip FreeBSD-src-b44e8c14438c6602432ef5d490df5fd818d5a1db.tar.gz | |
MFC r288000:
Add support for weak symbols to the kernel linkers.
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/elf_machdep.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sys/amd64/amd64/elf_machdep.c b/sys/amd64/amd64/elf_machdep.c index 23fa39b..f9ba30d 100644 --- a/sys/amd64/amd64/elf_machdep.c +++ b/sys/amd64/amd64/elf_machdep.c @@ -167,6 +167,7 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, Elf_Size rtype, symidx; const Elf_Rel *rel; const Elf_Rela *rela; + int error; switch (type) { case ELF_RELOC_REL: @@ -202,29 +203,29 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, break; case R_X86_64_64: /* S + A */ - addr = lookup(lf, symidx, 1); + error = lookup(lf, symidx, 1, &addr); val = addr + addend; - if (addr == 0) + if (error != 0) return -1; if (*where != val) *where = val; break; case R_X86_64_PC32: /* S + A - P */ - addr = lookup(lf, symidx, 1); + error = lookup(lf, symidx, 1, &addr); where32 = (Elf32_Addr *)where; val32 = (Elf32_Addr)(addr + addend - (Elf_Addr)where); - if (addr == 0) + if (error != 0) return -1; if (*where32 != val32) *where32 = val32; break; case R_X86_64_32S: /* S + A sign extend */ - addr = lookup(lf, symidx, 1); + error = lookup(lf, symidx, 1, &addr); val32 = (Elf32_Addr)(addr + addend); where32 = (Elf32_Addr *)where; - if (addr == 0) + if (error != 0) return -1; if (*where32 != val32) *where32 = val32; @@ -241,8 +242,8 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, case R_X86_64_GLOB_DAT: /* S */ case R_X86_64_JMP_SLOT: /* XXX need addend + offset */ - addr = lookup(lf, symidx, 1); - if (addr == 0) + error = lookup(lf, symidx, 1, &addr); + if (error != 0) return -1; if (*where != addr) *where = addr; |
