You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by gs...@apache.org on 2006/11/18 00:22:35 UTC
svn commit: r476362 - in /incubator/harmony/enhanced/drlvm/trunk:
build/make/ build/make/components/vm/ build/make/targets/ vm/vmcore/include/
Author: gshimansky
Date: Fri Nov 17 15:22:34 2006
New Revision: 476362
URL: http://svn.apache.org/viewvc?view=rev&rev=476362
Log:
Applied HARMONY-2211 [DRLVM][IPF] more compile fixes
Tests passed on winxp, ubuntu and SuSE10 x86_64 (with some exceptions for x86_64)
Modified:
incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml
incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml
incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml
incubator/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml
incubator/harmony/enhanced/drlvm/trunk/build/make/targets/test.xml
incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/native_modules.h
Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml?view=diff&rev=476362&r1=476361&r2=476362
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml Fri Nov 17 15:22:34 2006
@@ -26,7 +26,6 @@
<project name="vm.jitrino">
<target name="init">
- <select arch="ia32,em64t">
<property name="build.depends" value="extra.apr,vm.vmcore,vm.encoder,vm.hythr" />
<property name="outtype" value="shared" />
<property name="libname" value="jitrino" />
@@ -343,6 +342,5 @@
<include name="${build.arch}/**" />
</fileset>
</copy>
- </select>
</target>
</project>
Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml?view=diff&rev=476362&r1=476361&r2=476362
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml Fri Nov 17 15:22:34 2006
@@ -266,8 +266,10 @@
<libset libs="${vm.port.lib}"
dir="${vm.port.libdir}" />
- <libset libs="${vm.encoder.lib}"
- dir="${vm.encoder.libdir}" />
+ <select arch="ia32,em64t">
+ <libset libs="${vm.encoder.lib}"
+ dir="${vm.encoder.libdir}" />
+ </select>
<libset libs="${extra.log4cxx.lib}"
dir="${extra.log4cxx.libdir}" />
Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml?view=diff&rev=476362&r1=476361&r2=476362
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml Fri Nov 17 15:22:34 2006
@@ -42,10 +42,12 @@
<other>bin/default:*</other>
</interpreter>
+ <select arch="ia32,em64t">
<jitrino>
<shared>bin/default:jitrino</shared>
<other>bin/default:*</other>
</jitrino>
+ </select>
<gc_gen>
<shared>bin/default:gc_gen</shared>
Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml?view=diff&rev=476362&r1=476361&r2=476362
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml Fri Nov 17 15:22:34 2006
@@ -52,9 +52,11 @@
<pathelement location="${build.dir}/_smoke.tests/classes" />
<fileset dir="${build.deploy.dir}/lib" includes="*.jar" />
</path>
+ <select arch="ia32,em64t">
<antcall target="java_test_smoke_with_jit_or_interpreter">
<param name="jit.or.interpreter" value="jit" />
</antcall>
+ </select>
<antcall target="java_test_smoke_with_jit_or_interpreter">
<param name="jit.or.interpreter" value="interpreter" />
</antcall>
Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/test.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/targets/test.xml?view=diff&rev=476362&r1=476361&r2=476362
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/targets/test.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/targets/test.xml Fri Nov 17 15:22:34 2006
@@ -15,9 +15,13 @@
-->
<!--
Author: Marina V. Goldburt
-Version: $Revision: 1.3.2.2 $
-->
<project name="ALL TESTS">
- <target name="test" depends="jvmti.test, cunit.test, smoke.test, kernel.test" />
+ <select arch="ipf">
+ <target name="test" depends="smoke.test" />
+ </select>
+ <select arch="ia32,em64t">
+ <target name="test" depends="jvmti.test, cunit.test, smoke.test, kernel.test" />
+ </select>
</project>
Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/native_modules.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/native_modules.h?view=diff&rev=476362&r1=476361&r2=476362
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/native_modules.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/native_modules.h Fri Nov 17 15:22:34 2006
@@ -22,6 +22,8 @@
#ifndef _NATIVE_MODULES_H_
#define _NATIVE_MODULES_H_
+#include <stdio.h>
+
#ifdef __cplusplus
extern "C" {
#endif