From owner-p4-projects@FreeBSD.ORG  Sun Aug 31 10:52:13 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 07A951065672; Sun, 31 Aug 2008 10:52:13 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C02A0106566C
	for <perforce@FreeBSD.org>; Sun, 31 Aug 2008 10:52:12 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AFC2A8FC13
	for <perforce@FreeBSD.org>; Sun, 31 Aug 2008 10:52:12 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7VAqCAR020503
	for <perforce@FreeBSD.org>; Sun, 31 Aug 2008 10:52:12 GMT
	(envelope-from rpaulo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7VAqCQZ020501
	for perforce@freebsd.org; Sun, 31 Aug 2008 10:52:12 GMT
	(envelope-from rpaulo@FreeBSD.org)
Date: Sun, 31 Aug 2008 10:52:12 GMT
Message-Id: <200808311052.m7VAqCQZ020501@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rpaulo@FreeBSD.org using -f
From: Rui Paulo <rpaulo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 148903 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 Aug 2008 10:52:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=148903

Change 148903 by rpaulo@rpaulo_alpha on 2008/08/31 10:51:32

	The proper return is EFI_STATUS.
	Add the necessary changes for amd64 relocations.

Affected files ...

.. //depot/projects/efi/boot/i386/Makefile.inc#3 edit
.. //depot/projects/efi/boot/i386/efi/Makefile#3 edit
.. //depot/projects/efi/boot/i386/efi/reloc.c#4 edit

Differences ...

==== //depot/projects/efi/boot/i386/Makefile.inc#3 (text+ko) ====

@@ -5,15 +5,16 @@
 BINDIR?=	/boot
 
 LOADER_ADDRESS?=0x200000
-CFLAGS+=	-ffreestanding -mpreferred-stack-boundary=2 \
+# -mpreferred-stack-boundary=2 \
+CFLAGS+=	-ffreestanding -fPIC \
 		-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3
 LDFLAGS+=	-nostdlib
 
-.if ${MACHINE_ARCH} == "amd64"
-CFLAGS+=	-m32 -march=i386
-LDFLAGS+=	-m elf_i386_fbsd
-AFLAGS+=	--32
-.endif
+#.if ${MACHINE_ARCH} == "amd64"
+#CFLAGS+=	-m32 -march=i386
+#LDFLAGS+=	-m elf_i386_fbsd
+#AFLAGS+=	--32
+#.endif
 
 # BTX components
 .if exists(${.OBJDIR}/../btx)

==== //depot/projects/efi/boot/i386/efi/Makefile#3 (text+ko) ====

@@ -2,6 +2,7 @@
 
 NO_MAN=
 WITHOUT_SSP=
+BUILDING_EFI=
 
 .include <bsd.own.mk>
 
@@ -33,14 +34,16 @@
 FILES=	loader.efi
 FILESMODE_loader.efi=	${BINMODE}
 
-LDSCRIPT=	${.CURDIR}/ldscript.ia32
+LDSCRIPT.i386=	${.CURDIR}/ldscript.ia32
+LDSCRIPT.amd64=	${.CURDIR}/ldscript.ia32-64
+LDSCRIPT=	${LDSCRIPT.${MACHINE_ARCH}}
 LDFLAGS=	-Wl,-T${LDSCRIPT} -shared -symbolic
 
 ${PROG}:	${LDSCRIPT}
 
 CLEANFILES=	vers.c loader.efi
 
-NEWVERSWHAT=	"EFI loader" ia32
+NEWVERSWHAT=	"EFI loader" ${MACHINE_ARCH}
 
 vers.c:	${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
 	sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}

==== //depot/projects/efi/boot/i386/efi/reloc.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 /*
  * A simple relocator for IA32 EFI binaries.
  */
-int
+EFI_STATUS
 _reloc(unsigned long ImageBase, Elf32_Dyn *dynamic, EFI_HANDLE image_handle,
     EFI_SYSTEM_TABLE *system_table)
 {
@@ -67,7 +67,11 @@
 
 	/*
 	 * Perform the actual relocation.
+	 * XXX: We are reusing code for the amd64 version of this, but
+	 * we must make sure the relocation types are the same.
 	 */
+	CTASSERT(R_386_NONE == R_x86_64_NONE);
+	CTASSERT(R_386_RELATIVE == R_X86_64_RELATIVE);
 	for (; relsz > 0; relsz -= relent) {
 		switch (ELF32_R_TYPE(rel->r_info)) {
 		case R_386_NONE: