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

Treat R_X86_64_PLT32 relocs as R_X86_64_PC32.

Browse Source 
If we load a binary that is designed to be a library, it produces
relocatable code via assembler directives in the assembly itself
(rather than compiler options).  This emits R_X86_64_PLT32 relocations,
which are not handled by the kernel linker.

Submitted by:	gallatin
Reviewed by:	kib
This commit is contained in:
Gleb Smirnoff 2016-12-09 18:07:28 +00:00
parent 296d65b7a9
commit f98751499c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=309748
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/amd64/amd64/elf_machdep.c
View File

@ -178,6 +178,7 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
switch (rtype) {
case R_X86_64_PC32:
case R_X86_64_32S:
case R_X86_64_PLT32:
addend = *(Elf32_Addr *)where;
break;
default:
@ -211,6 +212,8 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
break;
case R_X86_64_PC32: /* S + A - P */
case R_X86_64_PLT32: /* L + A - P, L is PLT location for
the symbol, which we treat as S */
error = lookup(lf, symidx, 1, &addr);
where32 = (Elf32_Addr *)where;
val32 = (Elf32_Addr)(addr + addend - (Elf_Addr)where);