From owner-svn-src-all@FreeBSD.ORG  Wed Nov  7 22:15:28 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A1FB1ECC;
 Wed,  7 Nov 2012 22:15:28 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 867868FC12;
 Wed,  7 Nov 2012 22:15:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA7MFSVV017267;
 Wed, 7 Nov 2012 22:15:28 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA7MFSYX017265;
 Wed, 7 Nov 2012 22:15:28 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201211072215.qA7MFSYX017265@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 7 Nov 2012 22:15:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242715 - head/sys/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Wed, 07 Nov 2012 22:15:28 -0000

Author: dim
Date: Wed Nov  7 22:15:28 2012
New Revision: 242715
URL: http://svnweb.freebsd.org/changeset/base/242715

Log:
  For kernel builds with PROFLEVEL >= 1, such as LINT, don't attempt to
  use the -falign-functions option if the compiler is clang, as the flag
  is not supported.
  
  MFC after:	1 week

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

Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk	Wed Nov  7 22:11:38 2012	(r242714)
+++ head/sys/conf/kern.pre.mk	Wed Nov  7 22:15:28 2012	(r242715)
@@ -102,7 +102,10 @@ CLANG_NO_IAS= -no-integrated-as
 .endif
 
 .if defined(PROFLEVEL) && ${PROFLEVEL} >= 1
-CFLAGS+=	-DGPROF -falign-functions=16
+CFLAGS+=	-DGPROF
+.if ${COMPILER_TYPE} != "clang"
+CFLAGS+=	-falign-functions=16
+.endif
 .if ${PROFLEVEL} >= 2
 CFLAGS+=	-DGPROF4 -DGUPROF
 PROF=	-pg -mprofiler-epilogue