Date: Tue, 3 Jan 2012 19:38:57 +0000 (UTC) From: Ed Schouten <ed@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r229411 - in vendor/compiler-rt/dist: . lib Message-ID: <201201031938.q03Jcvws039260@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <libkern/OSCacheControl.h> #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__) */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201031938.q03Jcvws039260>