From owner-svn-src-all@FreeBSD.ORG Fri Jan 20 18:49:48 2012 Return-Path: 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 49557106566C; Fri, 20 Jan 2012 18:49:48 +0000 (UTC) (envelope-from andreast@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 336CE8FC15; Fri, 20 Jan 2012 18:49:48 +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 q0KInmVC054088; Fri, 20 Jan 2012 18:49:48 GMT (envelope-from andreast@svn.freebsd.org) Received: (from andreast@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0KInmic054086; Fri, 20 Jan 2012 18:49:48 GMT (envelope-from andreast@svn.freebsd.org) Message-Id: <201201201849.q0KInmic054086@svn.freebsd.org> From: Andreas Tobler Date: Fri, 20 Jan 2012 18:49:48 +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: r230390 - 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jan 2012 18:49:48 -0000 Author: andreast Date: Fri Jan 20 18:49:47 2012 New Revision: 230390 URL: http://svn.freebsd.org/changeset/base/230390 Log: Disable GUPROF on archs other than i386/amd64 since the fine details are not implemented. Modified: head/sys/conf/kern.pre.mk Modified: head/sys/conf/kern.pre.mk ============================================================================== --- head/sys/conf/kern.pre.mk Fri Jan 20 17:25:15 2012 (r230389) +++ head/sys/conf/kern.pre.mk Fri Jan 20 18:49:47 2012 (r230390) @@ -103,11 +103,14 @@ ASM_CFLAGS= -x assembler-with-cpp -DLOCO .if defined(PROFLEVEL) && ${PROFLEVEL} >= 1 CFLAGS+= -DGPROF -falign-functions=16 +PROF= -pg .if ${PROFLEVEL} >= 2 CFLAGS+= -DGPROF4 -DGUPROF -PROF= -pg -mprofiler-epilogue +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" +PROF+= -mprofiler-epilogue .else -PROF= -pg +.error "GUPROF not supported on ${MACHINE_CPUARCH}." +.endif .endif .endif DEFINED_PROF= ${PROF}