From owner-svn-src-head@FreeBSD.ORG  Wed Feb 11 19:53:45 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BA5C6815;
 Wed, 11 Feb 2015 19:53:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A581C15F;
 Wed, 11 Feb 2015 19:53:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1BJrj9F086426;
 Wed, 11 Feb 2015 19:53:45 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1BJrjXU086425;
 Wed, 11 Feb 2015 19:53:45 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201502111953.t1BJrjXU086425@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 11 Feb 2015 19:53:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r278593 - head/contrib/elftoolchain/libdwarf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2015 19:53:45 -0000

Author: emaste
Date: Wed Feb 11 19:53:44 2015
New Revision: 278593
URL: https://svnweb.freebsd.org/changeset/base/278593

Log:
  libdwarf: Add symbol value when processing .rela relocations
  
  Reviewed by:	kib, rpaulo
  Sponsored by:	The FreeBSD Foundation
  Differential Revision: https://reviews.freebsd.org/D1826

Modified:
  head/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c

Modified: head/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c
==============================================================================
--- head/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c	Wed Feb 11 19:07:05 2015	(r278592)
+++ head/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c	Wed Feb 11 19:53:44 2015	(r278593)
@@ -70,11 +70,15 @@ _dwarf_elf_apply_reloc(Dwarf_Debug dbg, 
 
 		offset = rela.r_offset;
 		size = _dwarf_get_reloc_size(dbg, type);
+		if (size == 0)
+			continue; /* Unknown or non-absolute relocation. */
 
 		if (endian == ELFDATA2MSB)
-			_dwarf_write_msb(buf, &offset, rela.r_addend, size);
+			_dwarf_write_msb(buf, &offset,
+			    sym.st_value + rela.r_addend, size);
 		else
-			_dwarf_write_lsb(buf, &offset, rela.r_addend, size);
+			_dwarf_write_lsb(buf, &offset,
+			    sym.st_value + rela.r_addend, size);
 	}
 }