From owner-svn-src-stable@FreeBSD.ORG  Wed Nov 14 20:32:43 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E68D3852;
 Wed, 14 Nov 2012 20:32:43 +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 C840A8FC08;
 Wed, 14 Nov 2012 20:32:43 +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 qAEKWhhl046846;
 Wed, 14 Nov 2012 20:32:43 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAEKWhLq046845;
 Wed, 14 Nov 2012 20:32:43 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201211142032.qAEKWhLq046845@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 14 Nov 2012 20:32:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r243042 - stable/9/sys/conf
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Nov 2012 20:32:44 -0000

Author: dim
Date: Wed Nov 14 20:32:43 2012
New Revision: 243042
URL: http://svnweb.freebsd.org/changeset/base/243042

Log:
  MFC r242715:
  
    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 r242717:
  
    For kernel builds with PROFLEVEL >= 2, such as LINT, don't attempt to
    use the -mprofiler-epilogue option if the compiler is clang, as the flag
    is not supported.  While here, fix up the value indentations.

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	Wed Nov 14 20:27:17 2012	(r243041)
+++ stable/9/sys/conf/kern.pre.mk	Wed Nov 14 20:32:43 2012	(r243042)
@@ -108,12 +108,18 @@ 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
+PROF=		-pg
+.if ${COMPILER_TYPE} != "clang"
+PROF+=		-mprofiler-epilogue
+.endif
 .else
-PROF=	-pg
+PROF=		-pg
 .endif
 .endif
 DEFINED_PROF=	${PROF}