[vmkit-commits] [vmkit] r81091 - in /vmkit/trunk: ./ include/mvm/ include/mvm/Threads/ lib/JnJVM/Classpath/ lib/JnJVM/Compiler/ lib/JnJVM/VMCore/ lib/Mvm/Allocator/ lib/Mvm/BoehmGC/ lib/Mvm/CommonThread/ lib/Mvm/Compiler/ lib/Mvm/GCMmap2/ lib/Mvm/Runtime/ lib/N3/Mono/ lib/N3/PNetLib/ lib/N3/VMCore/
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Sat Sep 5 10:58:58 PDT 2009
Author: geoffray
Date: Sat Sep 5 12:58:58 2009
New Revision: 81091
URL: http://llvm.org/viewvc/llvm-project?rev=81091&view=rev
Log:
Generate .bc files when compiling with llvm-gcc.
Modified:
vmkit/trunk/Makefile.common.in
vmkit/trunk/Makefile.config.in
vmkit/trunk/include/mvm/Allocator.h
vmkit/trunk/include/mvm/Threads/Locks.h
vmkit/trunk/lib/JnJVM/Classpath/Makefile
vmkit/trunk/lib/JnJVM/Compiler/Makefile
vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaString.cpp
vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp
vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp
vmkit/trunk/lib/JnJVM/VMCore/Makefile
vmkit/trunk/lib/Mvm/Allocator/Makefile
vmkit/trunk/lib/Mvm/BoehmGC/Makefile
vmkit/trunk/lib/Mvm/CommonThread/Makefile
vmkit/trunk/lib/Mvm/Compiler/Makefile
vmkit/trunk/lib/Mvm/GCMmap2/Makefile
vmkit/trunk/lib/Mvm/Runtime/Makefile
vmkit/trunk/lib/N3/Mono/Makefile
vmkit/trunk/lib/N3/PNetLib/Makefile
vmkit/trunk/lib/N3/VMCore/Makefile
Modified: vmkit/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.common.in?rev=81091&r1=81090&r2=81091&view=diff
==============================================================================
--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Sat Sep 5 12:58:58 2009
@@ -23,7 +23,7 @@
# Include LLVM's Master Makefile.
include $(LLVM_OBJ_ROOT)/Makefile.common
-CXX.Flags += @GC_FLAGS@ @VM_FLAGS@ @EXCEPTION_FLAGS@ -Wno-variadic-macros -fno-omit-frame-pointer -fno-strict-aliasing -Wno-deprecated -ansi -DENABLE_THREADS
+CXX.Flags += @LLVM_FLAGS@ @GC_FLAGS@ @VM_FLAGS@ @EXCEPTION_FLAGS@ -Wno-variadic-macros -fno-omit-frame-pointer -fno-strict-aliasing -Wno-deprecated -ansi -DENABLE_THREADS
# GNU Classpath flags
CLASSPATH_FLAGS = @classpathinclude@
Modified: vmkit/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.config.in?rev=81091&r1=81090&r2=81091&view=diff
==============================================================================
--- vmkit/trunk/Makefile.config.in (original)
+++ vmkit/trunk/Makefile.config.in Sat Sep 5 12:58:58 2009
@@ -12,3 +12,4 @@
SERVICE_BUILD = @SERVICE_BUILD@
SINGLE_BUILD = @SINGLE_BUILD@
WITH_64 = @WITH_64@
+WITH_LLVM_GCC = @WITH_LLVM_GCC@
Modified: vmkit/trunk/include/mvm/Allocator.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/Allocator.h?rev=81091&r1=81090&r2=81091&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/Allocator.h (original)
+++ vmkit/trunk/include/mvm/Allocator.h Sat Sep 5 12:58:58 2009
@@ -20,7 +20,7 @@
class VirtualTable;
-#ifdef LLVM_GCC
+#ifdef WITH_LLVM_GCC
extern "C" void llvm_gcroot(const void*, void*) asm("llvm.gcroot");
#else
#define llvm_gcroot(a, b)
Modified: vmkit/trunk/include/mvm/Threads/Locks.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/Threads/Locks.h?rev=81091&r1=81090&r2=81091&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/Threads/Locks.h (original)
+++ vmkit/trunk/include/mvm/Threads/Locks.h Sat Sep 5 12:58:58 2009
@@ -27,6 +27,8 @@
extern "C" uint64 llvm_atomic_cmp_swap_i64(uint64* ptr, uint64 cmp,
uint64 val);
+#ifndef WITH_LLVM_GCC
+
// TODO: find what macro for gcc < 4.2
#define __sync_bool_compare_and_swap_32(ptr, cmp, val) \
@@ -58,6 +60,8 @@
#endif
+#endif
+
class Cond;
class LockNormal;
class LockRecursive;
@@ -230,7 +234,7 @@
/// acquire - Acquire the lock.
void acquire(Owner* O = 0) {
uint64_t id = mvm::Thread::get()->getThreadID();
- uintptr_t val = __sync_val_compare_and_swap((uintptr_t)&lock, 0, id);
+ uintptr_t val = __sync_val_compare_and_swap(&lock, 0, id);
if (val != 0) {
//fat!
Modified: vmkit/trunk/lib/JnJVM/Classpath/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/Makefile?rev=81091&r1=81090&r2=81091&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/Makefile (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/Makefile Sat Sep 5 12:58:58 2009
@@ -8,9 +8,14 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../..
-LIBRARYNAME = Classpath
-
include $(LEVEL)/Makefile.config
+
+ifeq ($(WITH_LLVM_GCC), 1)
+ MODULE_NAME = Classpath
+else
+ LIBRARYNAME = Classpath
+endif
+
include $(LEVEL)/Makefile.common
CXX.Flags += -I$(PROJ_SRC_DIR)/../VMCore $(CLASSPATH_FLAGS)
Modified: vmkit/trunk/lib/JnJVM/Compiler/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/Makefile?rev=81091&r1=81090&r2=81091&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/Makefile (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/Makefile Sat Sep 5 12:58:58 2009
@@ -8,11 +8,16 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../..
-LIBRARYNAME = JnjvmCompiler
+include $(LEVEL)/Makefile.config
+
+ifeq ($(WITH_LLVM_GCC), 1)
+ MODULE_NAME = JnjvmCompiler
+else
+ LIBRARYNAME = JnjvmCompiler
+endif
EXTRA_DIST = ExceptionsCheck.inc ExceptionsDwarf.inc
-include $(LEVEL)/Makefile.config
include $(LEVEL)/Makefile.common
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp?rev=81091&r1=81090&r2=81091&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp Sat Sep 5 12:58:58 2009
@@ -1054,7 +1054,7 @@
JavaObject* CommonClass::setDelegatee(JavaObject* val) {
JavaObject* prev = (JavaObject*)
- __sync_val_compare_and_swap((uintptr_t)&(delegatee[0]), NULL, val);
+ __sync_val_compare_and_swap(&(delegatee[0]), NULL, val);
if (!prev) return val;
else return prev;
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaString.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaString.cpp?rev=81091&r1=81090&r2=81091&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaString.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaString.cpp Sat Sep 5 12:58:58 2009
@@ -77,7 +77,6 @@
JavaString* JavaString::internalToJava(const UTF8* name, Jnjvm* vm) {
ArrayUInt16* array = 0;
- llvm_gcroot(this, 0);
llvm_gcroot(array, 0);
array = (ArrayUInt16*)vm->upcalls->ArrayOfChar->doNew(name->size, vm);
Modified: vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp?rev=81091&r1=81090&r2=81091&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp Sat Sep 5 12:58:58 2009
@@ -1095,7 +1095,7 @@
JavaObject* group = 0;
llvm_gcroot(args, 0);
- llvm_gcroot(ex, 0);
+ llvm_gcroot(exc, 0);
llvm_gcroot(obj, 0);
llvm_gcroot(group, 0);
Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp?rev=81091&r1=81090&r2=81091&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp Sat Sep 5 12:58:58 2009
@@ -856,7 +856,7 @@
JnjvmClassLoader*
JnjvmClassLoader::getJnjvmLoaderFromJavaObject(JavaObject* loader, Jnjvm* vm) {
- VMClassLoader* vmdata = 0
+ VMClassLoader* vmdata = 0;
llvm_gcroot(loader, 0);
llvm_gcroot(vmdata, 0);
Modified: vmkit/trunk/lib/JnJVM/VMCore/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/Makefile?rev=81091&r1=81090&r2=81091&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Makefile (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Makefile Sat Sep 5 12:58:58 2009
@@ -8,10 +8,15 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../..
-LIBRARYNAME = JnJVM
-
include $(LEVEL)/Makefile.config
+ifeq ($(WITH_LLVM_GCC), 1)
+ MODULE_NAME = JnJVM
+else
+ LIBRARYNAME = JnJVM
+endif
+
+
include $(LEVEL)/Makefile.common
CXX.Flags += -I$(PROJ_OBJ_DIR)/../Classpath -I$(PROJ_OBJ_DIR)/../LLVMRuntime -I$(PROJ_SRC_DIR)/../Classpath $(CLASSPATH_FLAGS) -I$(PROJ_SRC_DIR)/../../../include/jnjvm
Modified: vmkit/trunk/lib/Mvm/Allocator/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Allocator/Makefile?rev=81091&r1=81090&r2=81091&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Allocator/Makefile (original)
+++ vmkit/trunk/lib/Mvm/Allocator/Makefile Sat Sep 5 12:58:58 2009
@@ -8,6 +8,13 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../..
-LIBRARYNAME = Allocator
+include $(LEVEL)/Makefile.config
+
+ifeq ($(WITH_LLVM_GCC), 1)
+ MODULE_NAME = Allocator
+else
+ LIBRARYNAME = Allocator
+endif
+
include $(LEVEL)/Makefile.common
Modified: vmkit/trunk/lib/Mvm/BoehmGC/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/BoehmGC/Makefile?rev=81091&r1=81090&r2=81091&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/BoehmGC/Makefile (original)
+++ vmkit/trunk/lib/Mvm/BoehmGC/Makefile Sat Sep 5 12:58:58 2009
@@ -1,4 +1,4 @@
-##===- lib/JnJVM/VMCore/Makefile ---------------------------*- Makefile -*-===##
+##===- lib/Mvm/BoehmGC/Makefile ----------------------------*- Makefile -*-===##
#
# The vmkit project
#
@@ -8,6 +8,13 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../..
-LIBRARYNAME = BoehmGC
+include $(LEVEL)/Makefile.config
+
+ifeq ($(WITH_LLVM_GCC), 1)
+ MODULE_NAME = BoehmGC
+else
+ LIBRARYNAME = BoehmGC
+endif
+
include $(LEVEL)/Makefile.common
Modified: vmkit/trunk/lib/Mvm/CommonThread/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/Makefile?rev=81091&r1=81090&r2=81091&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/CommonThread/Makefile (original)
+++ vmkit/trunk/lib/Mvm/CommonThread/Makefile Sat Sep 5 12:58:58 2009
@@ -8,6 +8,14 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../..
-LIBRARYNAME = CommonThread
+include $(LEVEL)/Makefile.config
+
+ifeq ($(WITH_LLVM_GCC), 1)
+ MODULE_NAME = CommonThread
+else
+ LIBRARYNAME = CommonThread
+endif
+
+
include $(LEVEL)/Makefile.common
Modified: vmkit/trunk/lib/Mvm/Compiler/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/Makefile?rev=81091&r1=81090&r2=81091&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/Makefile (original)
+++ vmkit/trunk/lib/Mvm/Compiler/Makefile Sat Sep 5 12:58:58 2009
@@ -10,7 +10,12 @@
include $(LEVEL)/Makefile.config
-LIBRARYNAME = MvmCompiler
+ifeq ($(WITH_LLVM_GCC), 1)
+ MODULE_NAME = MvmCompiler
+else
+ LIBRARYNAME = MvmCompiler
+endif
+
VMKIT_RUNTIME = $(PROJ_SRC_DIR)/LLVMRuntime.ll
BUILT_SOURCES = LLVMRuntime.inc
Modified: vmkit/trunk/lib/Mvm/GCMmap2/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/GCMmap2/Makefile?rev=81091&r1=81090&r2=81091&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/GCMmap2/Makefile (original)
+++ vmkit/trunk/lib/Mvm/GCMmap2/Makefile Sat Sep 5 12:58:58 2009
@@ -8,7 +8,14 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../..
-LIBRARYNAME = GCMmap2
+include $(LEVEL)/Makefile.config
+
+ifeq ($(WITH_LLVM_GCC), 1)
+ MODULE_NAME = GCMmap2
+else
+ LIBRARYNAME = GCMmap2
+endif
+
include $(LEVEL)/Makefile.common
CXX.Flags += -I$(PROJ_SRC_DIR)/../CommonThread -I$(PROJ_SRC_DIR)/../Allocator
Modified: vmkit/trunk/lib/Mvm/Runtime/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/Makefile?rev=81091&r1=81090&r2=81091&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/Makefile (original)
+++ vmkit/trunk/lib/Mvm/Runtime/Makefile Sat Sep 5 12:58:58 2009
@@ -10,15 +10,22 @@
include $(LEVEL)/Makefile.config
-LIBRARYNAME = Mvm
-VMKIT_ASSEMBLY = $(PROJ_SRC_DIR)/LLVMAssembly.ll
-BUILT_SOURCES = LLVMAssembly.s
+ifeq ($(WITH_LLVM_GCC), 1)
-ifeq ($(WITH_64), 1)
- VMKIT_ASSEMBLY += $(PROJ_SRC_DIR)/LLVMAssembly64.ll
-endif
+ MODULE_NAME = Mvm
+
+else
+ LIBRARYNAME = Mvm
+
+ VMKIT_ASSEMBLY = $(PROJ_SRC_DIR)/LLVMAssembly.ll
+ BUILT_SOURCES = LLVMAssembly.s
+ ifeq ($(WITH_64), 1)
+ VMKIT_ASSEMBLY += $(PROJ_SRC_DIR)/LLVMAssembly64.ll
+ endif
-SOURCES = LLVMAssembly.s $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp))
+ SOURCES = LLVMAssembly.s $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp))
+
+endif
include $(LEVEL)/Makefile.common
Modified: vmkit/trunk/lib/N3/Mono/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/Mono/Makefile?rev=81091&r1=81090&r2=81091&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/Mono/Makefile (original)
+++ vmkit/trunk/lib/N3/Mono/Makefile Sat Sep 5 12:58:58 2009
@@ -8,7 +8,14 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../..
-LIBRARYNAME = Mono
+include $(LEVEL)/Makefile.config
+
+ifeq ($(WITH_LLVM_GCC), 1)
+ MODULE_NAME = Mono
+else
+ LIBRARYNAME = Mono
+endif
+
include $(LEVEL)/Makefile.common
CXX.Flags += -I$(PROJ_SRC_DIR)/../VMCore
Modified: vmkit/trunk/lib/N3/PNetLib/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/PNetLib/Makefile?rev=81091&r1=81090&r2=81091&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/PNetLib/Makefile (original)
+++ vmkit/trunk/lib/N3/PNetLib/Makefile Sat Sep 5 12:58:58 2009
@@ -8,6 +8,13 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../..
-LIBRARYNAME = PNetLib
+include $(LEVEL)/Makefile.config
+
+ifeq ($(WITH_LLVM_GCC), 1)
+ MODULE_NAME = PNetLib
+else
+ LIBRARYNAME = PNetLib
+endif
+
include $(LEVEL)/Makefile.common
CXX.Flags += -I$(PROJ_SRC_DIR)/../VMCore
Modified: vmkit/trunk/lib/N3/VMCore/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/Makefile?rev=81091&r1=81090&r2=81091&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/Makefile (original)
+++ vmkit/trunk/lib/N3/VMCore/Makefile Sat Sep 5 12:58:58 2009
@@ -8,7 +8,14 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../..
-LIBRARYNAME = N3
+include $(LEVEL)/Makefile.config
+
+ifeq ($(WITH_LLVM_GCC), 1)
+ MODULE_NAME = N3
+else
+ LIBRARYNAME = N3
+endif
+
include $(LEVEL)/Makefile.common
CXX.Flags += -I$(PROJ_OBJ_DIR)/../LLVMRuntime
More information about the vmkit-commits
mailing list