You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/06/26 11:54:23 UTC
svn commit: r958208 - in /harmony/enhanced/java/branches/mrh:
common_resources/depends/build/ common_resources/depends/build/platform/
common_resources/make/
drlvm/modules/vm/src/main/native/vmcore/shared/ia64/util/
drlvm/modules/vm/src/main/native/vmc...
Author: hindessm
Date: Sat Jun 26 09:54:22 2010
New Revision: 958208
URL: http://svn.apache.org/viewvc?rev=958208&view=rev
Log:
Fix ipf/ia64 structure.
Put back dependency handling using gcc -MD. Need to figure out
how to get this on other platforms.
Added:
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ia64/util/code_emit/
- copied from r957173, harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ipf/util/code_emit/
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ia64/util/compile.cpp
- copied unchanged from r957173, harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ipf/util/compile.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ia64/util/defines.h
- copied unchanged from r957173, harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ipf/util/defines.h
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ia64/util/exceptions.cpp
- copied unchanged from r957173, harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ipf/util/exceptions.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ia64/util/include/
- copied from r957173, harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ipf/util/include/
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ia64/util/ini_low_level.asm
- copied unchanged from r957173, harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ipf/util/ini_low_level.asm
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ia64/util/invoke_native_stub.asm
- copied unchanged from r957173, harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ipf/util/invoke_native_stub.asm
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ia64/util/jit_runtime_support.cpp
- copied unchanged from r957173, harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ipf/util/jit_runtime_support.cpp
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ia64/util/stub_code_utils.cpp
- copied unchanged from r957173, harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ipf/util/stub_code_utils.cpp
Removed:
harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/ipf/
Modified:
harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86.mk
harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86_64.mk
harmony/enhanced/java/branches/mrh/common_resources/depends/build/rules.mk
harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml
Modified: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86.mk?rev=958208&r1=958207&r2=958208&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86.mk (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86.mk Sat Jun 26 09:54:22 2010
@@ -17,3 +17,4 @@ DEFINES += -DLINUX -DLINUX_X86 -DHYX86 -
PLATFORM += -march=pentium3
OSLIBS += -ldl
HY_CAN_LINK_DEBUG = yes
+DEPFLAGS = -MD
Modified: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86_64.mk?rev=958208&r1=958207&r2=958208&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86_64.mk (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/linux.x86_64.mk Sat Jun 26 09:54:22 2010
@@ -18,3 +18,4 @@ PLATFORM := -DPOINTER64 -fPIC # TOFIX dr
XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft -lXext -lXtst
OSLIBS += -ldl
HY_CAN_LINK_DEBUG = yes
+DEPFLAGS = -MD
Modified: harmony/enhanced/java/branches/mrh/common_resources/depends/build/rules.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/rules.mk?rev=958208&r1=958207&r2=958208&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/rules.mk (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/rules.mk Sat Jun 26 09:54:22 2010
@@ -38,6 +38,10 @@ endif
all: $(DLLNAME) $(EXENAME) $(LIBNAME) $(HDKINCLUDES)
+CFLAGS += $(DEPFLAGS)
+CXXFLAGS += $(DEPFLAGS)
+-include $(BUILDFILES:.o=.d)
+
$(LIBNAME): $(BUILDFILES)
@mkdir -p $(@D)
$(AR) $(ARFLAGS) $(ARCREATE) $@ $(BUILDFILES)
Modified: harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml?rev=958208&r1=958207&r2=958208&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml Sat Jun 26 09:54:22 2010
@@ -604,7 +604,7 @@ Alternatively, you can switch to another
<sequential>
<echo message="Running @{module} Unit Test from @{jar}" />
<echo message="Tested jre: ${test.jre.home}/bin/java" />
- <property name="test.module.dir" value="${target.dir}/@{module}" />
+ <property name="test.module.dir" value="${hy.target}/@{module}" />
<property name="test.excludes.dir" value="${test.module.dir}/excludes" />
<property name="test.resources.dir" value="${test.module.dir}/resources" />
<property name="module.work.dir" location="${work.dir}/@{module}" />
@@ -640,7 +640,7 @@ Alternatively, you can switch to another
<jvmarg line="-Duser.home=${junit.user.home}" />
<classpath>
- <fileset dir="${target.dir}">
+ <fileset dir="${hy.target}">
<include name="*.jar" />
</fileset>
<pathelement path="${test.resources.dir}/" />
@@ -699,7 +699,7 @@ Alternatively, you can switch to another
<sequential>
<echo message="Running @{module} Unit Test from @{jar}" />
<echo message="Tested jre: ${test.jre.home}/bin/java" />
- <property name="test.module.dir" value="${target.dir}/@{module}" />
+ <property name="test.module.dir" value="${hy.target}/@{module}" />
<property name="test.excludes.dir" value="${test.module.dir}/excludes" />
<property name="test.resources.dir" value="${test.module.dir}/resources" />
<property name="module.work.dir" location="${work.dir}/@{module}" />
@@ -735,7 +735,7 @@ Alternatively, you can switch to another
<jvmarg line="-Duser.home=${junit.user.home}" />
<classpath>
- <fileset dir="${target.dir}">
+ <fileset dir="${hy.target}">
<include name="*.jar" />
</fileset>
<pathelement path="${test.resources.dir}/" />