From owner-svn-src-head@FreeBSD.ORG  Mon May  2 21:32:19 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 1233)
	id 05A751065670; Mon,  2 May 2011 21:32:19 +0000 (UTC)
Date: Mon, 2 May 2011 21:32:19 +0000
From: Alexander Best <arundel@freebsd.org>
To: Dimitry Andric <dim@FreeBSD.org>
Message-ID: <20110502213218.GA86377@freebsd.org>
References: <201105022113.p42LD8TH055002@svn.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201105022113.p42LD8TH055002@svn.freebsd.org>
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r221348 - head/sys/boot/i386/boot2
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: Mon, 02 May 2011 21:32:19 -0000

On Mon May  2 11, Dimitry Andric wrote:
> Author: dim
> Date: Mon May  2 21:13:08 2011
> New Revision: 221348
> URL: http://svn.freebsd.org/changeset/base/221348
> 
> Log:
>   Clang r130700 can now compile sys/boot/i386/boot2 with room to spare.

congratulations! everybody hanging out in #freebsd-clang knows how hard all of
you guys have been working on this and persuading the llvm devs to look into
the issues.

alex

> 
> Modified:
>   head/sys/boot/i386/boot2/Makefile
> 
> Modified: head/sys/boot/i386/boot2/Makefile
> ==============================================================================
> --- head/sys/boot/i386/boot2/Makefile	Mon May  2 21:10:13 2011	(r221347)
> +++ head/sys/boot/i386/boot2/Makefile	Mon May  2 21:13:08 2011	(r221348)
> @@ -2,9 +2,6 @@
>  
>  .include <bsd.own.mk>
>  
> -# XXX: clang can compile the boot code just fine, but boot2 gets too big
> -CC:=${CC:C/^(.*\/)?clang$/gcc/1}
> -
>  FILES=		boot boot1 boot2
>  
>  NM?=		nm
> @@ -45,6 +42,12 @@ CFLAGS=	-Os \
>  	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
>  	-Winline --param max-inline-insns-single=100
>  
> +.if ${CC:T:Mclang} == "clang"
> +CFLAGS+=	-mllvm -stack-alignment=8 -mllvm -inline-threshold=3
> +# XXX: clang integrated-as doesn't grok .codeNN directives yet
> +CFLAGS+=	${.IMPSRC:T:Mboot1.S:C/^.+$/-no-integrated-as/}
> +.endif
> +
>  LDFLAGS=-static -N --gc-sections
>  
>  # Pick up ../Makefile.inc early.

-- 
a13x