From ff0d9e7dbf691266327e689c8b9125945048361d Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 7 Nov 2012 19:51:53 +0000
Subject: [PATCH] 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
---
 sys/boot/pc98/boot2/Makefile  | 2 +-
 sys/boot/pc98/cdboot/Makefile | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys/boot/pc98/boot2/Makefile b/sys/boot/pc98/boot2/Makefile
index 18bf251e5092..00a28dea255c 100644
--- a/sys/boot/pc98/boot2/Makefile
+++ b/sys/boot/pc98/boot2/Makefile
@@ -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
 
diff --git a/sys/boot/pc98/cdboot/Makefile b/sys/boot/pc98/cdboot/Makefile
index eec1328fb3a0..bcce0efe135d 100644
--- a/sys/boot/pc98/cdboot/Makefile
+++ b/sys/boot/pc98/cdboot/Makefile
@@ -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}}