From owner-svn-src-head@freebsd.org  Wed Jan 13 21:34:17 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 32556A813B1;
 Wed, 13 Jan 2016 21:34:17 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 01A461452;
 Wed, 13 Jan 2016 21:34:16 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0DLYFCI014525;
 Wed, 13 Jan 2016 21:34:15 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0DLYFRv014524;
 Wed, 13 Jan 2016 21:34:15 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201601132134.u0DLYFRv014524@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: Wed, 13 Jan 2016 21:34:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r293852 - head/usr.sbin/kldxref
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.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jan 2016 21:34:17 -0000

Author: andrew
Date: Wed Jan 13 21:34:15 2016
New Revision: 293852
URL: https://svnweb.freebsd.org/changeset/base/293852

Log:
  Add support for relocating AArch64 modules to kldxref. This fixes an error
  message where it fails to read the module as the unrelocated addresses
  are zero.
  
  Sponsored by:	ABT Systems Ltd

Added:
  head/usr.sbin/kldxref/ef_aarch64.c
     - copied, changed from r293737, head/usr.sbin/kldxref/ef_powerpc.c

Copied and modified: head/usr.sbin/kldxref/ef_aarch64.c (from r293737, head/usr.sbin/kldxref/ef_powerpc.c)
==============================================================================
--- head/usr.sbin/kldxref/ef_powerpc.c	Tue Jan 12 09:03:39 2016	(r293737, copy source)
+++ head/usr.sbin/kldxref/ef_aarch64.c	Wed Jan 13 21:34:15 2016	(r293852)
@@ -60,15 +60,18 @@ ef_reloc(struct elf_file *ef, const void
 	rtype = ELF_R_TYPE(rela->r_info);
 	symidx = ELF_R_SYM(rela->r_info);
 
-	 if ((char *)where < (char *)dest || (char *)where >= (char *)dest + len)
+	if ((char *)where < (char *)dest || (char *)where >= (char *)dest + len)
                 return (0);
 
 	switch(rtype) {
-	case R_PPC_RELATIVE: /* word32 B + A */
+	case R_AARCH64_RELATIVE:
 		*where = relbase + addend;
 		break;
+	case R_AARCH64_ABS64:
+		break;
 	default:
-		warnx("unhandled relocation type %d", rtype);
+		warnx("unhandled relocation type %lu", rtype);
+		break;
 	}
 	return (0);
 }