Date: Fri, 29 Jun 2012 22:48:00 +0300 From: Andriy Gapon <avg@FreeBSD.org> To: Dimitry Andric <dim@FreeBSD.org> 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 Message-ID: <4FEE0670.6000306@FreeBSD.org> In-Reply-To: <201206291809.q5TI9dk1062063@svn.freebsd.org> References: <201206291809.q5TI9dk1062063@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4FEE0670.6000306>