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/09/29 00:19:52 UTC
svn commit: r1002383 - in /harmony/enhanced/java/branches/mrh:
classlib/depends/build/ common_resources/depends/build/
common_resources/depends/build/platform/
Author: hindessm
Date: Tue Sep 28 22:19:51 2010
New Revision: 1002383
URL: http://svn.apache.org/viewvc?rev=1002383&view=rev
Log:
Fix minor merge omissions and remove duplicate makefiles.
Removed:
harmony/enhanced/java/branches/mrh/classlib/depends/build/
Modified:
harmony/enhanced/java/branches/mrh/common_resources/depends/build/defines.mk
harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/aix.ppc32.mk
harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/aix.ppc64.mk
harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/zos.s390.mk
harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/zos.s390x.mk
Modified: harmony/enhanced/java/branches/mrh/common_resources/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/defines.mk?rev=1002383&r1=1002382&r2=1002383&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/defines.mk (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/defines.mk Tue Sep 28 22:19:51 2010
@@ -55,7 +55,7 @@ INCLUDES += -I$(HY_HDK)/include -I$(HY_H
include $(HY_HDK)/build/make/platform/$(HY_PLATFORM).mk
-DEFINES += -D_REENTRANT
+DEFINES += -D_REENTRANT -D_FILE_OFFSET_BITS=64
ifeq ($(HY_CFG),release)
OPT += $(HYRELEASECFLAGS)
Modified: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/aix.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/aix.ppc32.mk?rev=1002383&r1=1002382&r2=1002383&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/aix.ppc32.mk (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/aix.ppc32.mk Tue Sep 28 22:19:51 2010
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-CC = xlc
+CC = xlc_r
DEFINES += -DAIX -DAIX_PPC32 -DHYPPC32 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT
PLATFORM += -qcpluscmt -q32 -q mbcs -qlanglvl=extended -qarch=ppc -qinfo=pro \
-qalias=noansi -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE \
Modified: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/aix.ppc64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/aix.ppc64.mk?rev=1002383&r1=1002382&r2=1002383&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/aix.ppc64.mk (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/aix.ppc64.mk Tue Sep 28 22:19:51 2010
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-CC = xlc
+CC = xlc_r
DEFINES += -DAIX -DAIX_PPC64 -DHYPPC64 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT
PLATFORM += -qcpluscmt -q64 -DPPC64 -q mbcs -qlanglvl=extended -qarch=ppc \
-qinfo=pro -qalias=noansi -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE \
Modified: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/zos.s390.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/zos.s390.mk?rev=1002383&r1=1002382&r2=1002383&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/zos.s390.mk (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/zos.s390.mk Tue Sep 28 22:19:51 2010
@@ -19,7 +19,8 @@ AS = cc
# Use cxx/c++ for c++ compiles on z/OS
CXX = cxx
-DEFINES += -DZOS -DZOS_S390 -DHYS390 -DHY_ATOE
+DEFINES += -DZOS -DZOS_S390 -DHYS390 -DHY_ATOE -D_OPEN_SYS_IF_EXT=1 \
+ -DIPv6_FUNCTION_SUPPORT
PLATFORM = -Wc,xplink,convlit\(ISO8859-1\),FLOAT\(IEEE,FOLD,AFP\) -Wa,goff \
-Wc,NOANSIALIAS -Wc,DLL,EXPORTALL
@@ -52,3 +53,6 @@ HYDEBUGCFLAGS = -g -O0
# On z/OS set DLLPATH to LIBPATH so we link against .x export files in
# $(HY_HDK)/lib instead of directly against the .so libraries.
DLLPATH=$(LIBPATH)
+
+# AR doesn't support the 'o' option on z/OS so mtime will be updated
+AREXTRACT= x
Modified: harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/zos.s390x.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/zos.s390x.mk?rev=1002383&r1=1002382&r2=1002383&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/zos.s390x.mk (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/depends/build/platform/zos.s390x.mk Tue Sep 28 22:19:51 2010
@@ -19,7 +19,8 @@ AS = cc
# Use cxx/c++ for c++ compiles on z/OS
CXX = cxx
-DEFINES += -DZOS -DZOS_S390X -DHYS390X -DHY_ATOE
+DEFINES += -DZOS -DZOS_S390X -DHYS390X -DHY_ATOE -D_OPEN_SYS_IF_EXT=1 \
+ -DIPv6_FUNCTION_SUPPORT
PLATFORM = -Wc,lp64,xplink,convlit\(ISO8859-1\),FLOAT\(IEEE,FOLD,AFP\) \
-Wa,goff -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL
@@ -52,3 +53,6 @@ HYDEBUGCFLAGS = -g -O0
# On z/OS set DLLPATH to LIBPATH so we link against .x export files in
# $(HY_HDK)/lib instead of directly against the .so libraries.
DLLPATH=$(LIBPATH)
+
+# AR doesn't support the 'o' option on z/OS so mtime will be updated
+AREXTRACT= x