[llvm-commits] [compiler-rt] r147458 - in /compiler-rt/trunk/lib: clear_cache.c trampoline_setup.c

[Bob Wilson]

Author: bwilson
Date: Tue Jan  3 12:59:25 2012
New Revision: 147458

URL: http://llvm.org/viewvc/llvm-project?rev=147458&view=rev
Log:
Fix missing include of int_lib.h and ppc ifdef for FreeBSD.
Patch provided by Ed Schouten!

Modified:
    compiler-rt/trunk/lib/clear_cache.c
    compiler-rt/trunk/lib/trampoline_setup.c

Modified: compiler-rt/trunk/lib/clear_cache.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/clear_cache.c?rev=147458&r1=147457&r2=147458&view=diff
==============================================================================
--- compiler-rt/trunk/lib/clear_cache.c (original)
+++ compiler-rt/trunk/lib/clear_cache.c Tue Jan  3 12:59:25 2012
@@ -8,6 +8,8 @@
  * ===----------------------------------------------------------------------===
  */
 
+#include "int_lib.h"
+
 #if __APPLE__
   #include <libkern/OSCacheControl.h>
 #endif

Modified: compiler-rt/trunk/lib/trampoline_setup.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/trampoline_setup.c?rev=147458&r1=147457&r2=147458&view=diff
==============================================================================
--- compiler-rt/trunk/lib/trampoline_setup.c (original)
+++ compiler-rt/trunk/lib/trampoline_setup.c Tue Jan  3 12:59:25 2012
@@ -20,7 +20,7 @@
  * 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 @@
     /* clear instruction cache */
     __clear_cache(trampOnStack, &trampOnStack[10]);
 }
-#endif /* __ppc__ */
+#endif /* __ppc__ && !defined(__powerpc64__) */