svn commit: r243042 - stable/9/sys/conf

[Dimitry Andric]

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}