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/openjdk-11.spec b/openjdk-11.spec index 4fa0a56f92a6e34730f379afb7e9551d74d63738..c008fa94c228e5e7445e3aa21c7e96011891215c 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: 1 +Release: 2 # 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 @@ -912,6 +912,7 @@ Patch94: change-ActivePrcoessorCount-only-for-HBase.patch Patch96: add-jbolt-feature.patch Patch97: fix-potential-build-fail-in-jbolt.patch Patch98: 8352716-tz-Update-Timezone-Data-to-2025b.patch +Patch99: huawei-AArch64-Incorrect-matching-rule.patch ############################################ # @@ -1216,6 +1217,7 @@ pushd %{top_level_dir_name} %patch96 -p1 %patch97 -p1 %patch98 -p1 +%patch99 -p1 %endif %endif %ifarch loongarch64 @@ -1753,6 +1755,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog +* Tue Jul 15 2025 yangyingqing -1:11.0.27.6-2 +- add huawei-AArch64-Incorrect-matching-rule.patch + * Thu Apr 29 2025 wulongyao - 1:11.0.27.6-1 - add 8352716-tz-Update-Timezone-Data-to-2025b.patch