Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 May 2012 22:57:22 +0300
From:      Andriy Gapon <avg@FreeBSD.org>
To:        Dimitry Andric <dim@FreeBSD.org>
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
Message-ID:  <4FAD6F22.500@FreeBSD.org>
In-Reply-To: <201205111807.q4BI7N6p094425@svn.freebsd.org>
References:  <201205111807.q4BI7N6p094425@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4FAD6F22.500>