From owner-svn-src-all@FreeBSD.ORG  Fri Feb  7 16:28:40 2014
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 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F0ED1D7C;
 Fri,  7 Feb 2014 16:28:40 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DA27C1F90;
 Fri,  7 Feb 2014 16:28:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s17GSeVw002612;
 Fri, 7 Feb 2014 16:28:40 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s17GSe85002611;
 Fri, 7 Feb 2014 16:28:40 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201402071628.s17GSe85002611@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Fri, 7 Feb 2014 16:28:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r261603 - head/sys/boot/efi
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.17
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, 07 Feb 2014 16:28:41 -0000

Author: emaste
Date: Fri Feb  7 16:28:40 2014
New Revision: 261603
URL: http://svnweb.freebsd.org/changeset/base/261603

Log:
  Don't force efi to a 32-bit build on amd64
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: head/sys/boot/efi/Makefile.inc
==============================================================================
--- head/sys/boot/efi/Makefile.inc	Fri Feb  7 15:26:19 2014	(r261602)
+++ head/sys/boot/efi/Makefile.inc	Fri Feb  7 16:28:40 2014	(r261603)
@@ -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