[vmkit-commits] [vmkit] r134147 - in /vmkit/trunk: Makefile.common.in Makefile.config.in include/mvm/Threads/Locks.h include/mvm/VirtualMachine.h lib/J3/Compiler/JavaLLVMCompiler.cpp lib/Mvm/CommonThread/ctthread.cpp mmtk/mmtk-alloc/Makefile mmtk/mmtk-j3/Makefile
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Thu Jun 30 05:56:48 PDT 2011
Author: geoffray
Date: Thu Jun 30 07:56:47 2011
New Revision: 134147
URL: http://llvm.org/viewvc/llvm-project?rev=134147&view=rev
Log:
Remove all references of WITH_LLVM_GCC, now that it is required to have it.
Modified:
vmkit/trunk/Makefile.common.in
vmkit/trunk/Makefile.config.in
vmkit/trunk/include/mvm/Threads/Locks.h
vmkit/trunk/include/mvm/VirtualMachine.h
vmkit/trunk/lib/J3/Compiler/JavaLLVMCompiler.cpp
vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp
vmkit/trunk/mmtk/mmtk-alloc/Makefile
vmkit/trunk/mmtk/mmtk-j3/Makefile
Modified: vmkit/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.common.in?rev=134147&r1=134146&r2=134147&view=diff
==============================================================================
--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Thu Jun 30 07:56:47 2011
@@ -20,9 +20,7 @@
# Define BYTECODE_LIBRARY before including LLVM's Makefile.common to get
# dependencies right.
-ifeq ($(WITH_LLVM_GCC), 1)
- BYTECODE_LIBRARY = 1
-endif
+BYTECODE_LIBRARY = 1
# Include LLVM's Master Makefile.
include $(LLVM_OBJ_ROOT)/Makefile.common
Modified: vmkit/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.config.in?rev=134147&r1=134146&r2=134147&view=diff
==============================================================================
--- vmkit/trunk/Makefile.config.in (original)
+++ vmkit/trunk/Makefile.config.in Thu Jun 30 07:56:47 2011
@@ -15,6 +15,5 @@
SERVICE_BUILD = @SERVICE_BUILD@
SINGLE_BUILD = @SINGLE_BUILD@
WITH_64 = @WITH_64@
-WITH_LLVM_GCC = @WITH_LLVM_GCC@
ANT = @ANT@
Modified: vmkit/trunk/include/mvm/Threads/Locks.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/Threads/Locks.h?rev=134147&r1=134146&r2=134147&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/Threads/Locks.h (original)
+++ vmkit/trunk/include/mvm/Threads/Locks.h Thu Jun 30 07:56:47 2011
@@ -16,12 +16,8 @@
#include "mvm/Threads/Thread.h"
-#ifdef WITH_LLVM_GCC
extern "C" void __llvm_gcroot(void**, void*) __attribute__((nothrow));
#define llvm_gcroot(a, b) __llvm_gcroot((void**)&a, b)
-#else
-#define llvm_gcroot(a, b)
-#endif
class gc;
Modified: vmkit/trunk/include/mvm/VirtualMachine.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/VirtualMachine.h?rev=134147&r1=134146&r2=134147&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/VirtualMachine.h (original)
+++ vmkit/trunk/include/mvm/VirtualMachine.h Thu Jun 30 07:56:47 2011
@@ -196,11 +196,7 @@
/// rendezvous - The rendezvous implementation for garbage collection.
///
-#ifdef WITH_LLVM_GCC
CooperativeCollectionRV rendezvous;
-#else
- UncooperativeCollectionRV rendezvous;
-#endif
//===----------------------------------------------------------------------===//
// (3) Backtrace-related methods.
Modified: vmkit/trunk/lib/J3/Compiler/JavaLLVMCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaLLVMCompiler.cpp?rev=134147&r1=134146&r2=134147&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaLLVMCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaLLVMCompiler.cpp Thu Jun 30 07:56:47 2011
@@ -30,11 +30,7 @@
JavaIntrinsics(TheModule) {
enabledException = true;
-#ifdef WITH_LLVM_GCC
cooperativeGC = true;
-#else
- cooperativeGC = false;
-#endif
initialiseAssessorInfo();
}
Modified: vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp?rev=134147&r1=134146&r2=134147&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp (original)
+++ vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp Thu Jun 30 07:56:47 2011
@@ -210,7 +210,6 @@
}
-#ifdef WITH_LLVM_GCC
void Thread::scanStack(uintptr_t closure) {
StackWalker Walker(this);
while (MethodInfo* MI = Walker.get()) {
@@ -219,22 +218,6 @@
}
}
-#else
-
-void Thread::scanStack(uintptr_t closure) {
- register unsigned int **max = (unsigned int**)(void*)this->baseSP;
- if (mvm::Thread::get() != this) {
- register unsigned int **cur = (unsigned int**)this->waitOnSP();
- for(; cur<max; cur++) Collector::scanObject((void**)cur, closure);
- } else {
- jmp_buf buf;
- setjmp(buf);
- register unsigned int **cur = (unsigned int**)&buf;
- for(; cur<max; cur++) Collector::scanObject((void**)cur, closure);
- }
-}
-#endif
-
void Thread::enterUncooperativeCode(unsigned level) {
if (isMvmThread()) {
if (!inRV) {
Modified: vmkit/trunk/mmtk/mmtk-alloc/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-alloc/Makefile?rev=134147&r1=134146&r2=134147&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-alloc/Makefile (original)
+++ vmkit/trunk/mmtk/mmtk-alloc/Makefile Thu Jun 30 07:56:47 2011
@@ -1,4 +1,4 @@
-##===- mmtk/mmtk-j3/Makefile -------------------------------*- Makefile -*-===##
+##===- mmtk/mmtk-alloc/Makefile ----------------------------*- Makefile -*-===##
#
# The vmkit project
#
@@ -11,12 +11,7 @@
include $(LEVEL)/Makefile.config
-ifeq ($(WITH_LLVM_GCC), 1)
- MODULE_NAME = MMTKAlloc
-else
- LIBRARYNAME = MMTKAlloc
-endif
-
+MODULE_NAME = MMTKAlloc
LOADABLE_MODULE = 1
USEDLIBS =
Modified: vmkit/trunk/mmtk/mmtk-j3/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Makefile?rev=134147&r1=134146&r2=134147&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Makefile (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Makefile Thu Jun 30 07:56:47 2011
@@ -11,12 +11,7 @@
include $(LEVEL)/Makefile.config
-ifeq ($(WITH_LLVM_GCC), 1)
- MODULE_NAME = MMTKRuntime
-else
- LIBRARYNAME = MMTKRuntime
-endif
-
+MODULE_NAME = MMTKRuntime
LOADABLE_MODULE = 1
USEDLIBS =
More information about the vmkit-commits
mailing list