[vmkit-commits] [vmkit] r61945 - in /vmkit/trunk: Makefile.rules tools/vmjc/libvmjc/ tools/vmjc/libvmjc/Makefile

[Nicolas Geoffray]

Author: geoffray
Date: Thu Jan  8 15:02:33 2009
New Revision: 61945

URL: http://llvm.org/viewvc/llvm-project?rev=61945&view=rev
Log:
Add a Makefile for compiling libvmjc.so.


Added:
    vmkit/trunk/tools/vmjc/libvmjc/
    vmkit/trunk/tools/vmjc/libvmjc/Makefile   (with props)
Modified:
    vmkit/trunk/Makefile.rules

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=61945&r1=61944&r2=61945&view=diff

==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Thu Jan  8 15:02:33 2009
@@ -39,17 +39,34 @@
 VMJC      := $(ToolDir)/vmjc$(EXEEXT)
 endif
 
-vmjclib :
+
+ifdef VMJC_ASSEMBLY
+
+.PRECIOUS: glibj.zip.s
+
+glibj.zip.s : $(LOPT) $(LLC) $(VMJC)
+
+
+glibj.zip.bc :
+	$(Echo) "Compiling glibj.zip to llvm"
 	$(Verb) if test -d $(GLIBJ); then \
-	  $(Verb) $(VMJC) -f -std-compile-opts $(GLIBJ)/glibj.zip -o glibj.zip.bc; \
+	  $(VMJC) -f -std-compile-opts $(GLIBJ)/glibj.zip -o glibj.zip.bc; \
 	else \
-	  $(Verb) $(VMJC) -f -std-compile-opts $(GLIBJ) -o glibj.zip.bc; \
-	fi
-	$(Verb) if test -f glibj.zip.bc; then \
-	$(LOPT) -std-compile-opts -f glibj.zip.bc -o glibj-optimized.zip.bc; \
-	$(Verb) $(LLC) -disable-fp-elim -f glibj-optimized.zip.bc; \
-	$(Verb) $(CC) -fPIC -c glibj-optimized.zip.s; \
-	$(Verb) $(CC) -shared -o libvmjc.so glibj-optimized.zip.o; \
-	$(RM) -f glibj.zip.bc glibj-optimized.zip.bc glibj-optimized.zip.s; \
-	$(RM) -f glibj-optimized.zip.o; \
+	  $(VMJC) -f -std-compile-opts $(GLIBJ) -o glibj.zip.bc; \
 	fi
+	
+glibj-optimized.zip.bc : glibj.zip.bc
+	$(Echo) "Optimizing glibj.zip"
+	$(Verb) $(LOPT) -std-compile-opts -f glibj.zip.bc -o glibj-optimized.zip.bc
+
+glibj.zip.s : glibj-optimized.zip.bc
+	$(Echo) "Compiling glibj.zip.bc to native"
+	$(Verb) $(LLC) -disable-fp-elim -f glibj-optimized.zip.bc -o glibj.zip.s
+
+$(ObjDir)/%.lo $(ObjDir)/%.o: %.s $(ObjDir)/.dir $(BUILT_SOURCES)
+	$(Echo) "Compiling $*.s for $(BuildMode) build " $(PIC_FLAG)
+	$(Verb) $(MAYBE_PIC_Compile.CXX) $(DEPEND_OPTIONS) $< -o $(ObjDir)/$*.o
+
+clean-local::
+	$(Verb) $(RM) -f glibj.zip.s glibj.zip.bc glibj-optimized.zip.bc
+endif

Added: vmkit/trunk/tools/vmjc/libvmjc/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmjc/libvmjc/Makefile?rev=61945&view=auto

==============================================================================
--- vmkit/trunk/tools/vmjc/libvmjc/Makefile (added)
+++ vmkit/trunk/tools/vmjc/libvmjc/Makefile Thu Jan  8 15:02:33 2009
@@ -0,0 +1,23 @@
+##===- tools/vmjc/libvmjc/Makefile -------------------------*- Makefile -*-===##
+# 
+#                     The VMKit project
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+LEVEL = ../../..
+
+
+LEVEL = ../../..
+
+include $(LEVEL)/Makefile.config
+
+LIBRARYNAME = libvmjc
+LOADABLE_MODULE = 1
+VMJC_ASSEMBLY = 1
+BUILT_SOURCES = glibj.zip.s
+
+SOURCES = glibj.zip.s
+
+include $(LEVEL)/Makefile.common

Propchange: vmkit/trunk/tools/vmjc/libvmjc/Makefile

------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: vmkit/trunk/tools/vmjc/libvmjc/Makefile

------------------------------------------------------------------------------
    svn:executable = *