From owner-svn-src-all@FreeBSD.ORG  Sat Dec 24 19:01:31 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E4FD4106564A;
	Sat, 24 Dec 2011 19:01:31 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D42838FC0C;
	Sat, 24 Dec 2011 19:01:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBOJ1Vd3025367;
	Sat, 24 Dec 2011 19:01:31 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBOJ1VFN025365;
	Sat, 24 Dec 2011 19:01:31 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201112241901.pBOJ1VFN025365@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 24 Dec 2011 19:01:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228868 - head/sys/conf
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Dec 2011 19:01:32 -0000

Author: dim
Date: Sat Dec 24 19:01:31 2011
New Revision: 228868
URL: http://svn.freebsd.org/changeset/base/228868

Log:
  When building the kernel for amd64 with clang, don't attempt to use the
  -frename-registers option, as it is not supported.  No change for builds
  with gcc.
  
  MFC after:	1 week

Modified:
  head/sys/conf/kern.pre.mk

Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk	Sat Dec 24 18:57:42 2011	(r228867)
+++ head/sys/conf/kern.pre.mk	Sat Dec 24 19:01:31 2011	(r228868)
@@ -34,8 +34,12 @@ _MINUS_O=	-O2
 .endif
 .endif
 .if ${MACHINE_CPUARCH} == "amd64"
+.if ${CC:T:Mclang} != "clang"
 COPTFLAGS?=-O2 -frename-registers -pipe
 .else
+COPTFLAGS?=-O2 -pipe
+.endif
+.else
 COPTFLAGS?=${_MINUS_O} -pipe
 .endif
 .if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)