summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Wilson <bob.wilson@apple.com>2012-01-03 18:59:25 +0000
committerBob Wilson <bob.wilson@apple.com>2012-01-03 18:59:25 +0000
commita98b7cb0d0cd310255a405707b6d5c6c4a953ce7 (patch)
treeaa0caac956e3db37007baf3e0e66b6dfe8630fd6
parent75a39231763408bf6ed72eede6781a6d0e1f438c (diff)
downloadcompiler-rt-a98b7cb0d0cd310255a405707b6d5c6c4a953ce7.tar.gz
compiler-rt-a98b7cb0d0cd310255a405707b6d5c6c4a953ce7.tar.bz2
compiler-rt-a98b7cb0d0cd310255a405707b6d5c6c4a953ce7.tar.xz
Fix missing include of int_lib.h and ppc ifdef for FreeBSD.
Patch provided by Ed Schouten! git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@147458 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/clear_cache.c2
-rw-r--r--lib/trampoline_setup.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/clear_cache.c b/lib/clear_cache.c
index fdd33163..b934fd4b 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 1b139767..e0765b16 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__) */