From e4f7641b3d257ff905eccc9dc29bed89e57f72b8 Mon Sep 17 00:00:00 2001
From: aijm <aijiaming1@huawei.com>
Date: Tue, 20 Apr 2021 09:38:16 +0800
Subject: [PATCH] I3MXCZ: add
 fix-BoxTypeCachedMax-build-failure-when-jvm-variants.patch

---
 ...dMax-build-failure-when-jvm-variants.patch | 42 +++++++++++++++++++
 java-1.8.0-openjdk.spec                       |  7 +++-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100755 fix-BoxTypeCachedMax-build-failure-when-jvm-variants.patch

diff --git a/fix-BoxTypeCachedMax-build-failure-when-jvm-variants.patch b/fix-BoxTypeCachedMax-build-failure-when-jvm-variants.patch
new file mode 100755
index 0000000..745f972
--- /dev/null
+++ b/fix-BoxTypeCachedMax-build-failure-when-jvm-variants.patch
@@ -0,0 +1,42 @@
+From c971a0bc455a3d70ed0dfca17d3fd89a8a645bc2 Mon Sep 17 00:00:00 2001
+Date: Fri, 16 Apr 2021 14:10:07 +0800
+Subject: [PATCH 2/3] fix BoxTypeCachedMax build failure when jvm variants is
+ client
+
+---
+ hotspot/src/share/vm/runtime/arguments.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp
+index 5dad53a7..9cfa0451 100644
+--- a/hotspot/src/share/vm/runtime/arguments.cpp
++++ b/hotspot/src/share/vm/runtime/arguments.cpp
+@@ -2172,6 +2172,7 @@ void Arguments::set_bytecode_flags() {
+ 
+ // set Integer and Long box type cached MAX num flag : -XX:BoxTypeCachedMax=<size>
+ void Arguments::set_boxtype_cached_max_flags() {
++#ifdef COMPILER2
+   if (!AggressiveOpts) {
+     if (!FLAG_IS_DEFAULT(BoxTypeCachedMax)) {
+        int const size = 1024;
+@@ -2182,6 +2183,7 @@ void Arguments::set_boxtype_cached_max_flags() {
+        add_property(buffer);
+     }
+   }
++#endif
+ }
+ 
+ // Aggressive optimization flags  -XX:+AggressiveOpts
+@@ -2827,7 +2829,9 @@ bool Arguments::check_vm_args_consistency() {
+   // Check the minimum number of compiler threads
+   status &=verify_min_value(CICompilerCount, min_number_of_compiler_threads, "CICompilerCount");
+ 
++#ifdef COMPILER2
+   status &= verify_min_value(BoxTypeCachedMax, 1, "BoxTypeCachedMax");
++#endif
+ 
+   return status;
+ }
+-- 
+2.23.0
+
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 1caf92c..8b0c71f 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -921,7 +921,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}.%{buildver}
-Release: 13
+Release: 14
 # 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
@@ -1093,6 +1093,7 @@ Patch163: fix_VerifyCerts.java_testcase_bug.patch
 Patch164: src-openeuler-openjdk-1.8.0-resolve-code-inconsistencies.patch
 Patch165: 818172_overflow_when_strength_reducing_interger_multiply.patch
 Patch166: add-missing-test-case.patch
+Patch167: fix-BoxTypeCachedMax-build-failure-when-jvm-variants.patch
 
 #############################################
 #
@@ -1534,6 +1535,7 @@ pushd %{top_level_dir_name}
 %patch164 -p1
 %patch165 -p1
 %patch166 -p1
+%patch167 -p1
 
 popd
 
@@ -2150,6 +2152,9 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Tue Apr 20 2021 aijm <aijiaming1@huawei.com> - 1:1.8.0.282-b08.14
+- add fix-BoxTypeCachedMax-build-failure-when-jvm-variants.patch
+
 * Mon Apr 19 2021 aijm <aijiaming1@huawei.com> - 1:1.8.0.282-b08.13
 - add add-missing-test-case.patch
 
-- 
Gitee