/hg/release/icedtea7-forest-2.5/jdk: 4 new changesets

[andrew at icedtea.classpath.org]

changeset 9e8ae6ecdbd1 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=9e8ae6ecdbd1
author: andrew
date: Wed Oct 01 14:52:34 2014 +0100

	PR2025: LCMS_CFLAGS & LCMS_LIBS should not be used unless SYSTEM_LCMS is enabled


changeset 9b1a29112ffa in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=9b1a29112ffa
author: andrew
date: Wed Oct 01 14:55:14 2014 +0100

	RH1015432: java-1.7.0-openjdk: Fails on PPC with StackOverflowError (revised comprehensive fix)
	Contributed-by: chphilli at redhat.com
	Summary: Reverse effects of fix for Oracle bug 8013398 on Zero jvm [related fix].
	 Workaround for gcc bug [ http://gcc.gnu.org/PR63341 Add -fno-tree-vectorize to ppc build.]
	 found by Andrew Haley aph at redhat.com
	  jdk/make/common/Defs-linux.gmk


changeset 16dfadea81a1 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=16dfadea81a1
author: andrew
date: Thu Oct 02 00:45:39 2014 +0100

	Bump to 2.5.3pre02


changeset f9b67cec73d2 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=f9b67cec73d2
author: andrew
date: Thu Oct 02 00:46:45 2014 +0100

	Added tag icedtea-2.5.3pre02 for changeset 16dfadea81a1


diffstat:

 .hgtags                     |   1 +
 make/common/Defs-linux.gmk  |  20 ++++++++++++++++++++
 make/jdk_generic_profile.sh |   2 +-
 make/sun/cmm/lcms/Makefile  |  14 +++++++++-----
 4 files changed, 31 insertions(+), 6 deletions(-)

diffs (74 lines):

diff -r 828993403102 -r f9b67cec73d2 .hgtags
--- a/.hgtags	Sat Mar 08 01:40:14 2014 +0400
+++ b/.hgtags	Thu Oct 02 00:46:45 2014 +0100
@@ -474,3 +474,4 @@
 d6d4b6c9f5b48254a6dc1430dee9ee85d7f86b97 icedtea-2.5.1
 1e6a8564aa3400fe8f84085c908f55a942d426f0 icedtea-2.5.2
 fa4e5dae68e19bdd1f0bac703889a4cf30a59754 icedtea-2.5.3pre01
+16dfadea81a1e00677ba697628177e2d60d5df7f icedtea-2.5.3pre02
diff -r 828993403102 -r f9b67cec73d2 make/common/Defs-linux.gmk
--- a/make/common/Defs-linux.gmk	Sat Mar 08 01:40:14 2014 +0400
+++ b/make/common/Defs-linux.gmk	Thu Oct 02 00:46:45 2014 +0100
@@ -222,7 +222,27 @@
     CFLAGS_REQUIRED     += -D_LITTLE_ENDIAN
   endif
   LDFLAGS_COMMON        += $(ZERO_ARCHFLAG)
+  ifeq ($(ZERO_ARCHDEF),PPC) 
+# gcc bug http://gcc.gnu.org/PR63341 in ppc code generation requires -fno-tree-vectorize for now
+    ifeq ($(ARCH_DATA_MODEL), 32)
+      CFLAGS_REQUIRED   += -DPPC -DPPC32 -fno-tree-vectorize
+    else
+      CFLAGS_REQUIRED   += -DPPC -DPPC64 -fno-tree-vectorize
+    endif
+  else
+    ifeq ($(ZERO_ARCHDEF),PPC32)
+      CFLAGS_REQUIRED   += -DPPC -DPPC32 -fno-tree-vectorize
+    else
+      ifeq  ($(ZERO_ARCHDEF),PPC64)
+        CFLAGS_REQUIRED   += -DPPC -DPPC64 -fno-tree-vectorize
+      endif
+    endif
+  endif
 else
+# gcc bug http://gcc.gnu.org/PR63341 in ppc code generation requires -fno-tree-vectorize for now
+CFLAGS_REQUIRED_ppc     += -fno-tree-vectorize
+CFLAGS_REQUIRED_ppc64   += -fno-tree-vectorize
+#
   CFLAGS_REQUIRED       =  $(CFLAGS_REQUIRED_$(ARCH))
   LDFLAGS_COMMON        += $(LDFLAGS_COMMON_$(ARCH))
 endif
diff -r 828993403102 -r f9b67cec73d2 make/jdk_generic_profile.sh
--- a/make/jdk_generic_profile.sh	Sat Mar 08 01:40:14 2014 +0400
+++ b/make/jdk_generic_profile.sh	Thu Oct 02 00:46:45 2014 +0100
@@ -625,7 +625,7 @@
 
 # IcedTea versioning
 export ICEDTEA_NAME="IcedTea"
-export PACKAGE_VERSION="2.5.3pre01"
+export PACKAGE_VERSION="2.5.3pre02"
 export DERIVATIVE_ID="${ICEDTEA_NAME} ${PACKAGE_VERSION}"
 echo "Building ${DERIVATIVE_ID}"
 
diff -r 828993403102 -r f9b67cec73d2 make/sun/cmm/lcms/Makefile
--- a/make/sun/cmm/lcms/Makefile	Sat Mar 08 01:40:14 2014 +0400
+++ b/make/sun/cmm/lcms/Makefile	Thu Oct 02 00:46:45 2014 +0100
@@ -97,10 +97,14 @@
 ifeq ($(PLATFORM), macosx)
 OTHER_LDLIBS = $(LIBM) -lawt -L$(LIBDIR)/xawt
 else
-OTHER_LDLIBS = $(LIBM) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt $(LCMS_LIBS)
-endif
-CPPFLAGS += -I$(SHARE_SRC)/native/sun/java2d \
-            -I$(SHARE_SRC)/native/sun/awt/debug \
-	    $(LCMS_CFLAGS)
+OTHER_LDLIBS = $(LIBM) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt
 endif
 
+CPPFLAGS += -I$(SHARE_SRC)/native/sun/java2d \
+            -I$(SHARE_SRC)/native/sun/awt/debug
+endif
+
+ifeq ($(SYSTEM_LCMS),true)
+  CPPFLAGS += $(LCMS_CFLAGS)
+  OTHER_LDLIBS += $(LCMS_LIBS)
+endif