From owner-svn-src-all@FreeBSD.ORG  Sun Sep 30 12:24:16 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B668510656A6;
	Sun, 30 Sep 2012 12:24:16 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 98F4E8FC08;
	Sun, 30 Sep 2012 12:24:16 +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 q8UCOGsc029240;
	Sun, 30 Sep 2012 12:24:16 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8UCOG5o029237;
	Sun, 30 Sep 2012 12:24:16 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201209301224.q8UCOG5o029237@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Sun, 30 Sep 2012 12:24:16 +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: r241068 - head/sys/boot/i386/loader
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: Sun, 30 Sep 2012 12:24:17 -0000

Author: ae
Date: Sun Sep 30 12:24:15 2012
New Revision: 241068
URL: http://svn.freebsd.org/changeset/base/241068

Log:
  Reduce the number of attempts to detect proper kld format for the amd64
  loader.

Modified:
  head/sys/boot/i386/loader/Makefile
  head/sys/boot/i386/loader/conf.c

Modified: head/sys/boot/i386/loader/Makefile
==============================================================================
--- head/sys/boot/i386/loader/Makefile	Sun Sep 30 09:26:26 2012	(r241067)
+++ head/sys/boot/i386/loader/Makefile	Sun Sep 30 12:24:15 2012	(r241068)
@@ -125,6 +125,7 @@ LDADD=	${LIBFICL} ${LIBFIREWIRE} ${LIBZF
 .if ${MACHINE_CPUARCH} == "amd64"
 beforedepend ${OBJS}: machine
 CLEANFILES+=	machine
+CFLAGS+=	-DLOADER_PREFER_AMD64
 machine:
 	ln -sf ${.CURDIR}/../../../i386/include machine
 .endif

Modified: head/sys/boot/i386/loader/conf.c
==============================================================================
--- head/sys/boot/i386/loader/conf.c	Sun Sep 30 09:26:26 2012	(r241067)
+++ head/sys/boot/i386/loader/conf.c	Sun Sep 30 12:24:15 2012	(r241068)
@@ -109,10 +109,16 @@ extern struct file_format	amd64_elf;
 extern struct file_format	amd64_elf_obj;
 
 struct file_format *file_formats[] = {
+#ifdef LOADER_PREFER_AMD64
+    &amd64_elf,
+    &amd64_elf_obj,
+#endif
     &i386_elf,
     &i386_elf_obj,
+#ifndef LOADER_PREFER_AMD64
     &amd64_elf,
     &amd64_elf_obj,
+#endif
     NULL
 };