harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r957014 - in /harmony/enhanced/java/branches/mrh: common_resources/make/platform.xml common_resources/make/properties.xml drlvm/modules/vm/src/main/native/encoder/unix/makefile
Date Tue, 22 Jun 2010 20:21:59 GMT
Author: hindessm
Date: Tue Jun 22 20:21:58 2010
New Revision: 957014

URL: http://svn.apache.org/viewvc?rev=957014&view=rev
Log:
Add HY_ARCH_FAMILY to help structure drlvm natives.

Modified:
    harmony/enhanced/java/branches/mrh/common_resources/make/platform.xml
    harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/unix/makefile

Modified: harmony/enhanced/java/branches/mrh/common_resources/make/platform.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/make/platform.xml?rev=957014&r1=957013&r2=957014&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/make/platform.xml (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/make/platform.xml Tue Jun 22 20:21:58
2010
@@ -183,7 +183,29 @@
         <isset property="is.ppc32" />
     </condition>
     <property name="hy.arch" value="${os.arch}" />
-    
+
+    <condition property="hy.arch.family" value="x86">
+        <or>
+            <isset property="is.x86" />
+            <isset property="is.x86_64" />
+        </or>
+    </condition>
+    <condition property="hy.arch.family" value="ia64">
+        <isset property="is.ia64" />
+    </condition>
+    <condition property="hy.arch.family" value="ppc">
+        <or>
+            <isset property="is.ppc32" />
+            <isset property="is.ppc64" />
+        </or>
+    </condition>
+    <condition property="hy.arch.family" value="s390">
+        <or>
+            <isset property="is.s390" />
+            <isset property="is.s390x" />
+        </or>
+    </condition>
+
     <!-- Normalized platform name -->
     <property name="hy.platform" value="${hy.os}.${hy.arch}"/>
     <property name="hy.platform.path" value="${hy.os}/${hy.arch}"/>

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=957014&r1=957013&r2=957014&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml Tue Jun 22 20:21:58
2010
@@ -387,6 +387,7 @@ HY_ZIP_API=${hy.zip.api}
 HY_PORTLIB_STUBS=${hy.portlib.stubs}
 HY_CFG=${hy.cfg}
 HY_ARCH=${hy.arch}
+HY_ARCH_FAMILY=${hy.arch.family}
 HY_OS=${hy.os}
 HY_PLATFORM=${hy.platform}
 HY_NO_THR=${hy.no.thr}

Modified: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/unix/makefile?rev=957014&r1=957013&r2=957014&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/unix/makefile
(original)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/encoder/unix/makefile
Tue Jun 22 20:21:58 2010
@@ -37,14 +37,14 @@ LIBNAME = $(LIBPATH)libencoder.a
 
 include $(HY_HDK)/build/make/rules.mk
 
-$(HY_BIN)%.o: $(ENCDIR)%.cpp
+$(HY_BIN)%.o: $(SHAREDSUB)$(HY_ARCH_FAMILY)/%.cpp
 	@mkdir -p $(@D)
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
 
-$(HY_HDK)/include/%.h: $(SHAREDSUB)$(HY_ARCH)/%.h
+$(HY_HDK)/include/%.h: $(SHAREDSUB)$(HY_ARCH_FAMILY)/%.h
 	mkdir -p $(@D)
 	cp -p $< $@
 
-$(HY_HDK)/include/%.inl: $(SHAREDSUB)$(HY_ARCH)/%.inl
+$(HY_HDK)/include/%.inl: $(SHAREDSUB)$(HY_ARCH_FAMILY)/%.inl
 	mkdir -p $(@D)
 	cp -p $< $@



Mime
View raw message