From owner-svn-src-all@FreeBSD.ORG  Wed Nov  7 19:51:53 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 7F809F3A;
 Wed,  7 Nov 2012 19:51:53 +0000 (UTC) (envelope-from dim@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 4C02D8FC17;
 Wed,  7 Nov 2012 19:51:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA7JprVe093324;
 Wed, 7 Nov 2012 19:51:53 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA7JprrP093321;
 Wed, 7 Nov 2012 19:51:53 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201211071951.qA7JprrP093321@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 7 Nov 2012 19:51:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242706 - in head/sys/boot/pc98: boot2 cdboot
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.14
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: Wed, 07 Nov 2012 19:51:53 -0000

Author: dim
Date: Wed Nov  7 19:51:53 2012
New Revision: 242706
URL: http://svnweb.freebsd.org/changeset/base/242706

Log:
  Put in a band-aid to get the pc98 bootstraps building, now clang is the
  default compiler.  This has two parts:
  - Make sys/boot/pc98/boot2 always build with gcc for now, until we can
    figure out a way to shrink it enough when building with clang.
  - Since sys/boot/p98/cdboot uses .code16 directives, which are not yet
    supported by clang's integrated assembler, use -no-integrated-as,
    similar to sys/boot/i386/cdboot.
  
  Reviewed by:	nyan
  MFC after:	1 week

Modified:
  head/sys/boot/pc98/boot2/Makefile
  head/sys/boot/pc98/cdboot/Makefile

Modified: head/sys/boot/pc98/boot2/Makefile
==============================================================================
--- head/sys/boot/pc98/boot2/Makefile	Wed Nov  7 19:32:21 2012	(r242705)
+++ head/sys/boot/pc98/boot2/Makefile	Wed Nov  7 19:51:53 2012	(r242706)
@@ -3,7 +3,7 @@
 .include <bsd.own.mk>
 
 # XXX: clang can compile the boot code just fine, but boot2 gets too big
-CC:=${CC:C/^(.*\/)?clang$/gcc/1}
+CC:=		gcc
 
 FILES=		boot boot1 boot2
 

Modified: head/sys/boot/pc98/cdboot/Makefile
==============================================================================
--- head/sys/boot/pc98/cdboot/Makefile	Wed Nov  7 19:32:21 2012	(r242705)
+++ head/sys/boot/pc98/cdboot/Makefile	Wed Nov  7 19:51:53 2012	(r242706)
@@ -13,3 +13,7 @@ ORG=	0x0000
 LDFLAGS=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary
 
 .include <bsd.prog.mk>
+
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS.cdboot.S=	${CLANG_NO_IAS}
+CFLAGS+=		${CFLAGS.${.IMPSRC:T}}