From owner-svn-src-head@FreeBSD.ORG  Mon Apr  7 00:49:16 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 8C668BC5;
 Mon,  7 Apr 2014 00:49:16 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 79EA2FC5;
 Mon,  7 Apr 2014 00:49:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s370nGWG037399;
 Mon, 7 Apr 2014 00:49:16 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s370nGl0037398;
 Mon, 7 Apr 2014 00:49:16 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201404070049.s370nGl0037398@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 7 Apr 2014 00:49:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264208 - head/sys/boot/amd64
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Apr 2014 00:49:16 -0000

Author: emaste
Date: Mon Apr  7 00:49:15 2014
New Revision: 264208
URL: http://svnweb.freebsd.org/changeset/base/264208

Log:
  Do not build the amd64 UEFI loader with GCC
  
  The UEFI loader causes buildworld to fail when building with (in-tree)
  GCC, due to a typedef redefinition.  As it happens the in-tree GCC
  cannot successfully build the UEFI loader anyhow, as it does not support
  __attribute__((ms_abi)).  Thus, just avoid trying to build it with GCC,         rather than disconnecting it from the build until the underlying issue
  is fixed.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/boot/amd64/Makefile

Modified: head/sys/boot/amd64/Makefile
==============================================================================
--- head/sys/boot/amd64/Makefile	Sun Apr  6 23:57:19 2014	(r264207)
+++ head/sys/boot/amd64/Makefile	Mon Apr  7 00:49:15 2014	(r264208)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+# In-tree GCC does not support __attribute__((ms_abi)), required by the
+# UEFI loader.
+.if ${COMPILER_TYPE} != "gcc"
 SUBDIR=		efi
+.endif
 
 .include <bsd.subdir.mk>