diff --git a/8264640.patch b/8264640.patch new file mode 100755 index 0000000000000000000000000000000000000000..18413b89827ea820feb13a4784632f603ae77fd3 --- /dev/null +++ b/8264640.patch @@ -0,0 +1,20 @@ +diff --git a/src/hotspot/share/gc/cms/parOopClosures.inline.hpp b/src/hotspot/share/gc/cms/parOopClosures.inline.hpp +index 1e206292d..609a14868 100644 +--- a/src/hotspot/share/gc/cms/parOopClosures.inline.hpp ++++ b/src/hotspot/share/gc/cms/parOopClosures.inline.hpp +@@ -44,6 +44,7 @@ template inline void ParScanWeakRefClosure::do_oop_work(T* p) { + // we need to ensure that it is copied (see comment in + // ParScanClosure::do_oop_work). + Klass* objK = obj->klass(); ++ OrderAccess::loadload(); + markOop m = obj->mark_raw(); + oop new_obj; + if (m->is_marked()) { // Contains forwarding pointer. +@@ -108,6 +109,7 @@ inline void ParScanClosure::do_oop_work(T* p, + // overwritten with an overflow next pointer after the object is + // forwarded. + Klass* objK = obj->klass(); ++ OrderAccess::loadload(); + markOop m = obj->mark_raw(); + oop new_obj; + if (m->is_marked()) { // Contains forwarding pointer. diff --git a/openjdk-11.spec b/openjdk-11.spec index c2bf682c6439b2afd7df7af87d6dc32b39bf5308..ad670b8dd901644ad0c97f2cc60318e28cf28849 100644 --- a/openjdk-11.spec +++ b/openjdk-11.spec @@ -740,7 +740,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 @@ -851,6 +851,9 @@ Patch67: 8214535-support-Jmap-parallel.patch Patch68: src-openeuler-openjdk-11-resolve-code-inconsistencies.patch Patch69: G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch +#11.0.11 +Patch70: 8264640.patch + BuildRequires: autoconf BuildRequires: alsa-lib-devel BuildRequires: binutils @@ -1123,6 +1126,7 @@ pushd %{top_level_dir_name} %patch67 -p1 %patch68 -p1 %patch69 -p1 +%patch70 -p1 popd # openjdk # %patch1000 @@ -1626,6 +1630,9 @@ require "copy_jdk_configs.lua" %changelog +* Fri May 28 2021 kuenking111 - 1:11.0.11.9-1 +- add 8264640.patch + * Fri May 14 2021 hu_bo_dao - 1:11.0.11.9-0 - Update to 11.0.11+9 (GA)