From b0b98e9752e5a84953ff869d36dc6082a675c8ab Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Fri, 7 Feb 2014 16:28:40 +0000
Subject: [PATCH] Don't force efi to a 32-bit build on amd64

Sponsored by:	The FreeBSD Foundation
---
 sys/boot/efi/Makefile.inc | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/sys/boot/efi/Makefile.inc b/sys/boot/efi/Makefile.inc
index 7446d31043ae..29ebae4f5e4b 100644
--- a/sys/boot/efi/Makefile.inc
+++ b/sys/boot/efi/Makefile.inc
@@ -2,17 +2,10 @@
 
 BINDIR?=	/boot
 
-.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
+.if ${MACHINE_CPUARCH} == "i386"
 CFLAGS+=        -march=i386
 .endif
 
-.if ${MACHINE_CPUARCH} == "amd64"
-CFLAGS+=        -m32
-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