[vmkit-commits] [vmkit] r144214 - in /vmkit/trunk: include/debug.h lib/J3/ClassLib/GNUClasspath/Makefile lib/J3/ClassLib/Makefile lib/J3/ClassLib/OpenJDK/Makefile lib/J3/Compiler/Makefile lib/J3/VMCore/Makefile mmtk/mmtk-j3/Statistics.cpp test/ tests/LshlTest.java tests/LshrTest.java tools/precompiler/trainer/Makefile
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Wed Nov 9 13:49:15 PST 2011
Author: geoffray
Date: Wed Nov 9 15:49:14 2011
New Revision: 144214
URL: http://llvm.org/viewvc/llvm-project?rev=144214&view=rev
Log:
Small fixes to support make dist again.
Added:
vmkit/trunk/tests/LshlTest.java
- copied, changed from r144138, vmkit/trunk/test/lshl.java
vmkit/trunk/tests/LshrTest.java
- copied, changed from r144138, vmkit/trunk/test/lshr.java
Removed:
vmkit/trunk/test/
Modified:
vmkit/trunk/include/debug.h
vmkit/trunk/lib/J3/ClassLib/GNUClasspath/Makefile
vmkit/trunk/lib/J3/ClassLib/Makefile
vmkit/trunk/lib/J3/ClassLib/OpenJDK/Makefile
vmkit/trunk/lib/J3/Compiler/Makefile
vmkit/trunk/lib/J3/VMCore/Makefile
vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp
vmkit/trunk/tools/precompiler/trainer/Makefile
Modified: vmkit/trunk/include/debug.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/debug.h?rev=144214&r1=144213&r2=144214&view=diff
==============================================================================
--- vmkit/trunk/include/debug.h (original)
+++ vmkit/trunk/include/debug.h Wed Nov 9 15:49:14 2011
@@ -85,4 +85,8 @@
#endif
#endif
+// Silence compiler warnings.
+template <typename T>
+static inline void USE(T) { }
+
#endif
Modified: vmkit/trunk/lib/J3/ClassLib/GNUClasspath/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/ClassLib/GNUClasspath/Makefile?rev=144214&r1=144213&r2=144214&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/ClassLib/GNUClasspath/Makefile (original)
+++ vmkit/trunk/lib/J3/ClassLib/GNUClasspath/Makefile Wed Nov 9 15:49:14 2011
@@ -9,8 +9,7 @@
LEVEL = ../../../..
-EXTRA_DIST = ClasspathConstructor.inc ClasspathField.inc Classpath.inc ClasspathMethod.inc \
- ClasspathVMClass.inc ClasspathVMClassLoader.inc ClasspathVMObject.inc \
+EXTRA_DIST = ClasspathVMClass.inc ClasspathVMClassLoader.inc ClasspathVMObject.inc \
ClasspathVMRuntime.inc ClasspathVMStackWalker.inc ClasspathVMSystem.inc \
ClasspathVMSystemProperties.inc ClasspathVMThread.inc ClasspathVMThrowable.inc
Modified: vmkit/trunk/lib/J3/ClassLib/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/ClassLib/Makefile?rev=144214&r1=144213&r2=144214&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/ClassLib/Makefile (original)
+++ vmkit/trunk/lib/J3/ClassLib/Makefile Wed Nov 9 15:49:14 2011
@@ -8,6 +8,14 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../..
+EXTRA_DIST = ArrayCopy.inc \
+ ClassContext.inc \
+ ClasspathConstructor.inc \
+ ClasspathField.inc \
+ Classpath.inc \
+ ClasspathMethod.inc \
+ SetProperties.inc
+
include $(LEVEL)/Makefile.config
DIRS = $(CLASSPATH_DIR)
Modified: vmkit/trunk/lib/J3/ClassLib/OpenJDK/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/ClassLib/OpenJDK/Makefile?rev=144214&r1=144213&r2=144214&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/ClassLib/OpenJDK/Makefile (original)
+++ vmkit/trunk/lib/J3/ClassLib/OpenJDK/Makefile Wed Nov 9 15:49:14 2011
@@ -8,7 +8,7 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../../..
-EXTRA_DIST =
+EXTRA_DIST = OpenJDK.inc
include $(LEVEL)/Makefile.config
Modified: vmkit/trunk/lib/J3/Compiler/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/Makefile?rev=144214&r1=144213&r2=144214&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/Makefile (original)
+++ vmkit/trunk/lib/J3/Compiler/Makefile Wed Nov 9 15:49:14 2011
@@ -1,4 +1,4 @@
-##===- lib/JnJVM/Compiler/Makefile -------------------------*- Makefile -*-===##
+##===- lib/J3/Compiler/Makefile ----------------------------*- Makefile -*-===##
#
# The VMKit project
#
@@ -8,6 +8,8 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../..
+EXTRA_DIST = JavaJITClasspath.inc JavaJITOpenJDK.inc
+
include $(LEVEL)/Makefile.config
MODULE_WITH_GC = J3Compiler
Modified: vmkit/trunk/lib/J3/VMCore/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Makefile?rev=144214&r1=144213&r2=144214&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Makefile (original)
+++ vmkit/trunk/lib/J3/VMCore/Makefile Wed Nov 9 15:49:14 2011
@@ -1,4 +1,4 @@
-##===- lib/JnJVM/VMCore/Makefile ---------------------------*- Makefile -*-===##
+##===- lib/J3/VMCore/Makefile ------------------------------*- Makefile -*-===##
#
# The vmkit project
#
@@ -8,6 +8,8 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../..
+EXTRA_DIST = JniClasspath.inc JniOpenJDK.inc
+
include $(LEVEL)/Makefile.config
MODULE_WITH_GC = J3
Modified: vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp?rev=144214&r1=144213&r2=144214&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp Wed Nov 9 15:49:14 2011
@@ -22,8 +22,8 @@
int64_t result;
struct timeval tp;
- int res;
- res = gettimeofday (&tp, NULL);
+ int res = gettimeofday (&tp, NULL);
+ USE(res);
assert(res != -1 && "failed gettimeofday.");
result = (int64_t) tp.tv_sec;
Copied: vmkit/trunk/tests/LshlTest.java (from r144138, vmkit/trunk/test/lshl.java)
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tests/LshlTest.java?p2=vmkit/trunk/tests/LshlTest.java&p1=vmkit/trunk/test/lshl.java&r1=144138&r2=144214&rev=144214&view=diff
==============================================================================
--- vmkit/trunk/test/lshl.java (original)
+++ vmkit/trunk/tests/LshlTest.java Wed Nov 9 15:49:14 2011
@@ -1,4 +1,4 @@
-class lshl {
+class LshlTest {
public static void check(boolean b) throws Exception {
if (!b) throw new Exception("Check failed!");
}
Copied: vmkit/trunk/tests/LshrTest.java (from r144138, vmkit/trunk/test/lshr.java)
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tests/LshrTest.java?p2=vmkit/trunk/tests/LshrTest.java&p1=vmkit/trunk/test/lshr.java&r1=144138&r2=144214&rev=144214&view=diff
==============================================================================
--- vmkit/trunk/test/lshr.java (original)
+++ vmkit/trunk/tests/LshrTest.java Wed Nov 9 15:49:14 2011
@@ -1,4 +1,4 @@
-class lshr {
+class LshrTest {
public static void check(boolean b) throws Exception {
if (!b) throw new Exception("Check failed!");
}
Modified: vmkit/trunk/tools/precompiler/trainer/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/precompiler/trainer/Makefile?rev=144214&r1=144213&r2=144214&view=diff
==============================================================================
--- vmkit/trunk/tools/precompiler/trainer/Makefile (original)
+++ vmkit/trunk/tools/precompiler/trainer/Makefile Wed Nov 9 15:49:14 2011
@@ -8,6 +8,8 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../..
+EXTRA_DIST = HelloWorld.java
+
include $(LEVEL)/Makefile.config
BUILT_SOURCES = Precompiled.bc BootstrapClasses.bc
More information about the vmkit-commits
mailing list