From 435dcd810559c6f4e2467f9a26257430b3d81c37 Mon Sep 17 00:00:00 2001 From: Piotr Kubaj Date: Mon, 15 Mar 2021 14:58:01 +0000 Subject: [PATCH] java/openjdk12: fix build on powerpc64le This ports r556940 to java/openjdk11. Approved by: tier 2 blanket --- java/openjdk12/Makefile | 12 ++++++----- .../files/patch-make_autoconf_flags-cflags.m4 | 6 +++++- ...s__cpu_bsd__ppc_bytes__bsd__ppc.inline.hpp | 20 +++++++++++++++++++ ...nt_bsd_native_libsaproc_BsdDebuggerLocal.c | 20 +++++++++++++++++++ 4 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__ppc_bytes__bsd__ppc.inline.hpp create mode 100644 java/openjdk12/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.c diff --git a/java/openjdk12/Makefile b/java/openjdk12/Makefile index 4d1f38546774..3891b4fb00c7 100644 --- a/java/openjdk12/Makefile +++ b/java/openjdk12/Makefile @@ -12,7 +12,7 @@ COMMENT= Java Development Kit ${JDK_MAJOR_VERSION} LICENSE= GPLv2 -ONLY_FOR_ARCHS= amd64 i386 powerpc64 +ONLY_FOR_ARCHS= amd64 i386 powerpc64 powerpc64le BUILD_DEPENDS= zip:archivers/zip \ autoconf>0:devel/autoconf \ @@ -138,11 +138,13 @@ CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA MAKE_ENV+= USE_CLANG=true .endif -.if ${ARCH} == aarch64 || ${ARCH} == powerpc64 -CONFIGURE_ARGS+= --disable-warnings-as-errors \ - --disable-dtrace +.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*} +CONFIGURE_ARGS+= --disable-warnings-as-errors .endif -.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2 +.if ${ARCH} == aarch64 || ${ARCH} == powerpc64 +CONFIGURE_ARGS+= --disable-dtrace +.endif +.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2 || ${ARCH} == powerpc64le CONFIGURE_ARGS+= --disable-precompiled-headers .endif .if ${ARCH} != amd64 diff --git a/java/openjdk12/files/patch-make_autoconf_flags-cflags.m4 b/java/openjdk12/files/patch-make_autoconf_flags-cflags.m4 index 5156c18515da..1d298469523c 100644 --- a/java/openjdk12/files/patch-make_autoconf_flags-cflags.m4 +++ b/java/openjdk12/files/patch-make_autoconf_flags-cflags.m4 @@ -1,12 +1,16 @@ --- make/autoconf/flags-cflags.m4.orig 2020-01-08 09:12:31 UTC +++ make/autoconf/flags-cflags.m4 -@@ -770,6 +770,10 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP], +@@ -770,6 +770,14 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP], # for all archs except arm and ppc, prevent gcc to omit frame pointer $1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer" fi + elif test "x$OPENJDK_TARGET_OS_ENV" = xbsd.freebsd; then + if test "x$FLAGS_CPU" = xppc64; then + $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=powerpc64 -mtune=power5" ++ elif test "x$FLAGS_CPU" = xppc64le; then ++ # Little endian machine uses ELFv2 ABI. ++ # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI. ++ $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=power8 -mtune=power8" + fi fi diff --git a/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__ppc_bytes__bsd__ppc.inline.hpp b/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__ppc_bytes__bsd__ppc.inline.hpp new file mode 100644 index 000000000000..f8b55399d8ca --- /dev/null +++ b/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__ppc_bytes__bsd__ppc.inline.hpp @@ -0,0 +1,20 @@ +--- src/hotspot/os_cpu/bsd_ppc/bytes_bsd_ppc.inline.hpp.orig 2021-03-15 12:55:40 UTC ++++ src/hotspot/os_cpu/bsd_ppc/bytes_bsd_ppc.inline.hpp +@@ -27,13 +27,13 @@ + #define OS_CPU_BSD_PPC_VM_BYTES_BSD_PPC_INLINE_HPP + + #if defined(VM_LITTLE_ENDIAN) +-#include ++#include + + // Efficient swapping of data bytes from Java byte + // ordering to native byte ordering and vice versa. +-inline u2 Bytes::swap_u2(u2 x) { return bswap_16(x); } +-inline u4 Bytes::swap_u4(u4 x) { return bswap_32(x); } +-inline u8 Bytes::swap_u8(u8 x) { return bswap_64(x); } ++inline u2 Bytes::swap_u2(u2 x) { return bswap16(x); } ++inline u4 Bytes::swap_u4(u4 x) { return bswap32(x); } ++inline u8 Bytes::swap_u8(u8 x) { return bswap64(x); } + #endif // VM_LITTLE_ENDIAN + + #endif // OS_CPU_BSD_PPC_VM_BYTES_BSD_PPC_INLINE_HPP diff --git a/java/openjdk12/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.c b/java/openjdk12/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.c new file mode 100644 index 000000000000..8f4b50cad0b7 --- /dev/null +++ b/java/openjdk12/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.c @@ -0,0 +1,20 @@ +--- src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.c.orig 2021-03-15 13:24:28 UTC ++++ src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.c +@@ -42,7 +42,7 @@ + #include "sun_jvm_hotspot_debugger_sparc_SPARCThreadContext.h" + #endif + +-#ifdef ppc64 ++#if defined(ppc64) || defined(ppc64le) + #include "sun_jvm_hotspot_debugger_ppc64_PPC64ThreadContext.h" + #endif + +@@ -326,7 +326,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debu + #if defined(sparc) || defined(sparcv9) + #define NPRGREG sun_jvm_hotspot_debugger_sparc_SPARCThreadContext_NPRGREG + #endif +-#ifdef ppc64 ++#if defined(ppc64) || defined(ppc64le) + #define NPRGREG sun_jvm_hotspot_debugger_ppc64_PPC64ThreadContext_NPRGREG + #endif + #ifdef aarch64