From owner-svn-src-all@freebsd.org  Sun Jul  5 11:42:02 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 57CDDAB9B;
 Sun,  5 Jul 2015 11:42:02 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 47E3F1968;
 Sun,  5 Jul 2015 11:42:02 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t65Bg2Z0062986;
 Sun, 5 Jul 2015 11:42:02 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t65Bg25N062985;
 Sun, 5 Jul 2015 11:42:02 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201507051142.t65Bg25N062985@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sun, 5 Jul 2015 11:42:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285159 - head/libexec/rtld-elf/aarch64
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jul 2015 11:42:02 -0000

Author: andrew
Date: Sun Jul  5 11:42:01 2015
New Revision: 285159
URL: https://svnweb.freebsd.org/changeset/base/285159

Log:
  Add on the addend when in the R_AARCH64_ABS64 and R_AARCH64_GLOB_DAT cases.
  This fixes at least sshd, and some of the boehm-gc tests.
  
  Sponsored by:	ABT Systems Ltd

Modified:
  head/libexec/rtld-elf/aarch64/reloc.c

Modified: head/libexec/rtld-elf/aarch64/reloc.c
==============================================================================
--- head/libexec/rtld-elf/aarch64/reloc.c	Sun Jul  5 10:14:34 2015	(r285158)
+++ head/libexec/rtld-elf/aarch64/reloc.c	Sun Jul  5 11:42:01 2015	(r285159)
@@ -341,7 +341,8 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry 
 			if (def == NULL)
 				return (-1);
 
-			*where = (Elf_Addr)defobj->relocbase + def->st_value;
+			*where = (Elf_Addr)defobj->relocbase + def->st_value +
+			    rela->r_addend;
 			break;
 		case R_AARCH64_COPY:
 			/*