From owner-svn-src-all@FreeBSD.ORG  Fri Jun 29 18:09:39 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DE1B41065670;
	Fri, 29 Jun 2012 18:09:39 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C7A9A8FC12;
	Fri, 29 Jun 2012 18:09:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5TI9d8O062065;
	Fri, 29 Jun 2012 18:09:39 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5TI9dk1062063;
	Fri, 29 Jun 2012 18:09:39 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201206291809.q5TI9dk1062063@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 29 Jun 2012 18:09:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237812 - stable/9/sys/boot/i386/cdboot
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jun 2012 18:09:40 -0000

Author: dim
Date: Fri Jun 29 18:09:39 2012
New Revision: 237812
URL: http://svn.freebsd.org/changeset/base/237812

Log:
  MFC r235281:
  
  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.

Modified:
  stable/9/sys/boot/i386/cdboot/Makefile
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/boot/   (props changed)

Modified: stable/9/sys/boot/i386/cdboot/Makefile
==============================================================================
--- stable/9/sys/boot/i386/cdboot/Makefile	Fri Jun 29 17:39:40 2012	(r237811)
+++ stable/9/sys/boot/i386/cdboot/Makefile	Fri Jun 29 18:09:39 2012	(r237812)
@@ -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}}