Mercurial > hg > release > icedtea7-forest-2.3 > jdk
changeset 6437:610f6895ab64
PR1653: Support ppc64le via Zero
| author | andrew |
|---|---|
| date | Thu, 23 Jan 2014 22:41:14 +0000 |
| parents | 39d92df0fe75 |
| children | 8fcf23c12a55 |
| files | make/common/shared/Platform.gmk make/jdk_generic_profile.sh |
| diffstat | 2 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/shared/Platform.gmk Fri Nov 22 01:15:32 2013 +0000 +++ b/make/common/shared/Platform.gmk Thu Jan 23 22:41:14 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)
--- a/make/jdk_generic_profile.sh Fri Nov 22 01:15:32 2013 +0000 +++ b/make/jdk_generic_profile.sh Thu Jan 23 22:41:14 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" ;; *)