I89965:update to 11.0.21+9(ga)
This commit is contained in:
DXwangg
parent
f5a2dedd88
commit
955694ed5c
@ -208,9 +208,9 @@ index f073aa63a..1323cc0ac 100644
|
||||
// this is called _after_ the global arguments have been parsed
|
||||
jint os::init_2(void) {
|
||||
|
||||
@@ -5520,32 +5613,7 @@ jint os::init_2(void) {
|
||||
Linux::libc_version(), Linux::libpthread_version());
|
||||
|
||||
@@ -5634,32 +5634,7 @@ jint os::init_2(void) {
|
||||
#endif
|
||||
|
||||
if (UseNUMA) {
|
||||
- if (!Linux::libnuma_init()) {
|
||||
- UseNUMA = false;
|
||||
|
||||
@ -16,30 +16,10 @@ diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch6
|
||||
index ce103dc1c..53cd702b9 100644
|
||||
--- a/src/hotspot/cpu/aarch64/aarch64.ad
|
||||
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
|
||||
@@ -957,6 +957,146 @@ reg_class v3_reg(
|
||||
V3, V3_H
|
||||
@@ -971,6 +971,126 @@ reg_class v7_reg(
|
||||
V7, V7_H
|
||||
);
|
||||
|
||||
+// Class for 128 bit register v4
|
||||
+reg_class v4_reg(
|
||||
+ V4, V4_H
|
||||
+);
|
||||
+
|
||||
+// Class for 128 bit register v5
|
||||
+reg_class v5_reg(
|
||||
+ V5, V5_H
|
||||
+);
|
||||
+
|
||||
+// Class for 128 bit register v6
|
||||
+reg_class v6_reg(
|
||||
+ V6, V6_H
|
||||
+);
|
||||
+
|
||||
+// Class for 128 bit register v7
|
||||
+reg_class v7_reg(
|
||||
+ V7, V7_H
|
||||
+);
|
||||
+
|
||||
|
||||
+// Class for 128 bit register v8
|
||||
+reg_class v8_reg(
|
||||
+ V8, V8_H
|
||||
@ -175,46 +155,10 @@ index ce103dc1c..53cd702b9 100644
|
||||
|
||||
//----------SOURCE BLOCK-------------------------------------------------------
|
||||
// This is a block of C++ code which provides values, functions, and
|
||||
@@ -4761,6 +4906,258 @@ operand vRegD_V3()
|
||||
@@ -4940,6 +4940,222 @@ operand vRegD_V7()
|
||||
interface(REG_INTER);
|
||||
%}
|
||||
|
||||
+operand vRegD_V4()
|
||||
+%{
|
||||
+ constraint(ALLOC_IN_RC(v4_reg));
|
||||
+ match(RegD);
|
||||
+ op_cost(0);
|
||||
+ format %{ %}
|
||||
+ interface(REG_INTER);
|
||||
+%}
|
||||
+
|
||||
+operand vRegD_V5()
|
||||
+%{
|
||||
+ constraint(ALLOC_IN_RC(v5_reg));
|
||||
+ match(RegD);
|
||||
+ op_cost(0);
|
||||
+ format %{ %}
|
||||
+ interface(REG_INTER);
|
||||
+%}
|
||||
+
|
||||
+operand vRegD_V6()
|
||||
+%{
|
||||
+ constraint(ALLOC_IN_RC(v6_reg));
|
||||
+ match(RegD);
|
||||
+ op_cost(0);
|
||||
+ format %{ %}
|
||||
+ interface(REG_INTER);
|
||||
+%}
|
||||
+
|
||||
+operand vRegD_V7()
|
||||
+%{
|
||||
+ constraint(ALLOC_IN_RC(v7_reg));
|
||||
+ match(RegD);
|
||||
+ op_cost(0);
|
||||
+ format %{ %}
|
||||
+ interface(REG_INTER);
|
||||
+%}
|
||||
+
|
||||
+operand vRegD_V8()
|
||||
+%{
|
||||
+ constraint(ALLOC_IN_RC(v8_reg));
|
||||
|
||||
@ -367,4 +367,4 @@ index 000000000..85b49171c
|
||||
--- /dev/null
|
||||
+++ b/version.txt
|
||||
@@ -0,0 +1 @@
|
||||
+11.0.20.0.13
|
||||
+11.0.21.0.13
|
||||
|
||||
@ -116,7 +116,7 @@ diff --git a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java b/test/jdk/sun
|
||||
index 122a01901..c131bd493 100644
|
||||
--- a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
|
||||
+++ b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
|
||||
@@ -53,12 +53,12 @@ public class VerifyCACerts {
|
||||
@@ -47,12 +47,12 @@ public class VerifyCACerts {
|
||||
+ File.separator + "security" + File.separator + "cacerts";
|
||||
|
||||
// The numbers of certs now.
|
||||
@ -126,11 +126,11 @@ index 122a01901..c131bd493 100644
|
||||
// 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
|
||||
- = "72:C7:B8:9E:54:94:D2:D9:C0:E5:9F:F7:C3:8C:3B:18:D7:42:23:82:51:F2:AD:A1:14:26:E0:4A:F2:5F:AE:80";
|
||||
+ = "38:20:3E:9C:85:F4:5C:F2:4A:F4:1C:FF:DA:AD:DF:A6:1E:B0:E9:8F:D4:C3:B5:AA:F5:54:E2:94:3E:AF:2F:7C";
|
||||
|
||||
- = "88:72:92:56:FF:E5:A3:E4:39:98:6D:18:0B:BA:CC:0B:66:CB:1D:6D:52:CE:D7:C8:AD:63:B7:F1:5F:02:24:52";
|
||||
+ = "F3:7B:BE:30:2F:68:F9:75:82:21:0B:81:E1:26:32:4C:C0:00:32:B0:66:70:8E:A7:36:65:E8:86:6A:72:4E:F8";
|
||||
// map of cert alias to SHA-256 fingerprint
|
||||
@SuppressWarnings("serial")
|
||||
private static final Map<String, String> FINGERPRINT_MAP = new HashMap<>() {
|
||||
@@ -116,8 +116,6 @@ public class VerifyCACerts {
|
||||
"7E:37:CB:8B:4C:47:09:0C:AB:36:55:1B:A6:F4:5D:B8:40:68:0F:BA:16:6A:95:2D:B1:00:71:7F:43:05:3F:C2");
|
||||
put("digicerthighassuranceevrootca [jdk]",
|
||||
|
||||
Binary file not shown.
@ -118,7 +118,7 @@
|
||||
|
||||
# New Version-String scheme-style defines
|
||||
%global majorver 11
|
||||
%global securityver 20
|
||||
%global securityver 21
|
||||
# buildjdkver is usually same as %%{majorver},
|
||||
# but in time of bootstrap of next jdk, it is majorver-1,
|
||||
# and this it is better to change it here, on single place
|
||||
@ -134,12 +134,12 @@
|
||||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{origin}
|
||||
%global minorver 0
|
||||
%global buildver 8
|
||||
%global buildver 9
|
||||
%global patchver 0
|
||||
|
||||
%global project jdk-updates
|
||||
%global repo jdk11u
|
||||
%global revision jdk-11.0.20-ga
|
||||
%global revision jdk-11.0.21-ga
|
||||
%global full_revision %{project}-%{repo}-%{revision}
|
||||
# priority must be 7 digits in total
|
||||
# setting to 1, so debug ones can have 0
|
||||
@ -748,7 +748,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
|
||||
|
||||
Name: java-%{javaver}-%{origin}
|
||||
Version: %{newjavaver}.%{buildver}
|
||||
Release: 2
|
||||
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
|
||||
@ -1696,6 +1696,13 @@ cjc.mainProgram(arg)
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Oct 19 2023 DXwangg <wangjiawei80@huawei.com> - 1:11.0.21.9-0
|
||||
- update to 11.0.21+9(GA)
|
||||
- modified delete_expired_certificates.patch
|
||||
- modified G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch
|
||||
- modified 8210473-JEP-345-NUMA-Aware-Memory-Allocation-for-G1.patch
|
||||
- modified 8214527-AArch64-ZGC-for-Aarch64.patch
|
||||
|
||||
* Thu Aug 17 2023 misaka00251 <liuxin@iscas.ac.cn> - 1:11.0.20.8-2
|
||||
- Add riscv64 support (based on bishengjdk riscv branch)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user