Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 May 2012 18:07:23 +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: r235281 - head/sys/boot/i386/cdboot
Message-ID:  <201205111807.q4BI7N6p094425@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Fri May 11 18:07:23 2012
New Revision: 235281
URL: http://svn.freebsd.org/changeset/base/235281

Log:
  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

Modified:
  head/sys/boot/i386/cdboot/Makefile

Modified: head/sys/boot/i386/cdboot/Makefile
==============================================================================
--- head/sys/boot/i386/cdboot/Makefile	Fri May 11 17:50:51 2012	(r235280)
+++ head/sys/boot/i386/cdboot/Makefile	Fri May 11 18:07:23 2012	(r235281)
@@ -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}}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205111807.q4BI7N6p094425>