diff --git a/huawei-AArch64-Incorrect-matching-rule.patch b/huawei-AArch64-Incorrect-matching-rule.patch new file mode 100644 index 0000000000000000000000000000000000000000..6ba2ab2816768f4690011919c600dc036494d680 --- /dev/null +++ b/huawei-AArch64-Incorrect-matching-rule.patch @@ -0,0 +1,25 @@ +From bbda53ad7ece30495b16e1bf8e709a2a1ef68b82 Mon Sep 17 00:00:00 2001 +From: wuyafang +Date: Tue, 15 Jul 2025 14:53:43 +0800 +Subject: [PATCH] AArch64:Incorrect matching rule leading to improper oop + instruction encoding + +--- + src/hotspot/cpu/aarch64/aarch64.ad | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad +index ae98a3e85..50b39f784 100644 +--- a/src/hotspot/cpu/aarch64/aarch64.ad ++++ b/src/hotspot/cpu/aarch64/aarch64.ad +@@ -4854,6 +4854,7 @@ operand immByteMapBase() + %{ + // Get base of card map + predicate(BarrierSet::barrier_set()->is_a(BarrierSet::CardTableBarrierSet) && ++ n->get_ptr_type()->isa_rawptr() != NULL && + (jbyte*)n->get_ptr() == ((CardTableBarrierSet*)(BarrierSet::barrier_set()))->card_table()->byte_map_base()); + match(ConP); + +-- +2.23.0 + diff --git a/huawei-remove-provides-in-kaeprovider-module-info.patch b/huawei-remove-provides-in-kaeprovider-module-info.patch new file mode 100644 index 0000000000000000000000000000000000000000..4349e465669d1a7c9b21bc3994d3b8905e465da8 --- /dev/null +++ b/huawei-remove-provides-in-kaeprovider-module-info.patch @@ -0,0 +1,19 @@ +Subject: [PATCH] remove provides in kaeprovider module info + +--- + src/jdk.crypto.kaeprovider/linux/classes/module-info.java | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/jdk.crypto.kaeprovider/linux/classes/module-info.java b/src/jdk.crypto.kaeprovider/linux/classes/module-info.java +index 87b29bdf9..913223bb7 100644 +--- a/src/jdk.crypto.kaeprovider/linux/classes/module-info.java ++++ b/src/jdk.crypto.kaeprovider/linux/classes/module-info.java +@@ -35,5 +35,4 @@ module jdk.crypto.kaeprovider { + requires jdk.crypto.ec; + + exports org.openeuler.security.openssl to java.base; +- provides java.security.Provider with org.openeuler.security.openssl.KAEProvider; + } +-- +2.34.1 + diff --git a/openjdk-11.spec b/openjdk-11.spec index e394f219c90f84c69dc189d4f3c0c7505ad9e0eb..f0265d74752f6e4a0621a8aafbec62e265b32419 100644 --- a/openjdk-11.spec +++ b/openjdk-11.spec @@ -773,7 +773,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 0 +Release: 1 # 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 @@ -911,6 +911,10 @@ Patch94: change-ActivePrcoessorCount-only-for-HBase.patch # 11.0.26 Patch96: add-jbolt-feature.patch Patch97: fix-potential-build-fail-in-jbolt.patch +Patch99: huawei-AArch64-Incorrect-matching-rule.patch + +# 11.0.27 +Patch100: huawei-remove-provides-in-kaeprovider-module-info.patch ############################################ # @@ -1214,6 +1218,8 @@ pushd %{top_level_dir_name} %patch94 -p1 %patch96 -p1 %patch97 -p1 +%patch99 -p1 +%patch100 -p1 %endif %endif %ifarch loongarch64 @@ -1751,12 +1757,18 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog +* Thu Jul 17 2025 Benshuai5D -1:11.0.28.6-1 +- add huawei-remove-provides-in-kaeprovider-module-info.patch + * Tue Jul 15 2025 yangyingqing -1:11.0.28.6-0 - update to 11.0.28+6(GA) - delete 8352716-tz-Update-Timezone-Data-to-2025b.patch - modify delete_expired_certificates.patch - modify G1-interate-region-by-bitmap-rather-than-obj-size-in.patch +* Tue Jul 15 2025 yangyingqing -1:11.0.27.6-2 +- add huawei-AArch64-Incorrect-matching-rule.patch + * Tue Apr 29 2025 wulongyao - 1:11.0.27.6-1 - add 8352716-tz-Update-Timezone-Data-to-2025b.patch