Mercurial > hg > icedtea7-forest > jdk
changeset 7507:068d2b78bd73 icedtea-2.6pre03
Merge with ppc-aix-port
| author | andrew |
|---|---|
| date | Tue, 29 Apr 2014 21:57:31 +0100 |
| parents | ab270c6cf64f (current diff) 6aaf00000bd5 (diff) |
| children | 06da90c6aaff |
| files | make/common/Defs-linux.gmk make/common/shared/Platform.gmk make/jdk_generic_profile.sh |
| diffstat | 3 files changed, 20 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/Defs-linux.gmk Wed Apr 23 22:32:55 2014 +0100 +++ b/make/common/Defs-linux.gmk Tue Apr 29 21:57:31 2014 +0100 @@ -199,8 +199,16 @@ CFLAGS_REQUIRED_mips += CFLAGS_REQUIRED_mipsel += -D_LITTLE_ENDIAN CFLAGS_REQUIRED_ppc += -m32 -fsigned-char -D_BIG_ENDIAN -CFLAGS_REQUIRED_ppc64 += -m64 -LDFLAGS_COMMON_ppc64 += -m64 -L/lib64 -Wl,-melf64ppc +ifeq ($(ARCH),ppc64) + ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),big) + CFLAGS_REQUIRED_ppc64 += -m64 -D_BIG_ENDIAN + LDFLAGS_COMMON_ppc64 += -m64 -L/lib64 -Wl,-melf64ppc + else ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),little) + CFLAGS_REQUIRED_ppc64 += -D_LITTLE_ENDIAN -DABI_ELFv2 + else + $(error Expected big/little for ARCH=ppc64, got OPENJDK_TARGET_CPU_ENDIAN=$(OPENJDK_TARGET_CPU_ENDIAN)) + endif +endif CFLAGS_REQUIRED_s390 += CFLAGS_REQUIRED_s390x += -m64 CFLAGS_REQUIRED_sh += -mieee
--- a/make/common/shared/Platform.gmk Wed Apr 23 22:32:55 2014 +0100 +++ b/make/common/shared/Platform.gmk Tue Apr 29 21:57:31 2014 +0100 @@ -197,7 +197,7 @@ ;; \ esac ARCH := $(shell $(archExpr) ) - ARCH_FAMILY := $(ARCH) + ARCH_FAMILY := $(ARCH:ppc64le=ppc64) # Linux builds may be 32-bit or 64-bit data model. ifeq ($(ARCH), sparc) @@ -211,6 +211,13 @@ else ARCH=sparcv9 endif + else ifeq ($(ARCH), ppc64) + ARCH_DATA_MODEL=64 + OPENJDK_TARGET_CPU_ENDIAN=big + else ifeq ($(ARCH), ppc64le) + ARCH_DATA_MODEL=64 + OPENJDK_TARGET_CPU_ENDIAN=little + ARCH := ppc64 else # Most archs are 32-bit ifndef ARCH_DATA_MODEL @@ -530,7 +537,7 @@ endif ifeq ($(PLATFORM), macosx) - ARCH_VM_SUBDIR=jre/lib + ARCH_VM_SUBDIR=jre/lib endif endif
--- a/make/jdk_generic_profile.sh Wed Apr 23 22:32:55 2014 +0100 +++ b/make/jdk_generic_profile.sh Tue Apr 29 21:57:31 2014 +0100 @@ -284,7 +284,7 @@ arm|aarch64|amd64|i386|ia64|mipsel|ppc64le) ZERO_ENDIANNESS=little ;; - ppc*|s390*|sparc*|alpha) + ppc|ppc64|s390*|sparc*|alpha) ZERO_ENDIANNESS=big ;; *)