harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r483085 - in /harmony/enhanced/classlib/trunk: depends/build/platform/linux.s390.mk depends/build/platform/linux.s390x.mk make/properties.xml
Date Wed, 06 Dec 2006 14:18:32 GMT
Author: hindessm
Date: Wed Dec  6 06:18:32 2006
New Revision: 483085

URL: http://svn.apache.org/viewvc?view=rev&rev=483085
Log:
Added properties/defines for Linux s390/s390x.

Added:
    harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk
    harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk
Modified:
    harmony/enhanced/classlib/trunk/make/properties.xml

Added: harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk?view=auto&rev=483085
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk (added)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk Wed Dec  6 06:18:32
2006
@@ -0,0 +1,20 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+DEFINES += -DLINUX -DLINUX_S390 -DHYS390
+OPT += -fpic -m31
+
+ASFLAGS += -m31
+LDFLAGS += -m31

Added: harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk?view=auto&rev=483085
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk (added)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk Wed Dec  6 06:18:32
2006
@@ -0,0 +1,20 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+DEFINES += -DLINUX -DLINUX_S390X -DHYS390X
+OPT += -fpic -m64
+
+ASFLAGS += -m64
+LDFLAGS += -m64

Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=483085&r1=483084&r2=483085
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Wed Dec  6 06:18:32 2006
@@ -99,15 +99,24 @@
     <condition property="is.ia64">
         <equals arg1="ia64" arg2="${os.arch}"/>
     </condition>
+    <condition property="is.s390x">
+        <equals arg1="${os.arch}" arg2="s390x" />
+    </condition>
+    <condition property="is.s390">
+        <equals arg1="${os.arch}" arg2="s390" />
+    </condition>
+
     <condition property="is.64bit">
         <or>
             <isset property="is.ia64" />
             <isset property="is.x86_64" />
+            <isset property="is.s390x" />
         </or>
     </condition>
     <condition property="is.32bit">
         <or>
             <isset property="is.x86" />
+            <isset property="is.s390" /> <!-- 31bit of course -->
         </or>
     </condition>
     <condition property="hy.bits" value="32">
@@ -213,6 +222,8 @@
   is.x86 = ${is.x86}
   is.x86_64 = ${is.x86_64}
   is.ia64 = ${is.ia64}
+  is.s390 = ${is.s390}
+  is.s390x = ${is.s390x}
 
   exe.suffix = ${exe.suffix}
   shlib.suffix = ${shlib.suffix}



Mime
View raw message