From owner-svn-src-all@FreeBSD.ORG  Fri Apr 20 15:01:24 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3C9531065672;
	Fri, 20 Apr 2012 15:01:24 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0F88C8FC21;
	Fri, 20 Apr 2012 15:01:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3KF1N5p044101;
	Fri, 20 Apr 2012 15:01:23 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3KF1NZW044098;
	Fri, 20 Apr 2012 15:01:23 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201204201501.q3KF1NZW044098@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Fri, 20 Apr 2012 15:01:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234493 - in head/sys/boot: efi i386/efi
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 20 Apr 2012 15:01:24 -0000

Author: marcel
Date: Fri Apr 20 15:01:23 2012
New Revision: 234493
URL: http://svn.freebsd.org/changeset/base/234493

Log:
  Build a 32-bit EFI loader on amd64. This to match the rest of the
  code that is used to construct a loader (e.g. libstand, ficl, etc).
  
  There is such a thing as a 64-bit EFI application, but it's not
  as standard as 32-bit is. Let's make the 32-bit functional (as in
  we can load and actualy boot a kernel) before solving the 64-bit
  loader problem.

Modified:
  head/sys/boot/efi/Makefile.inc
  head/sys/boot/i386/efi/Makefile

Modified: head/sys/boot/efi/Makefile.inc
==============================================================================
--- head/sys/boot/efi/Makefile.inc	Fri Apr 20 14:45:57 2012	(r234492)
+++ head/sys/boot/efi/Makefile.inc	Fri Apr 20 15:01:23 2012	(r234493)
@@ -2,6 +2,13 @@
 
 BINDIR?=	/boot
 
+.if ${MACHINE_CPUARCH} == "amd64"
+CFLAGS+=        -m32 -march=i386
+ACFLAGS+=       -m32
+LDFLAGS+=       -m elf_i386_fbsd
+AFLAGS+=        --32
+.endif
+
 # Options used when building app-specific efi components
 CFLAGS+=	-ffreestanding -fshort-wchar -Wformat
 LDFLAGS+=	-nostdlib

Modified: head/sys/boot/i386/efi/Makefile
==============================================================================
--- head/sys/boot/i386/efi/Makefile	Fri Apr 20 14:45:57 2012	(r234492)
+++ head/sys/boot/i386/efi/Makefile	Fri Apr 20 15:01:23 2012	(r234493)
@@ -35,7 +35,7 @@ CFLAGS+=	-I${.CURDIR}/../../common
 FILES=	loader.efi
 FILESMODE_loader.efi=	${BINMODE}
 
-LDSCRIPT=	${.CURDIR}/ldscript.${MACHINE_ARCH}
+LDSCRIPT=	${.CURDIR}/ldscript.i386
 LDFLAGS=	-Wl,-T${LDSCRIPT} -shared -symbolic
 
 ${PROG}:	${LDSCRIPT}
@@ -64,6 +64,13 @@ CFLAGS+=	-I${.CURDIR}/../libi386
 CFLAGS+=	-I${.CURDIR}/../btx/lib
 
 DPADD=		${LIBFICL} ${LIBEFI} ${LIBSTAND}
-LDADD=		${LIBFICL} ${LIBEFI} -lstand
+LDADD=		${LIBFICL} ${LIBEFI} ${LIBSTAND}
 
 .include <bsd.prog.mk>
+
+.if ${MACHINE_CPUARCH} == "amd64"
+CFLAGS+=        -I.
+beforedepend ${OBJS}: machine
+machine:
+	ln -sf ${.CURDIR}/../../../i386/include machine
+.endif