summaryrefslogtreecommitdiffstats
path: root/sys/sparc64
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2011-03-11 20:01:57 +0000
committermarius <marius@FreeBSD.org>2011-03-11 20:01:57 +0000
commit43b8ca22cfc59ea79ba8518c4c294ae4348a591d (patch)
tree63e4d3ed6aa97212ba799b0a89745b7f621482b5 /sys/sparc64
parentd3cd30fe16f1e5cde039af5d0a5ab5708bb3570d (diff)
downloadFreeBSD-src-43b8ca22cfc59ea79ba8518c4c294ae4348a591d.zip
FreeBSD-src-43b8ca22cfc59ea79ba8518c4c294ae4348a591d.tar.gz
Revert the binutils workaround committed in r219340, the underlying
problem has been fixed in r219530.
Diffstat (limited to 'sys/sparc64')
-rw-r--r--sys/sparc64/sparc64/elf_machdep.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/sparc64/sparc64/elf_machdep.c b/sys/sparc64/sparc64/elf_machdep.c
index 386c0fa..d68ba46 100644
--- a/sys/sparc64/sparc64/elf_machdep.c
+++ b/sys/sparc64/sparc64/elf_machdep.c
@@ -333,14 +333,7 @@ elf_reloc(linker_file_t lf, Elf_Addr relocbase, const void *data, int type,
addr = lookup(lf, symidx, 1);
if (addr == 0)
return (-1);
- /*
- * With the addition of TLS support binutils started to make
- * addend values relative to relocbase instead of sections.
- */
- if (addr > relocbase && addr <= relocbase + value)
- value += relocbase;
- else
- value += addr;
+ value += addr;
if (RELOC_BARE_SYMBOL(rtype))
value = elf_relocaddr(lf, value);
}
OpenPOWER on IntegriCloud