svn commit: r237812 - stable/9/sys/boot/i386/cdboot

[Andriy Gapon]

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