From owner-svn-src-all@FreeBSD.ORG Tue Jan 3 19:38:57 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 869A5106566C; Tue, 3 Jan 2012 19:38:57 +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 5B45F8FC18; Tue, 3 Jan 2012 19:38:57 +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 q03Jcv7u039264; Tue, 3 Jan 2012 19:38:57 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q03Jcvws039260; Tue, 3 Jan 2012 19:38:57 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201201031938.q03Jcvws039260@svn.freebsd.org> From: Ed Schouten Date: Tue, 3 Jan 2012 19:38:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r229411 - in vendor/compiler-rt/dist: . lib 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: Tue, 03 Jan 2012 19:38:57 -0000 Author: ed Date: Tue Jan 3 19:38:56 2012 New Revision: 229411 URL: http://svn.freebsd.org/changeset/base/229411 Log: Import compiler-rt r147467. Modified: vendor/compiler-rt/dist/LICENSE.TXT vendor/compiler-rt/dist/lib/clear_cache.c vendor/compiler-rt/dist/lib/trampoline_setup.c Modified: vendor/compiler-rt/dist/LICENSE.TXT ============================================================================== --- vendor/compiler-rt/dist/LICENSE.TXT Tue Jan 3 19:24:33 2012 (r229410) +++ vendor/compiler-rt/dist/LICENSE.TXT Tue Jan 3 19:38:56 2012 (r229411) @@ -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: vendor/compiler-rt/dist/lib/clear_cache.c ============================================================================== --- vendor/compiler-rt/dist/lib/clear_cache.c Tue Jan 3 19:24:33 2012 (r229410) +++ vendor/compiler-rt/dist/lib/clear_cache.c Tue Jan 3 19:38:56 2012 (r229411) @@ -8,6 +8,8 @@ * ===----------------------------------------------------------------------=== */ +#include "int_lib.h" + #if __APPLE__ #include #endif Modified: vendor/compiler-rt/dist/lib/trampoline_setup.c ============================================================================== --- vendor/compiler-rt/dist/lib/trampoline_setup.c Tue Jan 3 19:24:33 2012 (r229410) +++ vendor/compiler-rt/dist/lib/trampoline_setup.c Tue Jan 3 19:38:56 2012 (r229411) @@ -20,7 +20,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) { @@ -44,4 +44,4 @@ void __trampoline_setup(uint32_t* trampO /* clear instruction cache */ __clear_cache(trampOnStack, &trampOnStack[10]); } -#endif /* __ppc__ */ +#endif /* __ppc__ && !defined(__powerpc64__) */