From owner-svn-src-stable@FreeBSD.ORG  Fri May 25 17:56:27 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D7F31106566B;
	Fri, 25 May 2012 17:56:27 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C236E8FC0C;
	Fri, 25 May 2012 17:56:27 +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 q4PHuRp5025225;
	Fri, 25 May 2012 17:56:27 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4PHuRYX025222;
	Fri, 25 May 2012 17:56:27 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201205251756.q4PHuRYX025222@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Fri, 25 May 2012 17:56:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236018 - in stable/9/contrib/compiler-rt: . lib
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 25 May 2012 17:56:28 -0000

Author: marius
Date: Fri May 25 17:56:27 2012
New Revision: 236018
URL: http://svn.freebsd.org/changeset/base/236018

Log:
  MFC: r229413
  
  Import compiler-rt r147467.

Modified:
  stable/9/contrib/compiler-rt/LICENSE.TXT
  stable/9/contrib/compiler-rt/lib/trampoline_setup.c
Directory Properties:
  stable/9/contrib/compiler-rt/   (props changed)

Modified: stable/9/contrib/compiler-rt/LICENSE.TXT
==============================================================================
--- stable/9/contrib/compiler-rt/LICENSE.TXT	Fri May 25 17:53:57 2012	(r236017)
+++ stable/9/contrib/compiler-rt/LICENSE.TXT	Fri May 25 17:56:27 2012	(r236018)
@@ -14,7 +14,7 @@ Full text of the relevant licenses is in
 University of Illinois/NCSA
 Open Source License
 
-Copyright (c) 2009-2010 by the contributors listed in CREDITS.TXT
+Copyright (c) 2009-2012 by the contributors listed in CREDITS.TXT
 
 All rights reserved.
 
@@ -55,7 +55,7 @@ SOFTWARE.
 
 ==============================================================================
 
-Copyright (c) 2009-2010 by the contributors listed in CREDITS.TXT
+Copyright (c) 2009-2012 by the contributors listed in CREDITS.TXT
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Modified: stable/9/contrib/compiler-rt/lib/trampoline_setup.c
==============================================================================
--- stable/9/contrib/compiler-rt/lib/trampoline_setup.c	Fri May 25 17:53:57 2012	(r236017)
+++ stable/9/contrib/compiler-rt/lib/trampoline_setup.c	Fri May 25 17:56:27 2012	(r236018)
@@ -44,4 +44,4 @@ void __trampoline_setup(uint32_t* trampO
     /* clear instruction cache */
     __clear_cache(trampOnStack, &trampOnStack[10]);
 }
-#endif /* __ppc__ */
+#endif /* __ppc__ && !defined(__powerpc64__) */