Date: Wed, 7 Nov 2012 19:51:53 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> 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 Message-ID: <201211071951.qA7JprrP093321@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211071951.qA7JprrP093321>