From owner-svn-src-head@FreeBSD.ORG  Fri May 11 18:07:23 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F0E77106566B;
	Fri, 11 May 2012 18:07:23 +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 DD0E98FC12;
	Fri, 11 May 2012 18:07:23 +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 q4BI7N3S094426;
	Fri, 11 May 2012 18:07:23 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4BI7N6p094425;
	Fri, 11 May 2012 18:07:23 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201205111807.q4BI7N6p094425@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 11 May 2012 18:07:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235281 - head/sys/boot/i386/cdboot
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 May 2012 18:07:24 -0000

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}}