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

Remove a workaround for a binutils bug that was fixed in the recent

Browse Source 
import, as it breaks the relocation kernel modules built with the new
binutils.
Note that this, together with the binutils import, marks a kernel module
flag day on sparc64: modules built with the old binutils will not work
with new kernels and vice versa. Mismatches will result in panics.

Approved by:	re
This commit is contained in:
Thomas Moestl 2002-12-02 18:56:30 +00:00
parent 2e84ab947d
commit df9f4fead8
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/sparc64/sparc64/elf_machdep.c
View File

@ -240,7 +240,6 @@ int
elf_reloc(linker_file_t lf, const void *data, int type) elf_reloc(linker_file_t lf, const void *data, int type)
{ {
const Elf_Rela *rela; const Elf_Rela *rela;
const Elf_Sym *sym;
Elf_Addr relocbase; Elf_Addr relocbase;
Elf_Half *where32; Elf_Half *where32;
Elf_Addr *where; Elf_Addr *where;
@ -272,24 +271,10 @@ elf_reloc(linker_file_t lf, const void *data, int type)
value = rela->r_addend; value = rela->r_addend;
if (RELOC_RESOLVE_SYMBOL(rtype)) { if (RELOC_RESOLVE_SYMBOL(rtype)) {
/* addr = elf_lookup(lf, symidx, 1);
* Work around what appears to be confusion between binutils if (addr == 0)
* and the v9 ABI. LO10 and HI22 relocations are listed as return (-1);
* S + A, but for STB_LOCAL symbols it seems that the value value += addr;
* in the Elf_Sym refered to by the symbol index is wrong,
* instead the value is in the addend field of the Elf_Rela
* record. So if the symbol is local don't look it up, just
* use the addend as its value and add in the relocbase.
*/
sym = elf_get_sym(lf, symidx);
if (ELF_ST_BIND(sym->st_info) == STB_LOCAL)
value += relocbase;
else {
addr = elf_lookup(lf, symidx, 1);
if (addr == 0)
return (-1);
value += addr;
}
} }
if (RELOC_PC_RELATIVE(rtype)) if (RELOC_PC_RELATIVE(rtype))