diff --git a/8268366-C1-Incorrect-calculation-of-has_fpu_register.patch b/8268366-C1-Incorrect-calculation-of-has_fpu_register.patch new file mode 100755 index 0000000000000000000000000000000000000000..ee019bcbc408b6ecc70b558d77ade05e40d9299e --- /dev/null +++ b/8268366-C1-Incorrect-calculation-of-has_fpu_register.patch @@ -0,0 +1,123 @@ +--- + hotspot/src/share/vm/c1/c1_LinearScan.cpp | 22 ++++++-- + .../c1/TestLinearScanHasFPURegisters.java | 56 +++++++++++++++++++ + 2 files changed, 73 insertions(+), 5 deletions(-) + create mode 100644 hotspot/test/compiler/c1/TestLinearScanHasFPURegisters.java + +diff --git a/hotspot/src/share/vm/c1/c1_LinearScan.cpp b/hotspot/src/share/vm/c1/c1_LinearScan.cpp +index d754aa96b..6ac77bfcc 100644 +--- a/hotspot/src/share/vm/c1/c1_LinearScan.cpp ++++ b/hotspot/src/share/vm/c1/c1_LinearScan.cpp +@@ -659,7 +659,8 @@ void LinearScan::compute_local_live_sets() { + CodeEmitInfo* info = visitor.info_at(k); + ValueStack* stack = info->stack(); + for_each_state_value(stack, value, +- set_live_gen_kill(value, op, live_gen, live_kill) ++ set_live_gen_kill(value, op, live_gen, live_kill); ++ local_has_fpu_registers = local_has_fpu_registers || value->type()->is_float_kind(); + ); + } + +@@ -1631,22 +1632,33 @@ void LinearScan::allocate_registers() { + Interval* precolored_cpu_intervals, *not_precolored_cpu_intervals; + Interval* precolored_fpu_intervals, *not_precolored_fpu_intervals; + +- // allocate cpu registers ++ // collect cpu intervals + create_unhandled_lists(&precolored_cpu_intervals, ¬_precolored_cpu_intervals, + is_precolored_cpu_interval, is_virtual_cpu_interval); + +- // allocate fpu registers ++ // collect fpu intervals + create_unhandled_lists(&precolored_fpu_intervals, ¬_precolored_fpu_intervals, + is_precolored_fpu_interval, is_virtual_fpu_interval); +- +- // the fpu interval allocation cannot be moved down below with the fpu section as ++ // this fpu interval collection cannot be moved down below with the allocation section as + // the cpu_lsw.walk() changes interval positions. + ++ if (!has_fpu_registers()) { ++#ifdef ASSERT ++ assert(not_precolored_fpu_intervals == Interval::end(), "missed an uncolored fpu interval"); ++#else ++ if (not_precolored_fpu_intervals != Interval::end()) { ++ BAILOUT("missed an uncolored fpu interval"); ++ } ++#endif ++ } ++ ++ // allocate cpu registers + LinearScanWalker cpu_lsw(this, precolored_cpu_intervals, not_precolored_cpu_intervals); + cpu_lsw.walk(); + cpu_lsw.finish_allocation(); + + if (has_fpu_registers()) { ++ // allocate fpu registers + LinearScanWalker fpu_lsw(this, precolored_fpu_intervals, not_precolored_fpu_intervals); + fpu_lsw.walk(); + fpu_lsw.finish_allocation(); +diff --git a/hotspot/test/compiler/c1/TestLinearScanHasFPURegisters.java b/hotspot/test/compiler/c1/TestLinearScanHasFPURegisters.java +new file mode 100644 +index 000000000..da71e0995 +--- /dev/null ++++ b/hotspot/test/compiler/c1/TestLinearScanHasFPURegisters.java +@@ -0,0 +1,56 @@ ++/* ++ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++ ++/* ++ * @test ++ * @bug 8268366 ++ * @run main/othervm -Xbatch -XX:+TieredCompilation -XX:TieredStopAtLevel=1 ++ * compiler.c1.TestLinearScanHasFPURegisters ++ */ ++ ++package compiler.c1; ++ ++public class TestLinearScanHasFPURegisters { ++ void test(String[] args) { ++ String arr[] = new String[4]; ++ float f = -1; ++ try { ++ arr[0] = "-1"; // exception edge 1 with value -1 ++ if (args.length > 1) { ++ f = 42; ++ arr[1] = "42"; // exception edge 2 with value 42 ++ } ++ } catch (Exception e) { ++ // exception handler block with incoming phi for "f" ++ for (int i = 0; i < 1; ++i) { ++ f = f; // generates bytecodes, but no JIT IR ++ } ++ } ++ } ++ public static void main(String[] args) { ++ TestLinearScanHasFPURegisters t = new TestLinearScanHasFPURegisters(); ++ for (int i = 0; i < 1000; ++i) { ++ t.test(args); ++ } ++ } ++} +-- +2.31.1 + diff --git a/8312065-Socket.connect-does-not-timeout-when-profili.patch b/8312065-Socket.connect-does-not-timeout-when-profili.patch deleted file mode 100644 index e97b68c31a4d426edf13213510900414370373df..0000000000000000000000000000000000000000 --- a/8312065-Socket.connect-does-not-timeout-when-profili.patch +++ /dev/null @@ -1,366 +0,0 @@ -From 941ebd7303bce4242121cc2173d5fd6dcff2226a Mon Sep 17 00:00:00 2001 -Subject: 8312065: Socket.connect does not timeout when profiling - ---- - jdk/src/aix/native/java/net/aix_close.c | 56 +++++++++--------- - jdk/src/solaris/native/java/net/bsd_close.c | 57 ++++++++++--------- - jdk/src/solaris/native/java/net/linux_close.c | 57 ++++++++++--------- - 3 files changed, 86 insertions(+), 84 deletions(-) - -diff --git a/jdk/src/aix/native/java/net/aix_close.c b/jdk/src/aix/native/java/net/aix_close.c -index 90d57b42f..3402293c6 100644 ---- a/jdk/src/aix/native/java/net/aix_close.c -+++ b/jdk/src/aix/native/java/net/aix_close.c -@@ -53,8 +53,8 @@ - #include - #include - #include -- - #include -+#include "jvm.h" - - /* - * Stack allocated by thread when doing blocking operation -@@ -376,61 +376,61 @@ int NET_SocketClose(int fd) { - /************** Basic I/O operations here ***************/ - - /* -- * Macro to perform a blocking IO operation. Restarts -- * automatically if interrupted by signal (other than -- * our wakeup signal) -+ * Macro to perform a blocking IO operation. -+ * If interrupted by signal (other than our wakeup signal), and if RETRY is true, -+ * then restarts automatically - */ --#define BLOCKING_IO_RETURN_INT(FD, FUNC) { \ -- int ret; \ -- threadEntry_t self; \ -- fdEntry_t *fdEntry = getFdEntry(FD); \ -- if (fdEntry == NULL) { \ -- errno = EBADF; \ -- return -1; \ -- } \ -- do { \ -- startOp(fdEntry, &self); \ -- ret = FUNC; \ -- endOp(fdEntry, &self); \ -- } while (ret == -1 && errno == EINTR); \ -- return ret; \ -+#define BLOCKING_IO_RETURN_INT(FD, FUNC, RETRY) { \ -+ int ret; \ -+ threadEntry_t self; \ -+ fdEntry_t *fdEntry = getFdEntry(FD); \ -+ if (fdEntry == NULL) { \ -+ errno = EBADF; \ -+ return -1; \ -+ } \ -+ do { \ -+ startOp(fdEntry, &self); \ -+ ret = FUNC; \ -+ endOp(fdEntry, &self); \ -+ } while ((RETRY) && ret == -1 && errno == EINTR); \ -+ return ret; \ - } - - int NET_Read(int s, void* buf, size_t len) { -- BLOCKING_IO_RETURN_INT( s, recv(s, buf, len, 0) ); -+ BLOCKING_IO_RETURN_INT( s, recv(s, buf, len, 0), JNI_TRUE); - } - - int NET_NonBlockingRead(int s, void* buf, size_t len) { -- BLOCKING_IO_RETURN_INT(s, recv(s, buf, len, MSG_NONBLOCK)); -+ BLOCKING_IO_RETURN_INT(s, recv(s, buf, len, MSG_NONBLOCK), JNI_TRUE); - } - - int NET_ReadV(int s, const struct iovec * vector, int count) { -- BLOCKING_IO_RETURN_INT( s, readv(s, vector, count) ); -+ BLOCKING_IO_RETURN_INT( s, readv(s, vector, count), JNI_TRUE); - } - - int NET_RecvFrom(int s, void *buf, int len, unsigned int flags, - struct sockaddr *from, int *fromlen) { - socklen_t socklen = *fromlen; -- BLOCKING_IO_RETURN_INT( s, recvfrom(s, buf, len, flags, from, &socklen) ); -+ BLOCKING_IO_RETURN_INT( s, recvfrom(s, buf, len, flags, from, &socklen), JNI_TRUE); - *fromlen = socklen; - } - - int NET_Send(int s, void *msg, int len, unsigned int flags) { -- BLOCKING_IO_RETURN_INT( s, send(s, msg, len, flags) ); -+ BLOCKING_IO_RETURN_INT( s, send(s, msg, len, flags), JNI_TRUE); - } - - int NET_WriteV(int s, const struct iovec * vector, int count) { -- BLOCKING_IO_RETURN_INT( s, writev(s, vector, count) ); -+ BLOCKING_IO_RETURN_INT( s, writev(s, vector, count), JNI_TRUE); - } - - int NET_SendTo(int s, const void *msg, int len, unsigned int - flags, const struct sockaddr *to, int tolen) { -- BLOCKING_IO_RETURN_INT( s, sendto(s, msg, len, flags, to, tolen) ); -+ BLOCKING_IO_RETURN_INT( s, sendto(s, msg, len, flags, to, tolen), JNI_TRUE); - } - - int NET_Accept(int s, struct sockaddr *addr, int *addrlen) { - socklen_t socklen = *addrlen; -- BLOCKING_IO_RETURN_INT( s, accept(s, addr, &socklen) ); -+ BLOCKING_IO_RETURN_INT( s, accept(s, addr, &socklen), JNI_TRUE); - *addrlen = socklen; - } - -@@ -490,13 +490,13 @@ int NET_Connect(int s, struct sockaddr *addr, int addrlen) { - - #ifndef USE_SELECT - int NET_Poll(struct pollfd *ufds, unsigned int nfds, int timeout) { -- BLOCKING_IO_RETURN_INT( ufds[0].fd, poll(ufds, nfds, timeout) ); -+ BLOCKING_IO_RETURN_INT( ufds[0].fd, poll(ufds, nfds, timeout), JNI_FALSE); - } - #else - int NET_Select(int s, fd_set *readfds, fd_set *writefds, - fd_set *exceptfds, struct timeval *timeout) { - BLOCKING_IO_RETURN_INT( s-1, -- select(s, readfds, writefds, exceptfds, timeout) ); -+ select(s, readfds, writefds, exceptfds, timeout), JNI_FALSE); - } - #endif - -diff --git a/jdk/src/solaris/native/java/net/bsd_close.c b/jdk/src/solaris/native/java/net/bsd_close.c -index 89a20707c..37a6e5688 100644 ---- a/jdk/src/solaris/native/java/net/bsd_close.c -+++ b/jdk/src/solaris/native/java/net/bsd_close.c -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include "jvm.h" - - /* - * Stack allocated by thread when doing blocking operation -@@ -347,55 +348,55 @@ int NET_SocketClose(int fd) { - /************** Basic I/O operations here ***************/ - - /* -- * Macro to perform a blocking IO operation. Restarts -- * automatically if interrupted by signal (other than -- * our wakeup signal) -+ * Macro to perform a blocking IO operation. -+ * If interrupted by signal (other than our wakeup signal), and if RETRY is true, -+ * then restarts automatically - */ --#define BLOCKING_IO_RETURN_INT(FD, FUNC) { \ -- int ret; \ -- threadEntry_t self; \ -- fdEntry_t *fdEntry = getFdEntry(FD); \ -- if (fdEntry == NULL) { \ -- errno = EBADF; \ -- return -1; \ -- } \ -- do { \ -- startOp(fdEntry, &self); \ -- ret = FUNC; \ -- endOp(fdEntry, &self); \ -- } while (ret == -1 && errno == EINTR); \ -- return ret; \ -+#define BLOCKING_IO_RETURN_INT(FD, FUNC, RETRY) { \ -+ int ret; \ -+ threadEntry_t self; \ -+ fdEntry_t *fdEntry = getFdEntry(FD); \ -+ if (fdEntry == NULL) { \ -+ errno = EBADF; \ -+ return -1; \ -+ } \ -+ do { \ -+ startOp(fdEntry, &self); \ -+ ret = FUNC; \ -+ endOp(fdEntry, &self); \ -+ } while ((RETRY) && ret == -1 && errno == EINTR); \ -+ return ret; \ - } - - int NET_Read(int s, void* buf, size_t len) { -- BLOCKING_IO_RETURN_INT( s, recv(s, buf, len, 0) ); -+ BLOCKING_IO_RETURN_INT( s, recv(s, buf, len, 0), JNI_TRUE); - } - - int NET_NonBlockingRead(int s, void* buf, size_t len) { -- BLOCKING_IO_RETURN_INT( s, recv(s, buf, len, MSG_DONTWAIT)); -+ BLOCKING_IO_RETURN_INT( s, recv(s, buf, len, MSG_DONTWAIT), JNI_TRUE); - } - - int NET_ReadV(int s, const struct iovec * vector, int count) { -- BLOCKING_IO_RETURN_INT( s, readv(s, vector, count) ); -+ BLOCKING_IO_RETURN_INT( s, readv(s, vector, count), JNI_TRUE); - } - - int NET_RecvFrom(int s, void *buf, int len, unsigned int flags, - struct sockaddr *from, int *fromlen) { - /* casting int *fromlen -> socklen_t* Both are ints */ -- BLOCKING_IO_RETURN_INT( s, recvfrom(s, buf, len, flags, from, (socklen_t *)fromlen) ); -+ BLOCKING_IO_RETURN_INT( s, recvfrom(s, buf, len, flags, from, (socklen_t *)fromlen), JNI_TRUE); - } - - int NET_Send(int s, void *msg, int len, unsigned int flags) { -- BLOCKING_IO_RETURN_INT( s, send(s, msg, len, flags) ); -+ BLOCKING_IO_RETURN_INT( s, send(s, msg, len, flags), JNI_TRUE); - } - - int NET_WriteV(int s, const struct iovec * vector, int count) { -- BLOCKING_IO_RETURN_INT( s, writev(s, vector, count) ); -+ BLOCKING_IO_RETURN_INT( s, writev(s, vector, count), JNI_TRUE); - } - - int NET_SendTo(int s, const void *msg, int len, unsigned int - flags, const struct sockaddr *to, int tolen) { -- BLOCKING_IO_RETURN_INT( s, sendto(s, msg, len, flags, to, tolen) ); -+ BLOCKING_IO_RETURN_INT( s, sendto(s, msg, len, flags, to, tolen), JNI_TRUE); - } - - int NET_Accept(int s, struct sockaddr *addr, int *addrlen) { -@@ -403,22 +404,22 @@ int NET_Accept(int s, struct sockaddr *addr, int *addrlen) { - int error = accept(s, addr, &len); - if (error != -1) - *addrlen = (int)len; -- BLOCKING_IO_RETURN_INT( s, error ); -+ BLOCKING_IO_RETURN_INT( s, error, JNI_TRUE); - } - - int NET_Connect(int s, struct sockaddr *addr, int addrlen) { -- BLOCKING_IO_RETURN_INT( s, connect(s, addr, addrlen) ); -+ BLOCKING_IO_RETURN_INT( s, connect(s, addr, addrlen), JNI_TRUE); - } - - #ifndef USE_SELECT - int NET_Poll(struct pollfd *ufds, unsigned int nfds, int timeout) { -- BLOCKING_IO_RETURN_INT( ufds[0].fd, poll(ufds, nfds, timeout) ); -+ BLOCKING_IO_RETURN_INT( ufds[0].fd, poll(ufds, nfds, timeout), JNI_FALSE); - } - #else - int NET_Select(int s, fd_set *readfds, fd_set *writefds, - fd_set *exceptfds, struct timeval *timeout) { - BLOCKING_IO_RETURN_INT( s-1, -- select(s, readfds, writefds, exceptfds, timeout) ); -+ select(s, readfds, writefds, exceptfds, timeout), JNI_FALSE); - } - #endif - -diff --git a/jdk/src/solaris/native/java/net/linux_close.c b/jdk/src/solaris/native/java/net/linux_close.c -index f4c53a0d0..2a31b1591 100644 ---- a/jdk/src/solaris/native/java/net/linux_close.c -+++ b/jdk/src/solaris/native/java/net/linux_close.c -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include "jvm.h" - - /* - * Stack allocated by thread when doing blocking operation -@@ -343,77 +344,77 @@ int NET_SocketClose(int fd) { - /************** Basic I/O operations here ***************/ - - /* -- * Macro to perform a blocking IO operation. Restarts -- * automatically if interrupted by signal (other than -- * our wakeup signal) -+ * Macro to perform a blocking IO operation. -+ * If interrupted by signal (other than our wakeup signal), and if RETRY is true, -+ * then restarts automatically - */ --#define BLOCKING_IO_RETURN_INT(FD, FUNC) { \ -- int ret; \ -- threadEntry_t self; \ -- fdEntry_t *fdEntry = getFdEntry(FD); \ -- if (fdEntry == NULL) { \ -- errno = EBADF; \ -- return -1; \ -- } \ -- do { \ -- startOp(fdEntry, &self); \ -- ret = FUNC; \ -- endOp(fdEntry, &self); \ -- } while (ret == -1 && errno == EINTR); \ -- return ret; \ -+#define BLOCKING_IO_RETURN_INT(FD, FUNC, RETRY) { \ -+ int ret; \ -+ threadEntry_t self; \ -+ fdEntry_t *fdEntry = getFdEntry(FD); \ -+ if (fdEntry == NULL) { \ -+ errno = EBADF; \ -+ return -1; \ -+ } \ -+ do { \ -+ startOp(fdEntry, &self); \ -+ ret = FUNC; \ -+ endOp(fdEntry, &self); \ -+ } while ((RETRY) && ret == -1 && errno == EINTR); \ -+ return ret; \ - } - - int NET_Read(int s, void* buf, size_t len) { -- BLOCKING_IO_RETURN_INT( s, recv(s, buf, len, 0) ); -+ BLOCKING_IO_RETURN_INT( s, recv(s, buf, len, 0), JNI_TRUE); - } - - int NET_NonBlockingRead(int s, void* buf, size_t len) { -- BLOCKING_IO_RETURN_INT( s, recv(s, buf, len, MSG_DONTWAIT) ); -+ BLOCKING_IO_RETURN_INT( s, recv(s, buf, len, MSG_DONTWAIT), JNI_TRUE); - } - - int NET_ReadV(int s, const struct iovec * vector, int count) { -- BLOCKING_IO_RETURN_INT( s, readv(s, vector, count) ); -+ BLOCKING_IO_RETURN_INT( s, readv(s, vector, count), JNI_TRUE); - } - - int NET_RecvFrom(int s, void *buf, int len, unsigned int flags, - struct sockaddr *from, int *fromlen) { - socklen_t socklen = *fromlen; -- BLOCKING_IO_RETURN_INT( s, recvfrom(s, buf, len, flags, from, &socklen) ); -+ BLOCKING_IO_RETURN_INT( s, recvfrom(s, buf, len, flags, from, &socklen), JNI_TRUE); - *fromlen = socklen; - } - - int NET_Send(int s, void *msg, int len, unsigned int flags) { -- BLOCKING_IO_RETURN_INT( s, send(s, msg, len, flags) ); -+ BLOCKING_IO_RETURN_INT( s, send(s, msg, len, flags), JNI_TRUE); - } - - int NET_WriteV(int s, const struct iovec * vector, int count) { -- BLOCKING_IO_RETURN_INT( s, writev(s, vector, count) ); -+ BLOCKING_IO_RETURN_INT( s, writev(s, vector, count), JNI_TRUE); - } - - int NET_SendTo(int s, const void *msg, int len, unsigned int - flags, const struct sockaddr *to, int tolen) { -- BLOCKING_IO_RETURN_INT( s, sendto(s, msg, len, flags, to, tolen) ); -+ BLOCKING_IO_RETURN_INT( s, sendto(s, msg, len, flags, to, tolen), JNI_TRUE); - } - - int NET_Accept(int s, struct sockaddr *addr, int *addrlen) { - socklen_t socklen = *addrlen; -- BLOCKING_IO_RETURN_INT( s, accept(s, addr, &socklen) ); -+ BLOCKING_IO_RETURN_INT( s, accept(s, addr, &socklen), JNI_TRUE); - *addrlen = socklen; - } - - int NET_Connect(int s, struct sockaddr *addr, int addrlen) { -- BLOCKING_IO_RETURN_INT( s, connect(s, addr, addrlen) ); -+ BLOCKING_IO_RETURN_INT( s, connect(s, addr, addrlen), JNI_TRUE); - } - - #ifndef USE_SELECT - int NET_Poll(struct pollfd *ufds, unsigned int nfds, int timeout) { -- BLOCKING_IO_RETURN_INT( ufds[0].fd, poll(ufds, nfds, timeout) ); -+ BLOCKING_IO_RETURN_INT( ufds[0].fd, poll(ufds, nfds, timeout), JNI_FALSE); - } - #else - int NET_Select(int s, fd_set *readfds, fd_set *writefds, - fd_set *exceptfds, struct timeval *timeout) { - BLOCKING_IO_RETURN_INT( s-1, -- select(s, readfds, writefds, exceptfds, timeout) ); -+ select(s, readfds, writefds, exceptfds, timeout), JNI_FALSE); - } - #endif - --- -2.22.0 - diff --git a/add-missing-test-case.patch b/add-missing-test-case.patch index 1a533c471e2e8f36bff6a8745888be3047dbf12b..cc7e8355d2a8c80743299b4df65700b25a66fab4 100644 --- a/add-missing-test-case.patch +++ b/add-missing-test-case.patch @@ -91,7 +91,7 @@ index 00000000..9b614024 --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ -+8.462.8.0.13 ++8.472.8.0.13 -- 2.23.0 diff --git a/fix_X509TrustManagerImpl_symantec_distrust.patch b/fix_X509TrustManagerImpl_symantec_distrust.patch index a2915729b9bdf4d279ea83d59c285bb1bccf1b52..aee74de089c1325c01650abeaa932e86f989a25d 100644 --- a/fix_X509TrustManagerImpl_symantec_distrust.patch +++ b/fix_X509TrustManagerImpl_symantec_distrust.patch @@ -39,14 +39,14 @@ index 54e1bfa0d..c1423dc5b 100644 + File.separator + "security" + File.separator + "cacerts"; // The numbers of certs now. -- private static final int COUNT = 84; -+ private static final int COUNT = 107; +- private static final int COUNT = 80; ++ private static final int COUNT = 103; // SHA-256 of cacerts, can be generated with // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95 private static final String CHECKSUM - = "2D:04:88:6C:52:53:54:EB:38:2D:BC:E0:AF:B7:82:F4:9E:32:A8:1A:1B:A3:AE:CF:25:CB:C2:F6:0F:4E:E1:20"; -+ = "CE:E3:02:30:9D:6E:E9:71:85:2E:2D:96:CA:0F:16:D0:EA:12:32:14:BE:B4:44:48:86:C8:52:E4:2F:35:E5:3A"; ++ = "7D:E0:1D:42:DB:50:62:81:23:15:B5:9B:CA:DF:13:BE:6D:96:3C:C8:42:EE:59:97:A2:B9:E5:73:8D:CF:92:CE"; // map of cert alias to SHA-256 fingerprint @SuppressWarnings("serial") diff --git a/jdk8u-jdk8u462-b08.tar.xz b/jdk8u-jdk8u472-b08.tar.xz similarity index 82% rename from jdk8u-jdk8u462-b08.tar.xz rename to jdk8u-jdk8u472-b08.tar.xz index b07bef8aebfb296d0505ffc5b50420089f1a442d..118a30c14fa3836bc3c4dc7e1e9d35a9b7bb1a4f 100644 Binary files a/jdk8u-jdk8u462-b08.tar.xz and b/jdk8u-jdk8u472-b08.tar.xz differ diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index 6d81763a05f7f5303dd3714ab2b194b419f70f9d..921d01a4e5a4007b5d52fb2fb922a5a9ea566879 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -180,12 +180,12 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global repo jdk8u -%global revision jdk8u462-b08 +%global revision jdk8u472-b08 %global full_revision %{repo}-%{revision} # Define IcedTea version used for SystemTap tapsets and desktop files %global icedteaver 3.15.0 -%global updatever 462 +%global updatever 472 %global buildver b08 # priority must be 7 digits in total. The expression is workarounding tip %global priority 1800%{updatever} @@ -953,7 +953,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 5 +Release: 0 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -1311,7 +1311,6 @@ Patch402: 8312200-Fix-Parse-catch_call_exceptions-memory-leak.patch Patch404: 8285516-clearPassword-should-be-called-in-a-finally-.patch Patch405: 8148470-Metadata-print-routines-should-not-print-to-.patch Patch406: 8293344-JDK-8242181-broke-stack-printing-for-non-att.patch -Patch408: 8312065-Socket.connect-does-not-timeout-when-profili.patch Patch409: Add-Problemlist.patch Patch410: Fix-an-error-caused-by-anonymous-when-AppCDS-generat.patch Patch411: Add-CaptchaTest-and-fix-KAE-Testcases.patch @@ -1387,6 +1386,9 @@ Patch473: change-jprofilecache-copyright.patch Patch474: 8210389-C2-assert-n-outcnt-0-C-top-n-n-is_Proj-faile.patch Patch475: 8287432-C2-assert-tn-in-0-__null-failed-must-have-li.patch +#472 +Patch476: 8268366-C1-Incorrect-calculation-of-has_fpu_register.patch + ############################################# # # Upstreamable patches @@ -2013,7 +2015,6 @@ pushd %{top_level_dir_name} %patch404 -p1 %patch405 -p1 %patch406 -p1 -%patch408 -p1 %patch409 -p1 %patch410 -p1 %patch411 -p1 @@ -2076,6 +2077,7 @@ pushd %{top_level_dir_name} %patch473 -p1 %patch474 -p1 %patch475 -p1 +%patch476 -p1 %endif %ifarch loongarch64 @@ -3060,6 +3062,14 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %endif %changelog +* Wed Oct 22 2025 DXwangg -1:1.8.0.472.b08-0 +- update to 8u472 +- add 8268366-C1-Incorrect-calculation-of-has_fpu_register.patch +- deleted 8312065-Socket.connect-does-not-timeout-when-profili.patch +- modified fix_X509TrustManagerImpl_symantec_distrust.patch +- modified update-cacerts-and-VerifyCACerts.java-test.patch +- modified add-missing-test-case.patch + * Wed Oct 22 2025 Benshuai5D -1:1.8.0.462.b08-5 - add 8287432-C2-assert-tn-in-0-__null-failed-must-have-li.patch - add 8210389-C2-assert-n-outcnt-0-C-top-n-n-is_Proj-faile.patch diff --git a/update-cacerts-and-VerifyCACerts.java-test.patch b/update-cacerts-and-VerifyCACerts.java-test.patch index 5dda58a2f9a7fae67e8e2a9fa34410124be589f8..23777ab78a3de45e0b69a09a958bd7f5334417a5 100644 --- a/update-cacerts-and-VerifyCACerts.java-test.patch +++ b/update-cacerts-and-VerifyCACerts.java-test.patch @@ -257,13 +257,13 @@ index dd107fc..791ddb6 100644 + File.separator + "security" + File.separator + "cacerts"; // The numbers of certs now. -- private static final int COUNT = 113; -+ private static final int COUNT = 84; +- private static final int COUNT = 109; ++ private static final int COUNT = 80; // SHA-256 of cacerts, can be generated with // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95 private static final String CHECKSUM -- = "1E:63:88:DF:34:AD:7E:61:3F:06:BD:C4:DC:FE:05:52:9B:0D:86:6E:64:DA:E8:25:7C:C0:15:8F:31:C0:2C:78"; +- = "F2:0C:60:47:49:FA:13:2A:03:A4:52:20:AD:46:7C:D0:3F:3D:A7:59:D6:27:E9:9B:CC:D4:5A:04:8D:2A:DE:9F"; + = "2D:04:88:6C:52:53:54:EB:38:2D:BC:E0:AF:B7:82:F4:9E:32:A8:1A:1B:A3:AE:CF:25:CB:C2:F6:0F:4E:E1:20"; // map of cert alias to SHA-256 fingerprint