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/arm | |
| 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/arm')
| -rw-r--r-- | sys/arm/arm/elf_machdep.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/arm/arm/elf_machdep.c b/sys/arm/arm/elf_machdep.c index 8ef9bd4..931a82b 100644 --- a/sys/arm/arm/elf_machdep.c +++ b/sys/arm/arm/elf_machdep.c @@ -132,6 +132,7 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, Elf_Word rtype, symidx; const Elf_Rel *rel; const Elf_Rela *rela; + int error; switch (type) { case ELF_RELOC_REL: @@ -167,8 +168,8 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, break; case R_ARM_ABS32: - addr = lookup(lf, symidx, 1); - if (addr == 0) + error = lookup(lf, symidx, 1, &addr); + if (error != 0) return -1; *where += addr; break; @@ -183,8 +184,8 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, break; case R_ARM_JUMP_SLOT: - addr = lookup(lf, symidx, 1); - if (addr) { + error = lookup(lf, symidx, 1, &addr); + if (error == 0) { *where = addr; return (0); } |
