From a7f3236bcd7d1616b613315b6f223a9063c8b4bc Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Thu, 21 Jan 2021 03:04:11 +0000 Subject: Update to 11.0.10 GA --- java/openjdk11/Makefile | 5 ++--- java/openjdk11/distinfo | 6 +++--- .../files/patch-make_autoconf_flags-cflags.m4 | 17 ----------------- .../files/patch-make_lib_Awt2dLibraries.gmk | 10 +++++----- ...tspot_os__cpu_bsd__ppc_bytes__bsd__ppc.inline.hpp | 20 -------------------- .../files/patch-src_hotspot_share_opto_addnode.cpp | 20 -------------------- ...pot.agent_bsd_native_libsaproc_BsdDebuggerLocal.c | 20 -------------------- java/openjdk11/files/patch-src_utils_hsdis_Makefile | 10 ---------- 8 files changed, 10 insertions(+), 98 deletions(-) delete mode 100644 java/openjdk11/files/patch-make_autoconf_flags-cflags.m4 delete mode 100644 java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__ppc_bytes__bsd__ppc.inline.hpp delete mode 100644 java/openjdk11/files/patch-src_hotspot_share_opto_addnode.cpp delete mode 100644 java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.c delete mode 100644 java/openjdk11/files/patch-src_utils_hsdis_Makefile (limited to 'java') diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index 79343bf50bec..5afc8804f0a1 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -3,7 +3,6 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} -PORTREVISION= 2 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -61,8 +60,8 @@ NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 11 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 9 -JDK_BUILD_NUMBER= 11 +JDK_PATCH_VERSION= 10 +JDK_BUILD_NUMBER= 9 BSD_JDK_VERSION= 1 JDK_BUG_URL= https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20 diff --git a/java/openjdk11/distinfo b/java/openjdk11/distinfo index b1f9722f70d0..a01cffb837a5 100644 --- a/java/openjdk11/distinfo +++ b/java/openjdk11/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1603421965 -SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.9+11-1_GH0.tar.gz) = 56e713dfcebcd401bf57f80c47393a0225054913951f651c5f004bedf33e8b31 -SIZE (battleblow-openjdk-jdk11u-jdk-11.0.9+11-1_GH0.tar.gz) = 118255644 +TIMESTAMP = 1611191020 +SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.10+9-1_GH0.tar.gz) = 635656feec548f2dc90a16c634047980e3871fe995a4f7e8baa81743585872c1 +SIZE (battleblow-openjdk-jdk11u-jdk-11.0.10+9-1_GH0.tar.gz) = 122486444 diff --git a/java/openjdk11/files/patch-make_autoconf_flags-cflags.m4 b/java/openjdk11/files/patch-make_autoconf_flags-cflags.m4 deleted file mode 100644 index 1824747bfced..000000000000 --- a/java/openjdk11/files/patch-make_autoconf_flags-cflags.m4 +++ /dev/null @@ -1,17 +0,0 @@ ---- make/autoconf/flags-cflags.m4.orig 2020-01-08 09:12:31 UTC -+++ make/autoconf/flags-cflags.m4 -@@ -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 - - elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then diff --git a/java/openjdk11/files/patch-make_lib_Awt2dLibraries.gmk b/java/openjdk11/files/patch-make_lib_Awt2dLibraries.gmk index 450c3a5aed3f..e7fe6135a16e 100644 --- a/java/openjdk11/files/patch-make_lib_Awt2dLibraries.gmk +++ b/java/openjdk11/files/patch-make_lib_Awt2dLibraries.gmk @@ -1,11 +1,11 @@ ---- make/lib/Awt2dLibraries.gmk.orig 2020-06-10 15:26:21 UTC -+++ make/lib/Awt2dLibraries.gmk -@@ -639,7 +639,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \ +--- make/lib/Awt2dLibraries.gmk.orig 2021-01-19 20:45:30.000000000 -0800 ++++ make/lib/Awt2dLibraries.gmk 2021-01-20 18:23:43.116628000 -0800 +@@ -712,7 +712,7 @@ LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ LDFLAGS_aix := -Wl$(COMMA)-berok, \ LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ - LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ + LIBS_unix := -lfontconfig -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ - LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation \ - -framework CoreGraphics, \ + LIBS_macosx := -lawt_lwawt, \ LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ + $(WIN_AWT_LIB), \ diff --git a/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__ppc_bytes__bsd__ppc.inline.hpp b/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__ppc_bytes__bsd__ppc.inline.hpp deleted file mode 100644 index 7be8e0a13a90..000000000000 --- a/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__ppc_bytes__bsd__ppc.inline.hpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/hotspot/os_cpu/bsd_ppc/bytes_bsd_ppc.inline.hpp.orig 2020-11-19 20:56:24 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/openjdk11/files/patch-src_hotspot_share_opto_addnode.cpp b/java/openjdk11/files/patch-src_hotspot_share_opto_addnode.cpp deleted file mode 100644 index 4f304ce6b1ae..000000000000 --- a/java/openjdk11/files/patch-src_hotspot_share_opto_addnode.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/hotspot/share/opto/addnode.cpp -+++ src/hotspot/share/opto/addnode.cpp -@@ -917,7 +917,7 @@ Node *MinINode::Ideal(PhaseGVN *phase, bool can_reshape) { - - // Transform MIN2(x + c0, MIN2(x + c1, z)) into MIN2(x + MIN2(c0, c1), z) - // if x == y and the additions can't overflow. -- if (phase->eqv(x,y) && -+ if (phase->eqv(x,y) && tx != NULL && - !can_overflow(tx, x_off) && - !can_overflow(tx, y_off)) { - return new MinINode(phase->transform(new AddINode(x, phase->intcon(MIN2(x_off, y_off)))), r->in(2)); -@@ -925,7 +925,7 @@ Node *MinINode::Ideal(PhaseGVN *phase, bool can_reshape) { - } else { - // Transform MIN2(x + c0, y + c1) into x + MIN2(c0, c1) - // if x == y and the additions can't overflow. -- if (phase->eqv(x,y) && -+ if (phase->eqv(x,y) && tx != NULL && - !can_overflow(tx, x_off) && - !can_overflow(tx, y_off)) { - return new AddINode(x,phase->intcon(MIN2(x_off,y_off))); diff --git a/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.c b/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.c deleted file mode 100644 index 5eae465a0727..000000000000 --- a/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.c.orig 2020-11-19 21:24:03 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 - -@@ -373,7 +373,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 diff --git a/java/openjdk11/files/patch-src_utils_hsdis_Makefile b/java/openjdk11/files/patch-src_utils_hsdis_Makefile deleted file mode 100644 index 1c6cfb2f28db..000000000000 --- a/java/openjdk11/files/patch-src_utils_hsdis_Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- src/utils/hsdis/Makefile.orig 2020-11-19 21:27:40 UTC -+++ src/utils/hsdis/Makefile -@@ -143,6 +143,7 @@ ifdef LP64 - CFLAGS/sparcv9 += -m64 - CFLAGS/amd64 += -m64 - CFLAGS/ppc64 += -m64 -+CFLAGS/ppc64le += -m64 -DABI_ELFv2 - else # LP64 - ARCH=$(ARCH2:amd64=i386) - ifneq ($(findstring arm,$(ARCH)),) -- cgit v1.2.3