diff --git a/0013-8287349-AArch64-Merge-LDR-instructions-to-improve-C1.patch b/0013-8287349-AArch64-Merge-LDR-instructions-to-improve-C1.patch deleted file mode 100644 index ea3d9aa90acc28ce5c7ccae65023c671f36a0cd8..0000000000000000000000000000000000000000 --- a/0013-8287349-AArch64-Merge-LDR-instructions-to-improve-C1.patch +++ /dev/null @@ -1,28 +0,0 @@ -Date: Mon, 5 Jun 2023 20:39:01 +0800 -Subject: [PATCH 13/59] 8287349: AArch64: Merge LDR instructions to improve C1 OSR performance - -Bug url: https://bugs.openjdk.org/browse/JDK-8287349 ---- - hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp -index 528eeae32..22dfd1008 100644 ---- a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp -+++ b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp -@@ -292,10 +292,9 @@ void LIR_Assembler::osr_entry() { - __ bind(L); - } - #endif -- __ ldr(r19, Address(OSR_buf, slot_offset + 0)); -+ __ ldp(r19, r20, Address(OSR_buf, slot_offset)); - __ str(r19, frame_map()->address_for_monitor_lock(i)); -- __ ldr(r19, Address(OSR_buf, slot_offset + 1*BytesPerWord)); -- __ str(r19, frame_map()->address_for_monitor_object(i)); -+ __ str(r20, frame_map()->address_for_monitor_object(i)); - } - } - } --- -2.22.0 - diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index f77477755ff28901cf5c15394a3c174ef1dfb3db..3a1e10241b8afadf5f6a492e7d2dd36ed88d7771 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -925,7 +925,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 5 +Release: 6 # 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 @@ -1205,7 +1205,6 @@ Patch315: 0009-8262316-Reducing-locks-in-RSA-Blinding.patch Patch316: 0010-8283994-Make-Xerces-DatatypeException-stackless.patch Patch317: 0011-Optimizing-ObjectInputStream-by-FreqInlineSize.patch Patch318: 0012-8301187-Memory-leaks-in-OopMapCache.patch -Patch319: 0013-8287349-AArch64-Merge-LDR-instructions-to-improve-C1.patch Patch320: 0014-8280511-AArch64-Combine-shift-and-negate-to-a-single.patch Patch321: 0015-6605915-jinfo-flag-flag-name-functionality-doesn-t-w.patch Patch322: 0016-8036599-Use-Diagnostic-Commands-instead-of-SA-by-def.patch @@ -1790,7 +1789,6 @@ pushd %{top_level_dir_name} %patch316 -p1 %patch317 -p1 %patch318 -p1 -%patch319 -p1 %patch320 -p1 %patch321 -p1 %patch322 -p1 @@ -2482,6 +2480,9 @@ cjc.mainProgram(arg) %endif %changelog +* Tue Sep 5 2023 kuenking111 - 1:1.8.0.382-b05.6 +- del 0013-8287349-AArch64-Merge-LDR-instructions-to-improve-C1.patch + * Wed Aug 30 2023 kuenking111 - 1:1.8.0.382-b05.5 - del 0022-8198510-Enable-UseDynamicNumberOfGCThreads-by-defaul.patch