From owner-svn-src-all@FreeBSD.ORG  Fri Apr 10 09:15:37 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2164E9C1;
 Fri, 10 Apr 2015 09:15:37 +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 0BF4B3C5;
 Fri, 10 Apr 2015 09:15:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3A9Fajd077986;
 Fri, 10 Apr 2015 09:15:36 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3A9FaEj077985;
 Fri, 10 Apr 2015 09:15:36 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201504100915.t3A9FaEj077985@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Fri, 10 Apr 2015 09:15:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r281357 - head/sys/boot/efi/loader
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.18-1
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: Fri, 10 Apr 2015 09:15:37 -0000

Author: andrew
Date: Fri Apr 10 09:15:35 2015
New Revision: 281357
URL: https://svnweb.freebsd.org/changeset/base/281357

Log:
  Port the EFI reloc codeto work on arm64. This used the rela relocation
  table so wiill need the addend included in the relocation calculation.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/boot/efi/loader/reloc.c

Modified: head/sys/boot/efi/loader/reloc.c
==============================================================================
--- head/sys/boot/efi/loader/reloc.c	Fri Apr 10 08:01:49 2015	(r281356)
+++ head/sys/boot/efi/loader/reloc.c	Fri Apr 10 09:15:35 2015	(r281357)
@@ -32,7 +32,12 @@ __FBSDID("$FreeBSD$");
 #include <efi.h>
 #include <bootstrap.h>
 
-#if defined(__arm__) || defined(__i386__)
+#if defined(__aarch64__)
+#define	ElfW_Rel	Elf64_Rela
+#define	ElfW_Dyn	Elf64_Dyn
+#define	ELFW_R_TYPE	ELF64_R_TYPE
+#define	ELF_RELA
+#elif defined(__arm__) || defined(__i386__)
 #define ElfW_Rel	Elf32_Rel
 #define	ElfW_Dyn	Elf32_Dyn
 #define	ELFW_R_TYPE	ELF32_R_TYPE
@@ -43,7 +48,10 @@ __FBSDID("$FreeBSD$");
 #else
 #error architecture not supported
 #endif
-#if defined(__amd64__)
+#if defined(__aarch64__)
+#define	RELOC_TYPE_NONE		R_AARCH64_NONE
+#define	RELOC_TYPE_RELATIVE	R_AARCH64_RELATIVE
+#elif defined(__amd64__)
 #define	RELOC_TYPE_NONE		R_X86_64_NONE
 #define	RELOC_TYPE_RELATIVE	R_X86_64_RELATIVE
 #elif defined(__arm__)
@@ -104,6 +112,10 @@ _reloc(unsigned long ImageBase, ElfW_Dyn
 			/* Address relative to the base address. */
 			newaddr = (unsigned long *)(ImageBase + rel->r_offset);
 			*newaddr += ImageBase;
+			/* Add the addend when the ABI uses them */ 
+#ifdef ELF_RELA
+			*newaddr += rel->r_addend;
+#endif
 			break;
 		default:
 			/* XXX: do we need other relocations ? */