/hg/icedtea7-forest/jdk: 2 new changesets

[andrew at icedtea.classpath.org]

changeset af556f9f1f01 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=af556f9f1f01
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 1ad3247faaeb in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=1ad3247faaeb
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


diffstat:

 make/common/Defs-linux.gmk |  20 ++++++++++++++++++++
 make/sun/cmm/lcms/Makefile |  14 +++++++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)

diffs (54 lines):

diff -r d5d2aed90aa8 -r 1ad3247faaeb make/common/Defs-linux.gmk
--- a/make/common/Defs-linux.gmk	Fri Sep 19 02:38:01 2014 +0100
+++ b/make/common/Defs-linux.gmk	Wed Oct 01 14:55:14 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 d5d2aed90aa8 -r 1ad3247faaeb make/sun/cmm/lcms/Makefile
--- a/make/sun/cmm/lcms/Makefile	Fri Sep 19 02:38:01 2014 +0100
+++ b/make/sun/cmm/lcms/Makefile	Wed Oct 01 14:55:14 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