From owner-svn-src-projects@FreeBSD.ORG  Fri Mar  1 07:00:12 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id F2D2A4B6;
 Fri,  1 Mar 2013 07:00:11 +0000 (UTC)
 (envelope-from benno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E6074BF5;
 Fri,  1 Mar 2013 07:00:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r2170Brf033877;
 Fri, 1 Mar 2013 07:00:11 GMT (envelope-from benno@svn.freebsd.org)
Received: (from benno@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r2170Bfi033876;
 Fri, 1 Mar 2013 07:00:11 GMT (envelope-from benno@svn.freebsd.org)
Message-Id: <201303010700.r2170Bfi033876@svn.freebsd.org>
From: Benno Rice <benno@FreeBSD.org>
Date: Fri, 1 Mar 2013 07:00:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r247532 - projects/uefi/sys/boot/common
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Mar 2013 07:00:12 -0000

Author: benno
Date: Fri Mar  1 07:00:11 2013
New Revision: 247532
URL: http://svnweb.freebsd.org/changeset/base/247532

Log:
  Build both 32- and 64-bit ELF loaders on both amd64 and i386.
  
  This is needed because otherwise we don't build the 32-bit ELF loader for the
  i386 loader code used to boot amd64 under BIOS.

Modified:
  projects/uefi/sys/boot/common/Makefile.inc

Modified: projects/uefi/sys/boot/common/Makefile.inc
==============================================================================
--- projects/uefi/sys/boot/common/Makefile.inc	Fri Mar  1 06:57:45 2013	(r247531)
+++ projects/uefi/sys/boot/common/Makefile.inc	Fri Mar  1 07:00:11 2013	(r247532)
@@ -4,11 +4,9 @@ SRCS+=	boot.c commands.c console.c devop
 SRCS+=	interp_backslash.c interp_parse.c ls.c misc.c 
 SRCS+=	module.c panic.c
 
-.if ${MACHINE} == "i386"
+.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 SRCS+=	load_elf32.c load_elf32_obj.c reloc_elf32.c
 SRCS+=	load_elf64.c load_elf64_obj.c reloc_elf64.c
-.elif ${MACHINE_CPUARCH} == "amd64"
-SRCS+=	load_elf64.c load_elf64_obj.c reloc_elf64.c
 .elif ${MACHINE_CPUARCH} == "ia64"
 SRCS+=	load_elf64.c load_elf64_obj.c reloc_elf64.c
 .elif ${MACHINE} == "pc98"