[vmkit-commits] [vmkit] r141109 - in /vmkit/trunk: Makefile.common.in include/debug.h mmtk/mmtk-j3/Lock.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue Oct  4 15:36:48 2011
New Revision: 141109

URL: http://llvm.org/viewvc/llvm-project?rev=141109&view=rev
Log:
Fix vmkit build after llvm trunk changes.


Modified:
    vmkit/trunk/Makefile.common.in
    vmkit/trunk/include/debug.h
    vmkit/trunk/mmtk/mmtk-j3/Lock.cpp

Modified: vmkit/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.common.in?rev=141109&r1=141108&r2=141109&view=diff
==============================================================================
--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Tue Oct  4 15:36:48 2011
@@ -21,6 +21,9 @@
 # Define BYTECODE_LIBRARY before including LLVM's Makefile.common to get
 # dependencies right.
 BYTECODE_LIBRARY = 1
+LLVMCC_OPTION = "clang"
+ENABLE_BUILT_CLANG = 1
+LLVMCC_EMITIR_FLAG = "-emit-llvm"
 
 ifeq ($(BUILD_FRAMETABLE), 1)
   BUILT_SOURCES = FrametablesSymbols.inc FrametablesExterns.inc

Modified: vmkit/trunk/include/debug.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/debug.h?rev=141109&r1=141108&r2=141109&view=diff
==============================================================================
--- vmkit/trunk/include/debug.h (original)
+++ vmkit/trunk/include/debug.h Tue Oct  4 15:36:48 2011
@@ -77,6 +77,7 @@
 
 #undef ALWAYS_INLINE
 #define ALWAYS_INLINE __attribute__ ((always_inline))
+#define NO_INLINE __attribute__ ((noinline))
 
 #ifndef DEBUG
 #ifdef _DEBUG

Modified: vmkit/trunk/mmtk/mmtk-j3/Lock.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Lock.cpp?rev=141109&r1=141108&r2=141109&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Lock.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Lock.cpp Tue Oct  4 15:36:48 2011
@@ -13,6 +13,7 @@
 
 namespace mmtk {
 
+extern "C" void Java_org_j3_mmtk_Lock_acquire__(MMTkLock* l) NO_INLINE;
 extern "C" void Java_org_j3_mmtk_Lock_acquire__(MMTkLock* l) {
   for (uint32 count = 0; count < 1000; ++count) {
     uint32 res = __sync_val_compare_and_swap(&(l->state), 0, 1);