[vmkit-commits] [vmkit] r218180 - Remove llcj from configure

[Gael Thomas]

Author: gthomas
Date: Sat Sep 20 03:13:53 2014
New Revision: 218180

URL: http://llvm.org/viewvc/llvm-project?rev=218180&view=rev
Log:
Remove llcj from configure


Added:
    vmkit/branches/aot/examples/aot/java/
    vmkit/branches/aot/examples/aot/java/HelloWorld.java
    vmkit/branches/aot/examples/aot/java/Makefile   (with props)
Modified:
    vmkit/branches/aot/autoconf/configure.ac
    vmkit/branches/aot/configure

Modified: vmkit/branches/aot/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/aot/autoconf/configure.ac?rev=218180&r1=218179&r2=218180&view=diff
==============================================================================
--- vmkit/branches/aot/autoconf/configure.ac (original)
+++ vmkit/branches/aot/autoconf/configure.ac Sat Sep 20 03:13:53 2014
@@ -457,7 +457,6 @@ AC_CONFIG_SRCDIR(["Makefile.common.in"])
 dnl Configure a common Makefile
 AC_CONFIG_FILES(Makefile.common)
 AC_CONFIG_FILES([lib/j3/ClassLib/Classpath.h])
-AC_CONFIG_FILES([tools/llcj/LinkPaths.h])
 AC_CONFIG_FILES([mmtk/java/src/org/j3/config/Selected.java])
 AC_CONFIG_FILES([mmtk/java/build.xml])
 

Modified: vmkit/branches/aot/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/aot/configure?rev=218180&r1=218179&r2=218180&view=diff
==============================================================================
--- vmkit/branches/aot/configure (original)
+++ vmkit/branches/aot/configure Sat Sep 20 03:13:53 2014
@@ -5033,8 +5033,6 @@ ac_config_files="$ac_config_files Makefi
 
 ac_config_files="$ac_config_files lib/j3/ClassLib/Classpath.h"
 
-ac_config_files="$ac_config_files tools/llcj/LinkPaths.h"
-
 ac_config_files="$ac_config_files mmtk/java/src/org/j3/config/Selected.java"
 
 ac_config_files="$ac_config_files mmtk/java/build.xml"
@@ -5737,7 +5735,6 @@ do
     "include/vmkit/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/vmkit/config.h" ;;
     "Makefile.common") CONFIG_FILES="$CONFIG_FILES Makefile.common" ;;
     "lib/j3/ClassLib/Classpath.h") CONFIG_FILES="$CONFIG_FILES lib/j3/ClassLib/Classpath.h" ;;
-    "tools/llcj/LinkPaths.h") CONFIG_FILES="$CONFIG_FILES tools/llcj/LinkPaths.h" ;;
     "mmtk/java/src/org/j3/config/Selected.java") CONFIG_FILES="$CONFIG_FILES mmtk/java/src/org/j3/config/Selected.java" ;;
     "mmtk/java/build.xml") CONFIG_FILES="$CONFIG_FILES mmtk/java/build.xml" ;;
 

Added: vmkit/branches/aot/examples/aot/java/HelloWorld.java
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/aot/examples/aot/java/HelloWorld.java?rev=218180&view=auto
==============================================================================
--- vmkit/branches/aot/examples/aot/java/HelloWorld.java (added)
+++ vmkit/branches/aot/examples/aot/java/HelloWorld.java Sat Sep 20 03:13:53 2014
@@ -0,0 +1,7 @@
+
+
+class HelloWorld {
+	public static void main(String args[]) throws Exception {
+		System.out.println(" ***    bip bip    *****");
+	}
+}

Added: vmkit/branches/aot/examples/aot/java/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/aot/examples/aot/java/Makefile?rev=218180&view=auto
==============================================================================
--- vmkit/branches/aot/examples/aot/java/Makefile (added)
+++ vmkit/branches/aot/examples/aot/java/Makefile Sat Sep 20 03:13:53 2014
@@ -0,0 +1,24 @@
+##===- tools/j3/Makefile -----------------------------------*- Makefile -*-===##
+# 
+#                     The VMKit project
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+LEVEL=../../..
+
+BC_FILES=$(BUILD_DIR)/HelloWorld.class.bc
+MODULE=HelloWorld
+
+include $(LEVEL)/Makefile.common
+
+%.class.o: %.class.bc
+	$(LLC) -load $(STATIC_GC_PRINTER_LIB) -j3-aot -filetype=obj -o $@ $<
+
+%.class.bc: %.class
+	cd $(BUILD_DIR) && $(VMJC) $(notdir $<)
+
+$(BUILD_DIR)/%.class: %.java $(BUILD_DIR)/.dir
+	$(JAVAC) -d $(BUILD_DIR) $<
+

Propchange: vmkit/branches/aot/examples/aot/java/Makefile
------------------------------------------------------------------------------
    svn:executable = *