From owner-svn-src-head@FreeBSD.ORG  Tue Jan  3 19:41:37 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4AB52106566C;
	Tue,  3 Jan 2012 19:41:37 +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 39E418FC12;
	Tue,  3 Jan 2012 19:41:37 +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 q03JfbBS039429;
	Tue, 3 Jan 2012 19:41:37 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q03JfboX039426;
	Tue, 3 Jan 2012 19:41:37 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201201031941.q03JfboX039426@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Tue, 3 Jan 2012 19:41:37 +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: r229413 - in head/contrib/compiler-rt: . lib
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jan 2012 19:41:37 -0000

Author: ed
Date: Tue Jan  3 19:41:36 2012
New Revision: 229413
URL: http://svn.freebsd.org/changeset/base/229413

Log:
  Import compiler-rt r147467.
  
  The compiler-rt shipped with FreeBSD is now based on unmodified upstream
  sources.

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

Modified: head/contrib/compiler-rt/LICENSE.TXT
==============================================================================
--- head/contrib/compiler-rt/LICENSE.TXT	Tue Jan  3 19:39:27 2012	(r229412)
+++ head/contrib/compiler-rt/LICENSE.TXT	Tue Jan  3 19:41:36 2012	(r229413)
@@ -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: head/contrib/compiler-rt/lib/trampoline_setup.c
==============================================================================
--- head/contrib/compiler-rt/lib/trampoline_setup.c	Tue Jan  3 19:39:27 2012	(r229412)
+++ head/contrib/compiler-rt/lib/trampoline_setup.c	Tue Jan  3 19:41:36 2012	(r229413)
@@ -44,4 +44,4 @@ void __trampoline_setup(uint32_t* trampO
     /* clear instruction cache */
     __clear_cache(trampOnStack, &trampOnStack[10]);
 }
-#endif /* __ppc__ */
+#endif /* __ppc__ && !defined(__powerpc64__) */