[vmkit-commits] [vmkit] r64213 - in /vmkit/trunk: Makefile.rules lib/Mvm/Runtime/LLVMAssembly.ll lib/Mvm/Runtime/LLVMAssembly64.ll lib/Mvm/Runtime/Makefile
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Tue Feb 10 02:58:02 PST 2009
Author: geoffray
Date: Tue Feb 10 04:58:02 2009
New Revision: 64213
URL: http://llvm.org/viewvc/llvm-project?rev=64213&view=rev
Log:
Find at compile-time whether we should compile atomit 64bits.
Added:
vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly64.ll
Modified:
vmkit/trunk/Makefile.rules
vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly.ll
vmkit/trunk/lib/Mvm/Runtime/Makefile
Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=64213&r1=64212&r2=64213&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Tue Feb 10 04:58:02 2009
@@ -24,7 +24,10 @@
LLVMAssembly.o : $(LLVMAS) $(LLC) $(VMKIT_ASSEMBLY)
-LLVMAssembly.s : LLVMAssembly.ll
+LLVMAssembly.gen.ll : $(VMKIT_ASSEMBLY)
+ $(Verb) cat $(VMKIT_ASSEMBLY) > LLVMAssembly.gen.ll
+
+LLVMAssembly.s : LLVMAssembly.gen.ll
$(Echo) "Building LLVM assembly with $(VMKIT_ASSEMBLY)"
$(Verb) $(LLVMAS) -f $(<F) -o - | $(LLC) -f -o $@
@@ -33,7 +36,7 @@
$(Verb) $(GAS) $< -o $(ObjDir)/$*.o
clean-local::
- $(Verb) $(RM) -f LLVMAssembly.s LLVMAssembly.bc
+ $(Verb) $(RM) -f LLVMAssembly.s LLVMAssembly.bc LLVMAssembly.gen.ll
endif
Modified: vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly.ll?rev=64213&r1=64212&r2=64213&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly.ll (original)
+++ vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly.ll Tue Feb 10 04:58:02 2009
@@ -5,7 +5,6 @@
declare i8 @llvm.atomic.cmp.swap.i8.p0i8(i8*, i8, i8) nounwind
declare i16 @llvm.atomic.cmp.swap.i16.p0i16(i16*, i16, i16) nounwind
declare i32 @llvm.atomic.cmp.swap.i32.p0i32(i32*, i32, i32) nounwind
-declare i64 @llvm.atomic.cmp.swap.i64.p0i64(i64*, i64, i64) nounwind
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;Helper functions for gcc < 4.2 ;;;;;;;;;;;;;;;;;;;;;;;;
@@ -29,8 +28,4 @@
ret i32 %A
}
-define i64 @llvm_atomic_cmp_swap_i64(i64* %ptr, i64 %cmp, i64 %swap)
-nounwind {
- %A = call i64 @llvm.atomic.cmp.swap.i64.p0i64( i64* %ptr, i64 %cmp, i64 %swap)
- ret i64 %A
-}
+
Added: vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly64.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly64.ll?rev=64213&view=auto
==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly64.ll (added)
+++ vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly64.ll Tue Feb 10 04:58:02 2009
@@ -0,0 +1,7 @@
+declare i64 @llvm.atomic.cmp.swap.i64.p0i64(i64*, i64, i64) nounwind
+
+define i64 @llvm_atomic_cmp_swap_i64(i64* %ptr, i64 %cmp, i64 %swap)
+nounwind {
+ %A = call i64 @llvm.atomic.cmp.swap.i64.p0i64( i64* %ptr, i64 %cmp, i64 %swap)
+ ret i64 %A
+}
Modified: vmkit/trunk/lib/Mvm/Runtime/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/Makefile?rev=64213&r1=64212&r2=64213&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/Makefile (original)
+++ vmkit/trunk/lib/Mvm/Runtime/Makefile Tue Feb 10 04:58:02 2009
@@ -15,6 +15,11 @@
VMKIT_ASSEMBLY = $(PROJ_SRC_DIR)/LLVMAssembly.ll
BUILT_SOURCES = LLVMRuntime.inc LLVMAssembly.s
+ifeq ($(WITH_64), 1)
+ VMKIT_ASSEMBLY += $(PROJ_SRC_DIR)/LLVMAssembly64.ll
+endif
+
+
SOURCES = LLVMAssembly.s $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp))
include $(LEVEL)/Makefile.common
More information about the vmkit-commits
mailing list