diff options
| author | dim <dim@FreeBSD.org> | 2012-11-07 19:51:53 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2012-11-07 19:51:53 +0000 |
| commit | 6c41b57d31e5ade965d7874727dfe3efd3790ee5 (patch) | |
| tree | 82e3f8dadbdd85a2aa7df611a16f2423d2b6ec9d /sys/boot/pc98 | |
| parent | bbb1601ed6732dace0e76d185b7a8ab6b7ea7047 (diff) | |
| download | FreeBSD-src-6c41b57d31e5ade965d7874727dfe3efd3790ee5.zip FreeBSD-src-6c41b57d31e5ade965d7874727dfe3efd3790ee5.tar.gz | |
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
Diffstat (limited to 'sys/boot/pc98')
| -rw-r--r-- | sys/boot/pc98/boot2/Makefile | 2 | ||||
| -rw-r--r-- | sys/boot/pc98/cdboot/Makefile | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sys/boot/pc98/boot2/Makefile b/sys/boot/pc98/boot2/Makefile index 18bf251..00a28de 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 eec1328..bcce0ef 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}} |
