From owner-svn-src-stable-9@FreeBSD.ORG  Mon Jan  2 13:21:35 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 613D9106566B;
	Mon,  2 Jan 2012 13:21:35 +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 4FD068FC12;
	Mon,  2 Jan 2012 13:21:35 +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 q02DLZjT068730;
	Mon, 2 Jan 2012 13:21:35 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q02DLZuo068728;
	Mon, 2 Jan 2012 13:21:35 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201201021321.q02DLZuo068728@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 2 Jan 2012 13:21:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229280 - stable/9/sys/conf
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jan 2012 13:21:35 -0000

Author: dim
Date: Mon Jan  2 13:21:34 2012
New Revision: 229280
URL: http://svn.freebsd.org/changeset/base/229280

Log:
  MFC r228868:
  
  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.

Modified:
  stable/9/sys/conf/kern.pre.mk
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/conf/   (props changed)

Modified: stable/9/sys/conf/kern.pre.mk
==============================================================================
--- stable/9/sys/conf/kern.pre.mk	Mon Jan  2 13:20:01 2012	(r229279)
+++ stable/9/sys/conf/kern.pre.mk	Mon Jan  2 13:21:34 2012	(r229280)
@@ -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)