From owner-svn-src-all@FreeBSD.ORG Fri Jun 29 19:48:05 2012 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5F618106566B; Fri, 29 Jun 2012 19:48:05 +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 DDBE48FC08; Fri, 29 Jun 2012 19:48:03 +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 WAA10174; Fri, 29 Jun 2012 22:48:02 +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 1SkhAg-0005Bo-0L; Fri, 29 Jun 2012 22:48:02 +0300 Message-ID: <4FEE0670.6000306@FreeBSD.org> Date: Fri, 29 Jun 2012 22:48:00 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:13.0) Gecko/20120620 Thunderbird/13.0.1 MIME-Version: 1.0 To: Dimitry Andric References: <201206291809.q5TI9dk1062063@svn.freebsd.org> In-Reply-To: <201206291809.q5TI9dk1062063@svn.freebsd.org> X-Enigmail-Version: 1.4.2 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, svn-src-stable-9@FreeBSD.org Subject: Re: 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2012 19:48:05 -0000 on 29/06/2012 21:09 Dimitry Andric said the following: > 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. Sorry and thank you again. I should have remembered this problem and this fix, but MFC timeout was too long for my memory. > 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 > + > +# XXX: clang integrated-as doesn't grok .codeNN directives yet > +CFLAGS.cdboot.S= ${CLANG_NO_IAS} > +CFLAGS+= ${CFLAGS.${.IMPSRC:T}} > -- Andriy Gapon