Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Mar 2011 20:01:57 +0000 (UTC)
From:      Marius Strobl <marius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r219531 - head/sys/sparc64/sparc64
Message-ID:  <201103112001.p2BK1vMN091957@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marius
Date: Fri Mar 11 20:01:57 2011
New Revision: 219531
URL: http://svn.freebsd.org/changeset/base/219531

Log:
  Revert the binutils workaround committed in r219340, the underlying
  problem has been fixed in r219530.

Modified:
  head/sys/sparc64/sparc64/elf_machdep.c

Modified: head/sys/sparc64/sparc64/elf_machdep.c
==============================================================================
--- head/sys/sparc64/sparc64/elf_machdep.c	Fri Mar 11 20:00:38 2011	(r219530)
+++ head/sys/sparc64/sparc64/elf_machdep.c	Fri Mar 11 20:01:57 2011	(r219531)
@@ -333,14 +333,7 @@ elf_reloc(linker_file_t lf, Elf_Addr rel
 		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);
 	}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103112001.p2BK1vMN091957>