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

[andrew at icedtea.classpath.org]

changeset 2ef049ab5b37 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=2ef049ab5b37
author: andrew
date: Thu Jan 23 22:41:14 2014 +0000

	PR1653: Support ppc64le via Zero


changeset a74c2e4a756b in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a74c2e4a756b
author: andrew
date: Thu Jan 23 23:19:20 2014 +0000

	PR1654: ppc32 needs a larger ThreadStackSize to build


diffstat:

 make/common/shared/Defs-java.gmk |  6 +++++-
 make/common/shared/Platform.gmk  |  6 +++---
 make/jdk_generic_profile.sh      |  7 ++++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diffs (79 lines):

diff -r 53ebbd107ffa -r a74c2e4a756b make/common/shared/Defs-java.gmk
--- a/make/common/shared/Defs-java.gmk	Fri Jan 17 20:23:01 2014 +0000
+++ b/make/common/shared/Defs-java.gmk	Thu Jan 23 23:19:20 2014 +0000
@@ -88,7 +88,11 @@
 
 # 64-bit builds require a larger thread stack size.
 ifeq ($(ARCH_DATA_MODEL), 32)
-  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=768
+  ifeq ($(ARCH), ppc)
+    JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1152
+  else
+    JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=768
+  endif
 else
   JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1664
 endif
diff -r 53ebbd107ffa -r a74c2e4a756b make/common/shared/Platform.gmk
--- a/make/common/shared/Platform.gmk	Fri Jan 17 20:23:01 2014 +0000
+++ b/make/common/shared/Platform.gmk	Thu Jan 23 23:19:20 2014 +0000
@@ -161,7 +161,7 @@
     mach := $(shell uname -m)
   endif
   ifneq (,$(wildcard /usr/bin/dpkg-architecture))
-    mach := $(shell (dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/')
+    mach := $(shell (dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/;s/ppc64el/ppc64le/')
   endif
   archExpr = case "$(mach)" in \
                 i[3-9]86) \
@@ -205,10 +205,10 @@
     # Most archs are 32-bit
     ifndef ARCH_DATA_MODEL
       ARCH_DATA_MODEL=32
-      ifeq ($(ARCH), amd64)
+      ifneq (,$(findstring 64,$(ARCH)))
         ARCH_DATA_MODEL=64
       endif
-      ifeq ($(ARCH), ia64)
+      ifeq ($(ARCH), s390x)
         ARCH_DATA_MODEL=64
       endif
       ifeq ($(ARCH), sh)
diff -r 53ebbd107ffa -r a74c2e4a756b make/jdk_generic_profile.sh
--- a/make/jdk_generic_profile.sh	Fri Jan 17 20:23:01 2014 +0000
+++ b/make/jdk_generic_profile.sh	Thu Jan 23 23:19:20 2014 +0000
@@ -260,6 +260,7 @@
     sparc64) ZERO_LIBARCH=sparcv9   ;;
     arm*)    ZERO_LIBARCH=arm       ;;
     sh*)     ZERO_LIBARCH=sh        ;;
+    ppc64le) ZERO_LIBARCH=ppc64le   ;;
     *)       ZERO_LIBARCH="$(arch)"
   esac
   export ZERO_LIBARCH
@@ -269,7 +270,7 @@
     arm|i386|ppc|s390|sh|sparc)
       ARCH_DATA_MODEL=32
       ;;
-    aarch64|alpha|amd64|ia64|ppc64|s390x|sparcv9)
+    aarch64|alpha|amd64|ia64|ppc64*|s390x|sparcv9)
       ARCH_DATA_MODEL=64
       ;;
     *)
@@ -280,7 +281,7 @@
 
   # ZERO_ENDIANNESS is the endianness of the processor
   case "${ZERO_LIBARCH}" in
-    arm|aarch64|amd64|i386|ia64|mipsel)
+    arm|aarch64|amd64|i386|ia64|mipsel|ppc64le)
       ZERO_ENDIANNESS=little
       ;;
     ppc*|s390*|sparc*|alpha)
@@ -307,7 +308,7 @@
     s390)
       ZERO_ARCHFLAG="-m31"
       ;;
-    arm|aarch64)
+    arm|aarch64|ppc64le)
       ZERO_ARCHFLAG="-D_LITTLE_ENDIAN"
       ;;
     *)