git: e10613736114 - main - java/openjdk8: Update to 8u432
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 12 Nov 2024 01:11:08 UTC
The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=e106137361146eccda3319088546035372303f21 commit e106137361146eccda3319088546035372303f21 Author: Greg Lewis <glewis@FreeBSD.org> AuthorDate: 2024-11-11 18:19:21 +0000 Commit: Greg Lewis <glewis@FreeBSD.org> CommitDate: 2024-11-12 01:10:52 +0000 java/openjdk8: Update to 8u432 --- java/openjdk8/Makefile | 5 ++--- java/openjdk8/distinfo | 6 +++--- .../files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp | 15 --------------- .../patch-hotspot_src_share_vm_code_dependencies.hpp | 11 ----------- .../files/patch-hotspot_src_share_vm_oops_cpCache.hpp | 11 ----------- ...rc_share_native_com_sun_java_util_jar_pack_constants.h | 11 ----------- 6 files changed, 5 insertions(+), 54 deletions(-) diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 7b32985fd649..3a88540ea170 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -1,6 +1,5 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} -PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= LOCAL/jkim:jtreg PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -53,8 +52,8 @@ INSTALLDIR= ${PREFIX}/${PKGBASE} NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 8 -JDK_UPDATE_VERSION= 422 -JDK_BUILD_NUMBER= 05 +JDK_UPDATE_VERSION= 432 +JDK_BUILD_NUMBER= 06 BSD_JDK_VERSION= 1 JTREG_VERSION= 4.1 JTREG_BUILD_NUMBER= b08 diff --git a/java/openjdk8/distinfo b/java/openjdk8/distinfo index 84308fc7b225..9cdf66bfa2c0 100644 --- a/java/openjdk8/distinfo +++ b/java/openjdk8/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1722106193 +TIMESTAMP = 1731344884 SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c SIZE (jtreg4.1-b08.tar.gz) = 6834252 -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 +SHA256 (battleblow-jdk8u-8.432.06.1-jdk8u432-b06.1_GH0.tar.gz) = c001c170b003f982a86aae0321446ea7ddb1c78380e4e2c7945da3d1f59e60e5 +SIZE (battleblow-jdk8u-8.432.06.1-jdk8u432-b06.1_GH0.tar.gz) = 93361779 diff --git a/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp b/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp deleted file mode 100644 index 3cefb5553df4..000000000000 --- a/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp +++ /dev/null @@ -1,15 +0,0 @@ ---- hotspot/src/os/bsd/vm/os_perf_bsd.cpp.orig 2024-10-10 08:36:27 UTC -+++ hotspot/src/os/bsd/vm/os_perf_bsd.cpp -@@ -57,6 +57,12 @@ - * with the same name. - */ - #define _MACHINE_PCB_H_ -+ /* -+ * do not redefine breakpoint on armv7 -+ */ -+ #ifdef __arm__ -+ #define _MACHINE_CPUFUNC_H_ -+ #endif - #endif - #include <sys/user.h> - #endif diff --git a/java/openjdk8/files/patch-hotspot_src_share_vm_code_dependencies.hpp b/java/openjdk8/files/patch-hotspot_src_share_vm_code_dependencies.hpp deleted file mode 100644 index 8b0a6e6f8342..000000000000 --- a/java/openjdk8/files/patch-hotspot_src_share_vm_code_dependencies.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- hotspot/src/share/vm/code/dependencies.hpp.orig 2024-07-27 18:28:39 UTC -+++ hotspot/src/share/vm/code/dependencies.hpp -@@ -170,7 +170,7 @@ class Dependencies: public ResourceObj { - LG2_TYPE_LIMIT = 4, // assert(TYPE_LIMIT <= (1<<LG2_TYPE_LIMIT)) - - // handy categorizations of dependency types: -- all_types = ((1 << TYPE_LIMIT) - 1) & ((-1) << FIRST_TYPE), -+ all_types = ((1 << TYPE_LIMIT) - 1) & ((~0u) << FIRST_TYPE), - - non_klass_types = (1 << call_site_target_value), - klass_types = all_types & ~non_klass_types, diff --git a/java/openjdk8/files/patch-hotspot_src_share_vm_oops_cpCache.hpp b/java/openjdk8/files/patch-hotspot_src_share_vm_oops_cpCache.hpp deleted file mode 100644 index 1799f8cec164..000000000000 --- a/java/openjdk8/files/patch-hotspot_src_share_vm_oops_cpCache.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- hotspot/src/share/vm/oops/cpCache.hpp.orig 2024-07-27 18:28:39 UTC -+++ hotspot/src/share/vm/oops/cpCache.hpp -@@ -192,7 +192,7 @@ class ConstantPoolCacheEntry VALUE_OBJ_CLASS_SPEC { - field_index_mask = right_n_bits(field_index_bits), - parameter_size_bits = 8, // subset of field_index_mask, range is 0..255 - parameter_size_mask = right_n_bits(parameter_size_bits), -- option_bits_mask = ~(((-1) << tos_state_shift) | (field_index_mask | parameter_size_mask)) -+ option_bits_mask = ~(((~0u) << tos_state_shift) | (field_index_mask | parameter_size_mask)) - }; - - // specific bit definitions for the indices field: diff --git a/java/openjdk8/files/patch-jdk_src_share_native_com_sun_java_util_jar_pack_constants.h b/java/openjdk8/files/patch-jdk_src_share_native_com_sun_java_util_jar_pack_constants.h deleted file mode 100644 index 33670869a90d..000000000000 --- a/java/openjdk8/files/patch-jdk_src_share_native_com_sun_java_util_jar_pack_constants.h +++ /dev/null @@ -1,11 +0,0 @@ ---- jdk/src/share/native/com/sun/java/util/jar/pack/constants.h.orig 2024-07-27 18:28:39 UTC -+++ jdk/src/share/native/com/sun/java/util/jar/pack/constants.h -@@ -223,7 +223,7 @@ enum { - AO_HAVE_FIELD_FLAGS_HI = 1<<10, - AO_HAVE_METHOD_FLAGS_HI = 1<<11, - AO_HAVE_CODE_FLAGS_HI = 1<<12, -- AO_UNUSED_MBZ = (-1)<<13, // options bits reserved for future use. -+ AO_UNUSED_MBZ = (~0u)<<13, // options bits reserved for future use. - - #define ARCHIVE_BIT_DO(F) \ - F(AO_HAVE_SPECIAL_FORMATS) \