From owner-svn-src-all@FreeBSD.ORG  Tue Jun 29 19:07:45 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 1DE11106566C;
	Tue, 29 Jun 2010 19:07:45 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D97E8FC08;
	Tue, 29 Jun 2010 19:07:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5TJ7ias010503;
	Tue, 29 Jun 2010 19:07:44 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5TJ7itx010501;
	Tue, 29 Jun 2010 19:07:44 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201006291907.o5TJ7itx010501@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Tue, 29 Jun 2010 19:07:44 +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: r209591 - head/sys/powerpc/include
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Tue, 29 Jun 2010 19:07:45 -0000

Author: marcel
Date: Tue Jun 29 19:07:44 2010
New Revision: 209591
URL: http://svn.freebsd.org/changeset/base/209591

Log:
  Fix profiling (part 1):
  o   Functions are 4-byte aligned for Book-E.
  o   We get compiled with -DPROF and not -DGPROF if profiling
      is enabled.

Modified:
  head/sys/powerpc/include/asm.h
  head/sys/powerpc/include/profile.h

Modified: head/sys/powerpc/include/asm.h
==============================================================================
--- head/sys/powerpc/include/asm.h	Tue Jun 29 17:10:55 2010	(r209590)
+++ head/sys/powerpc/include/asm.h	Tue Jun 29 19:07:44 2010	(r209591)
@@ -63,7 +63,7 @@
 #define	_ENTRY(x) \
 	.text; .align 4; .globl x; .type x,@function; x:
 
-#ifdef GPROF
+#ifdef PROF
 # define	_PROF_PROLOGUE	mflr 0; stw 0,4(1); bl _mcount
 #else
 # define	_PROF_PROLOGUE

Modified: head/sys/powerpc/include/profile.h
==============================================================================
--- head/sys/powerpc/include/profile.h	Tue Jun 29 17:10:55 2010	(r209590)
+++ head/sys/powerpc/include/profile.h	Tue Jun 29 19:07:44 2010	(r209591)
@@ -34,7 +34,7 @@
 
 #define	_MCOUNT_DECL	void __mcount
 
-#define FUNCTION_ALIGNMENT 16
+#define	FUNCTION_ALIGNMENT	4
 
 typedef u_int	fptrdiff_t;