From owner-svn-src-user@FreeBSD.ORG  Fri Nov  5 13:46:58 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A4410106566B;
	Fri,  5 Nov 2010 13:46:58 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 930338FC14;
	Fri,  5 Nov 2010 13:46:58 +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 oA5DkwFE098783;
	Fri, 5 Nov 2010 13:46:58 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA5DkwX0098781;
	Fri, 5 Nov 2010 13:46:58 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201011051346.oA5DkwX0098781@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Fri, 5 Nov 2010 13:46:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214838 - user/ed/compiler-rt/contrib/compiler-rt/lib
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Nov 2010 13:46:58 -0000

Author: ed
Date: Fri Nov  5 13:46:58 2010
New Revision: 214838
URL: http://svn.freebsd.org/changeset/base/214838

Log:
  Disable trampoline_setup() on PPC64.

Modified:
  user/ed/compiler-rt/contrib/compiler-rt/lib/trampoline_setup.c

Modified: user/ed/compiler-rt/contrib/compiler-rt/lib/trampoline_setup.c
==============================================================================
--- user/ed/compiler-rt/contrib/compiler-rt/lib/trampoline_setup.c	Fri Nov  5 13:45:26 2010	(r214837)
+++ user/ed/compiler-rt/contrib/compiler-rt/lib/trampoline_setup.c	Fri Nov  5 13:46:58 2010	(r214838)
@@ -23,7 +23,7 @@ extern void __clear_cache(void* start, v
  * and then jumps to the target nested function.
  */
 
-#if __ppc__
+#if __ppc__ && !defined(__powerpc64__)
 void __trampoline_setup(uint32_t* trampOnStack, int trampSizeAllocated, 
                                 const void* realFunc, void* localsPtr)
 {