diff options
| author | ed <ed@FreeBSD.org> | 2012-01-03 19:38:56 +0000 |
|---|---|---|
| committer | ed <ed@FreeBSD.org> | 2012-01-03 19:38:56 +0000 |
| commit | 07af089f1449ec5506ca7ede5b593e11a0f48603 (patch) | |
| tree | aa0caac956e3db37007baf3e0e66b6dfe8630fd6 | |
| parent | 6a5f9bc9ae3205be8bb5570b86a509fcd01a9db6 (diff) | |
| download | FreeBSD-src-07af089f1449ec5506ca7ede5b593e11a0f48603.zip FreeBSD-src-07af089f1449ec5506ca7ede5b593e11a0f48603.tar.gz | |
Import compiler-rt r147467.
| -rw-r--r-- | LICENSE.TXT | 4 | ||||
| -rw-r--r-- | lib/clear_cache.c | 2 | ||||
| -rw-r--r-- | lib/trampoline_setup.c | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/LICENSE.TXT b/LICENSE.TXT index 488baf5..c41925e 100644 --- a/LICENSE.TXT +++ b/LICENSE.TXT @@ -14,7 +14,7 @@ Full text of the relevant licenses is included below. 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 diff --git a/lib/clear_cache.c b/lib/clear_cache.c index fdd3316..b934fd4 100644 --- a/lib/clear_cache.c +++ b/lib/clear_cache.c @@ -8,6 +8,8 @@ * ===----------------------------------------------------------------------=== */ +#include "int_lib.h" + #if __APPLE__ #include <libkern/OSCacheControl.h> #endif diff --git a/lib/trampoline_setup.c b/lib/trampoline_setup.c index 1b13976..e0765b1 100644 --- a/lib/trampoline_setup.c +++ b/lib/trampoline_setup.c @@ -20,7 +20,7 @@ extern void __clear_cache(void* start, void* end); * 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* trampOnStack, int trampSizeAllocated, /* clear instruction cache */ __clear_cache(trampOnStack, &trampOnStack[10]); } -#endif /* __ppc__ */ +#endif /* __ppc__ && !defined(__powerpc64__) */ |
