|
 |
045ef6 |
diff --git a/common/autoconf/hotspot-spec.gmk.in b/common/autoconf/hotspot-spec.gmk.in
|
|
|
045ef6 |
--- openjdk///common/autoconf/hotspot-spec.gmk.in
|
|
|
045ef6 |
+++ openjdk///common/autoconf/hotspot-spec.gmk.in
|
|
|
045ef6 |
@@ -71,6 +71,10 @@
|
|
|
045ef6 |
LIBARCH=$(OPENJDK_TARGET_CPU_LEGACY_LIB)
|
|
|
045ef6 |
# Set the cpu architecture
|
|
|
045ef6 |
ARCH=$(OPENJDK_TARGET_CPU_ARCH)
|
|
|
045ef6 |
+# ppc64le uses the HotSpot ppc64 build
|
|
|
045ef6 |
+ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
|
|
|
045ef6 |
+ ARCH=ppc64
|
|
|
045ef6 |
+endif
|
|
|
045ef6 |
# Legacy setting for building for a 64 bit machine.
|
|
|
045ef6 |
# If yes then this expands to _LP64:=1
|
|
|
045ef6 |
@LP64@
|
|
|
045ef6 |
diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4
|
|
|
045ef6 |
--- openjdk///common/autoconf/jdk-options.m4
|
|
|
045ef6 |
+++ openjdk///common/autoconf/jdk-options.m4
|
|
|
045ef6 |
@@ -158,7 +158,7 @@
|
|
|
045ef6 |
if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
|
|
|
045ef6 |
INCLUDE_SA=false
|
|
|
045ef6 |
fi
|
|
|
045ef6 |
- if test "x$VAR_CPU" = xppc64 ; then
|
|
|
045ef6 |
+ if test "x$VAR_CPU" = xppc64 -o "x$VAR_CPU" = xppc64le ; then
|
|
|
045ef6 |
INCLUDE_SA=false
|
|
|
045ef6 |
fi
|
|
|
045ef6 |
if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
|
|
|
045ef6 |
diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4
|
|
|
045ef6 |
--- openjdk///common/autoconf/platform.m4
|
|
|
045ef6 |
+++ openjdk///common/autoconf/platform.m4
|
|
|
045ef6 |
@@ -67,7 +67,7 @@
|
|
|
045ef6 |
VAR_CPU_ENDIAN=big
|
|
|
045ef6 |
;;
|
|
|
045ef6 |
powerpc64le)
|
|
|
045ef6 |
- VAR_CPU=ppc64
|
|
|
045ef6 |
+ VAR_CPU=ppc64le
|
|
|
045ef6 |
VAR_CPU_ARCH=ppc
|
|
|
045ef6 |
VAR_CPU_BITS=64
|
|
|
045ef6 |
VAR_CPU_ENDIAN=little
|
|
|
045ef6 |
diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
|
|
|
045ef6 |
--- openjdk///common/autoconf/toolchain.m4
|
|
|
045ef6 |
+++ openjdk///common/autoconf/toolchain.m4
|
|
|
045ef6 |
@@ -1123,6 +1123,9 @@
|
|
|
045ef6 |
else
|
|
|
045ef6 |
COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_BIG_ENDIAN"
|
|
|
045ef6 |
fi
|
|
|
045ef6 |
+ if test "x$OPENJDK_TARGET_CPU" = xppc64le; then
|
|
|
045ef6 |
+ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DABI_ELFv2"
|
|
|
045ef6 |
+ fi
|
|
|
045ef6 |
if test "x$OPENJDK_TARGET_OS" = xlinux; then
|
|
|
045ef6 |
COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DLINUX"
|
|
|
045ef6 |
fi
|