diff --git a/Enable-optimizations-upon-detecting-Phytium-CPU.patch b/Enable-optimizations-upon-detecting-Phytium-CPU.patch new file mode 100644 index 0000000000000000000000000000000000000000..ac9c2623022872ee0843e5e7f0828eaa2f980e2c --- /dev/null +++ b/Enable-optimizations-upon-detecting-Phytium-CPU.patch @@ -0,0 +1,52 @@ +From 3a5804fbc7cda79823bc6ca8bfffe64279d74a38 Mon Sep 17 00:00:00 2001 +From: wangzhi1846 +Date: Thu, 17 Jul 2025 09:37:32 +0800 +Subject: [PATCH 2/4] Enable optimizations upon detecting Phytium CPU. + +--- + src/hotspot/cpu/aarch64/vm_version_aarch64.hpp | 8 ++++++++ + src/hotspot/share/ci/ciInstanceKlass.cpp | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp +index 93ff3201c..12cb884c9 100644 +--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp ++++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp +@@ -92,6 +92,7 @@ public: + CPU_MARVELL = 'V', + CPU_INTEL = 'i', + CPU_APPLE = 'a', ++ CPU_PHYTIUM = 'p', + }; + + enum Feature_Flag { +@@ -128,6 +129,13 @@ public: + return false; + } + ++ static bool is_phytium_enable() { ++ if (_cpu == CPU_PHYTIUM) { ++ return true; ++ } ++ return false; ++ } ++ + static bool is_zva_enabled() { return 0 <= _zva_length; } + static int zva_length() { + assert(is_zva_enabled(), "ZVA not available"); +diff --git a/src/hotspot/share/ci/ciInstanceKlass.cpp b/src/hotspot/share/ci/ciInstanceKlass.cpp +index ea221fb64..0b294afae 100644 +--- a/src/hotspot/share/ci/ciInstanceKlass.cpp ++++ b/src/hotspot/share/ci/ciInstanceKlass.cpp +@@ -45,7 +45,7 @@ + + static void compile_policy(Symbol* k) { + #ifdef TARGET_ARCH_aarch64 +- if (VM_Version::is_hisi_enabled() && !SharedRuntime::_opt_for_aarch64) { ++ if ((VM_Version::is_hisi_enabled() || VM_Version::is_phytium_enable()) && !SharedRuntime::_opt_for_aarch64) { + unsigned char name[19]; + strncpy((char*)name, k->as_C_string(), 18); + name[18] = '\0'; +-- +2.34.1 + diff --git a/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch b/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch index 0ef64b6a8c66caf0a7f220bde7b86c0945092d61..73e150a47f3284eafa8eecd13b4964133b98c666 100755 --- a/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch +++ b/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch @@ -367,4 +367,4 @@ index 000000000..85b49171c --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ -+11.0.28.0.13 ++11.0.29.0.13 diff --git a/delete_expired_certificates.patch b/delete_expired_certificates.patch index 47568a0d8a52fe5727c60e9021739c2b6306ed36..2f403e5c022e084085f0b2b40be55a0238365a5c 100644 --- a/delete_expired_certificates.patch +++ b/delete_expired_certificates.patch @@ -120,14 +120,14 @@ index 122a01901..c131bd493 100644 + File.separator + "security" + File.separator + "cacerts"; // The numbers of certs now. -- private static final int COUNT = 113; -+ private static final int COUNT = 110; +- private static final int COUNT = 109; ++ private static final int COUNT = 106; // 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"; -+ = "1F:85:53:2E:33:DF:8F:CC:79:16:2E:62:63:D6:96:A0:E8:46:B9:AB:8B:50:9D:C1:35:86:15:CB:3A:36:8E:5C"; +- = "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"; ++ = "1B:8D:B3:AA:96:88:D8:44:1C:D7:11:80:38:9A:81:7B:C8:38:73:0C:D0:11:B3:02:03:CA:CE:79:8E:AB:B3:10"; // map of cert alias to SHA-256 fingerprint @SuppressWarnings("serial") diff --git a/jdk-updates-jdk11u-jdk-11.0.28-ga.tar.xz b/jdk-updates-jdk11u-jdk-11.0.29-ga.tar.xz similarity index 59% rename from jdk-updates-jdk11u-jdk-11.0.28-ga.tar.xz rename to jdk-updates-jdk11u-jdk-11.0.29-ga.tar.xz index 48efce4552cc0f5ca7aac226cf9118f6489a15ed..6e214b334f33a0f9de125c9260df3c5dc511346b 100644 Binary files a/jdk-updates-jdk11u-jdk-11.0.28-ga.tar.xz and b/jdk-updates-jdk11u-jdk-11.0.29-ga.tar.xz differ diff --git a/openjdk-11.spec b/openjdk-11.spec index 0ac20014392a080ad47f7365f760d877cf76978e..80e9832ca816e7e97bb9143778ae8584f458ba56 100644 --- a/openjdk-11.spec +++ b/openjdk-11.spec @@ -131,7 +131,7 @@ # New Version-String scheme-style defines %global majorver 11 -%global securityver 28 +%global securityver 29 # 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 @@ -152,12 +152,12 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 6 +%global buildver 7 %global patchver 0 %global project jdk-updates %global repo jdk11u -%global revision jdk-11.0.28-ga +%global revision jdk-11.0.29-ga %global full_revision %{project}-%{repo}-%{revision} # priority must be 7 digits in total # setting to 1, so debug ones can have 0 @@ -773,7 +773,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 1 +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 @@ -916,6 +916,9 @@ Patch99: huawei-AArch64-Incorrect-matching-rule.patch # 11.0.27 Patch100: huawei-remove-provides-in-kaeprovider-module-info.patch +# 11.0.29 +Patch101: Enable-optimizations-upon-detecting-Phytium-CPU.patch + ############################################ # # riscv64 specific patches @@ -1220,6 +1223,7 @@ pushd %{top_level_dir_name} %patch97 -p1 %patch99 -p1 %patch100 -p1 +%patch101 -p1 %endif %endif %ifarch loongarch64 @@ -1757,6 +1761,12 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog +* Sat Oct 18 2025 DXwangg -1:11.0.29.7-0 +- update to 11.0.29+7(GA) +- modify delete_expired_certificates.patch +- modify G1-interate-region-by-bitmap-rather-than-obj-size-in.patch +- add Enable-optimizations-upon-detecting-Phytium-CPU.patch + * Thu Jul 17 2025 Benshuai5D -1:11.0.28.6-1 - add huawei-remove-provides-in-kaeprovider-module-info.patch