svn commit: r243190 - in stable/9: . sys/boot/pc98/boot2 sys/boot/pc98/cdboot
Dimitry Andric
dim at FreeBSD.org
Sat Nov 17 22:40:19 UTC 2012
Author: dim
Date: Sat Nov 17 22:40:18 2012
New Revision: 243190
URL: http://svnweb.freebsd.org/changeset/base/243190
Log:
MFC r242706:
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 r242874:
Work around pc98 tinderbox failures in sys/boot/pc98, by making sure a
cross gcc gets built during the cross-tools stage.
Modified:
stable/9/Makefile.inc1 (contents, props changed)
stable/9/sys/boot/pc98/boot2/Makefile
stable/9/sys/boot/pc98/cdboot/Makefile
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/boot/ (props changed)
Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1 Sat Nov 17 21:55:49 2012 (r243189)
+++ stable/9/Makefile.inc1 Sat Nov 17 22:40:18 2012 (r243190)
@@ -1123,7 +1123,7 @@ _aicasm= sys/modules/aic7xxx/aicasm
_share= share/syscons/scrnmaps
.endif
-.if ${MK_GCC} != "no" && ${MK_CLANG_IS_CC} == "no"
+.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98")
_gcc_tools= gnu/usr.bin/cc/cc_tools
.endif
@@ -1190,7 +1190,7 @@ _clang= usr.bin/clang
_clang_libs= lib/clang
.endif
-.if ${MK_GCC} != "no" && ${MK_CLANG_IS_CC} == "no"
+.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98")
_cc= gnu/usr.bin/cc
.endif
Modified: stable/9/sys/boot/pc98/boot2/Makefile
==============================================================================
--- stable/9/sys/boot/pc98/boot2/Makefile Sat Nov 17 21:55:49 2012 (r243189)
+++ stable/9/sys/boot/pc98/boot2/Makefile Sat Nov 17 22:40:18 2012 (r243190)
@@ -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: stable/9/sys/boot/pc98/cdboot/Makefile
==============================================================================
--- stable/9/sys/boot/pc98/cdboot/Makefile Sat Nov 17 21:55:49 2012 (r243189)
+++ stable/9/sys/boot/pc98/cdboot/Makefile Sat Nov 17 22:40:18 2012 (r243190)
@@ -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}}
More information about the svn-src-stable
mailing list