git: 8f2d7bee515d - main - java/openjdk8: Update to 8u422
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 28 Jul 2024 06:08:54 UTC
The branch main has been updated by glewis:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8f2d7bee515d83ed62a979c1ad82175f5529be80
commit 8f2d7bee515d83ed62a979c1ad82175f5529be80
Author: Greg Lewis <glewis@FreeBSD.org>
AuthorDate: 2024-07-27 21:07:07 +0000
Commit: Greg Lewis <glewis@FreeBSD.org>
CommitDate: 2024-07-28 06:08:31 +0000
java/openjdk8: Update to 8u422
---
java/openjdk8/Makefile | 4 +-
java/openjdk8/distinfo | 6 +--
java/openjdk8/files/patch-common_autoconf_flags.m4 | 11 -----
.../patch-common_autoconf_generated-configure.sh | 11 -----
.../files/patch-hotspot_agent_src_os_bsd_symtab.c | 50 ----------------------
.../patch-hotspot_make_bsd_makefiles_ppc64.make | 15 -------
...ot_src_os__cpu_bsd__ppc_vm_thread__bsd__ppc.cpp | 32 --------------
.../patch-jdk-src-solaris-native-sun-awt-wsutils.h | 11 -----
8 files changed, 5 insertions(+), 135 deletions(-)
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 77d3862aa569..f7140a94d001 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -52,8 +52,8 @@ INSTALLDIR= ${PREFIX}/${PKGBASE}
NOPRECIOUSMAKEVARS= yes
JDK_MAJOR_VERSION= 8
-JDK_UPDATE_VERSION= 412
-JDK_BUILD_NUMBER= 08
+JDK_UPDATE_VERSION= 422
+JDK_BUILD_NUMBER= 05
BSD_JDK_VERSION= 1
JTREG_VERSION= 4.1
JTREG_BUILD_NUMBER= b08
diff --git a/java/openjdk8/distinfo b/java/openjdk8/distinfo
index 1fa7c5b12a4d..84308fc7b225 100644
--- a/java/openjdk8/distinfo
+++ b/java/openjdk8/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1714447367
+TIMESTAMP = 1722106193
SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c
SIZE (jtreg4.1-b08.tar.gz) = 6834252
-SHA256 (battleblow-jdk8u-8.412.08.1-jdk8u412-b08.1_GH0.tar.gz) = b13f582a354b8b7a2b3d98fba6d301ae7dec4ff573b8a9e7ee4960576e478389
-SIZE (battleblow-jdk8u-8.412.08.1-jdk8u412-b08.1_GH0.tar.gz) = 93596695
+SHA256 (battleblow-jdk8u-8.422.05.1-jdk8u422-b05.1_GH0.tar.gz) = 6a3f123d8a2ca827fdfd9188dc2530808b02f0721a0a3ba60db3f0ac657187b3
+SIZE (battleblow-jdk8u-8.422.05.1-jdk8u422-b05.1_GH0.tar.gz) = 93628616
diff --git a/java/openjdk8/files/patch-common_autoconf_flags.m4 b/java/openjdk8/files/patch-common_autoconf_flags.m4
deleted file mode 100644
index ec7aeafa54a7..000000000000
--- a/java/openjdk8/files/patch-common_autoconf_flags.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/autoconf/flags.m4.orig 2024-01-02 12:56:28 UTC
-+++ common/autoconf/flags.m4
-@@ -642,7 +642,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DVM_BIG_ENDIAN"
- fi
- fi
-- if test "x$OPENJDK_TARGET_CPU" = xppc64le; then
-+ if test "x$OPENJDK_TARGET_CPU" = xppc64le -o "x$OPENJDK_TARGET_CPU" = xppc64; then
- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DABI_ELFv2"
- fi
-
diff --git a/java/openjdk8/files/patch-common_autoconf_generated-configure.sh b/java/openjdk8/files/patch-common_autoconf_generated-configure.sh
deleted file mode 100644
index 3b0e94973cd3..000000000000
--- a/java/openjdk8/files/patch-common_autoconf_generated-configure.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/autoconf/generated-configure.sh.orig 2024-01-02 12:56:13 UTC
-+++ common/autoconf/generated-configure.sh
-@@ -43317,7 +43317,7 @@ $as_echo "$supports" >&6; }
- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DVM_BIG_ENDIAN"
- fi
- fi
-- if test "x$OPENJDK_TARGET_CPU" = xppc64le; then
-+ if test "x$OPENJDK_TARGET_CPU" = xppc64le -o "x$OPENJDK_TARGET_CPU" = xppc64; then
- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DABI_ELFv2"
- fi
-
diff --git a/java/openjdk8/files/patch-hotspot_agent_src_os_bsd_symtab.c b/java/openjdk8/files/patch-hotspot_agent_src_os_bsd_symtab.c
deleted file mode 100644
index 31e6ef89f82b..000000000000
--- a/java/openjdk8/files/patch-hotspot_agent_src_os_bsd_symtab.c
+++ /dev/null
@@ -1,50 +0,0 @@
---- hotspot/agent/src/os/bsd/symtab.c.orig 2023-02-18 20:21:09 UTC
-+++ hotspot/agent/src/os/bsd/symtab.c
-@@ -204,6 +204,38 @@ struct elf_section {
- void *c_data;
- };
-
-+/* Find an ELF section. */
-+static struct elf_section *find_section_by_name(char *name,
-+ int fd,
-+ ELF_EHDR *ehdr,
-+ ELF_SHDR *shbuf,
-+ struct elf_section *scn_cache)
-+{
-+ ELF_SHDR* cursct = NULL;
-+ char *strtab;
-+ int cnt;
-+
-+ if (scn_cache[ehdr->e_shstrndx].c_data == NULL) {
-+ if ((scn_cache[ehdr->e_shstrndx].c_data
-+ = read_section_data(fd, ehdr, cursct)) == NULL) {
-+ return NULL;
-+ }
-+ }
-+
-+ strtab = scn_cache[ehdr->e_shstrndx].c_data;
-+
-+ for (cursct = shbuf, cnt = 0;
-+ cnt < ehdr->e_shnum;
-+ cnt++, cursct++) {
-+ if (strcmp(cursct->sh_name + strtab, name) == 0) {
-+ scn_cache[cnt].c_data = read_section_data(fd, ehdr, cursct);
-+ return &scn_cache[cnt];
-+ }
-+ }
-+
-+ return NULL;
-+}
-+
- // read symbol table from given fd.
- struct symtab* build_symtab(int fd) {
- ELF_EHDR ehdr;
-@@ -263,7 +295,7 @@ struct symtab* build_symtab(int fd) {
- }
-
- #if defined(ppc64)
-- opd_sect = find_section_by_name(".opd", fd, &ehdr, scn_cache);
-+ opd_sect = find_section_by_name(".opd", fd, &ehdr, cursct, scn_cache);
- if (opd_sect != NULL && opd_sect->c_data != NULL && opd_sect->c_shdr != NULL) {
- // plausibility check
- opd = opd_sect->c_shdr;
diff --git a/java/openjdk8/files/patch-hotspot_make_bsd_makefiles_ppc64.make b/java/openjdk8/files/patch-hotspot_make_bsd_makefiles_ppc64.make
deleted file mode 100644
index 06f1628232b8..000000000000
--- a/java/openjdk8/files/patch-hotspot_make_bsd_makefiles_ppc64.make
+++ /dev/null
@@ -1,15 +0,0 @@
---- hotspot/make/bsd/makefiles/ppc64.make.orig 2024-01-02 13:01:01 UTC
-+++ hotspot/make/bsd/makefiles/ppc64.make
-@@ -37,11 +37,7 @@ ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),big)
- endif
-
- ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),big)
-- # fixes `relocation truncated to fit' error for gcc 4.1.
-- CFLAGS += -mminimal-toc
--
-- # finds use ppc64 instructions, but schedule for power5
-- CFLAGS += -mcpu=powerpc64 -mtune=power5 -minsert-sched-nops=regroup_exact -mno-multiple -mno-string
-+ CFLAGS += -mcpu=powerpc64 -mtune=power5 -DABI_ELFv2
- else
- # Little endian machine uses ELFv2 ABI.
- CFLAGS += -DVM_LITTLE_ENDIAN -DABI_ELFv2
diff --git a/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__ppc_vm_thread__bsd__ppc.cpp b/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__ppc_vm_thread__bsd__ppc.cpp
deleted file mode 100644
index ca52c0579b39..000000000000
--- a/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__ppc_vm_thread__bsd__ppc.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
---- hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.cpp.orig 2021-08-04 17:59:22 UTC
-+++ hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.cpp
-@@ -24,7 +24,7 @@
- */
-
- #include "precompiled.hpp"
--#include "runtime/frame.hpp"
-+#include "runtime/frame.inline.hpp"
- #include "runtime/thread.hpp"
-
- bool JavaThread::pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava) {
-@@ -42,7 +42,7 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame*
- // if we were running Java code when SIGPROF came in.
- if (isInJava) {
- ucontext_t* uc = (ucontext_t*) ucontext;
-- frame ret_frame((intptr_t*)uc->>uc_mcontext.mc_gpr[1/*REG_SP*/],
-+ frame ret_frame((intptr_t*)uc->uc_mcontext.mc_gpr[1/*REG_SP*/],
- (address)uc->uc_mcontext.mc_srr0);
-
- if (ret_frame.pc() == NULL) {
-@@ -83,11 +83,6 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame*
- bool JavaThread::pd_get_top_frame_for_signal_handler(frame* fr_addr, void* ucontext, bool isInJava) {
- assert(this->is_Java_thread(), "must be JavaThread");
- return pd_get_top_frame_for_profiling(fr_addr, ucontext, isInJava);
--}
--// Forte Analyzer AsyncGetCallTrace profiling support is not implemented on Bsd/PPC.
--bool JavaThread::pd_get_top_frame_for_signal_handler(frame* fr_addr, void* ucontext, bool isInJava) {
-- Unimplemented();
-- return false;
- }
-
- void JavaThread::cache_global_variables() { }
diff --git a/java/openjdk8/files/patch-jdk-src-solaris-native-sun-awt-wsutils.h b/java/openjdk8/files/patch-jdk-src-solaris-native-sun-awt-wsutils.h
deleted file mode 100644
index 330c809403d2..000000000000
--- a/java/openjdk8/files/patch-jdk-src-solaris-native-sun-awt-wsutils.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- jdk/src/solaris/native/sun/awt/wsutils.h
-+++ jdk/src/solaris/native/sun/awt/wsutils.h
-@@ -70,7 +70,7 @@ from The Open Group.
- *
- ******************************************************************************/
-
--typedef unsigned long Pixel;
-+#include <X11/Intrinsic.h> /* For Pixel */
-
- /* This is the actual structure returned by the X server describing the
- * SERVER_OVERLAY_VISUAL property.