From owner-svn-src-head@FreeBSD.ORG  Fri May 11 19:57:26 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 20AB41065749;
	Fri, 11 May 2012 19:57:26 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140])
	by mx1.freebsd.org (Postfix) with ESMTP id CD3198FC19;
	Fri, 11 May 2012 19:57:24 +0000 (UTC)
Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua
	[212.40.38.100])
	by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id WAA22563;
	Fri, 11 May 2012 22:57:23 +0300 (EEST)
	(envelope-from avg@FreeBSD.org)
Received: from localhost ([127.0.0.1])
	by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD))
	id 1SSvxr-0004vX-2D; Fri, 11 May 2012 22:57:23 +0300
Message-ID: <4FAD6F22.500@FreeBSD.org>
Date: Fri, 11 May 2012 22:57:22 +0300
From: Andriy Gapon <avg@FreeBSD.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
	rv:12.0) Gecko/20120503 Thunderbird/12.0.1
MIME-Version: 1.0
To: Dimitry Andric <dim@FreeBSD.org>
References: <201205111807.q4BI7N6p094425@svn.freebsd.org>
In-Reply-To: <201205111807.q4BI7N6p094425@svn.freebsd.org>
X-Enigmail-Version: 1.5pre
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
	src-committers@FreeBSD.org
Subject: Re: 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 19:57:26 -0000

on 11/05/2012 21:07 Dimitry Andric said the following:
> 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

Thank you!
Please ping me when the MFC time comes, so that I won't forget to bundle this
commit into the MFC of the original/offending commit.

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


-- 
Andriy Gapon