summaryrefslogtreecommitdiffstats
path: root/sys/boot/i386
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2012-05-11 18:07:23 +0000
committerdim <dim@FreeBSD.org>2012-05-11 18:07:23 +0000
commit6ff35979dbedbf4ec7dc290fc5c941329744bf37 (patch)
tree593e8197ba8cfa9de99ab3383fde4374b4f63097 /sys/boot/i386
parent2342ad7e9eb2d6a46b83914324bbd660ae04dcfb (diff)
downloadFreeBSD-src-6ff35979dbedbf4ec7dc290fc5c941329744bf37.zip
FreeBSD-src-6ff35979dbedbf4ec7dc290fc5c941329744bf37.tar.gz
Fix sys/boot/i386/cdboot/cdboot.S compilation with clang after r235219.
This file uses .code16 directives, which are not yet supported by clang's integrated assembler. MFC after: 1 month
Diffstat (limited to 'sys/boot/i386')
-rw-r--r--sys/boot/i386/cdboot/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/boot/i386/cdboot/Makefile b/sys/boot/i386/cdboot/Makefile
index fe370bc..f352d69 100644
--- a/sys/boot/i386/cdboot/Makefile
+++ b/sys/boot/i386/cdboot/Makefile
@@ -13,3 +13,7 @@ ORG= 0x7c00
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}}
OpenPOWER on IntegriCloud