packages/openjdk-1.8.0
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I3MXCZ: add fix-BoxTypeCachedMax-build-failure-when-jvm-variants.patch

Browse Source
This commit is contained in:
aijm 2021-04-20 09:38:16 +08:00
parent bbf14d7781
commit e4f7641b3d
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
fix-BoxTypeCachedMax-build-failure-when-jvm-variants.patch Executable file
View File

@ -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

7
java-1.8.0-openjdk.spec
View File

@ -921,7 +921,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver} Version: %{javaver}.%{updatever}.%{buildver}
Release: 13 Release: 14
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # 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 # 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 # 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 Patch164: src-openeuler-openjdk-1.8.0-resolve-code-inconsistencies.patch
Patch165: 818172_overflow_when_strength_reducing_interger_multiply.patch Patch165: 818172_overflow_when_strength_reducing_interger_multiply.patch
Patch166: add-missing-test-case.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 %patch164 -p1
%patch165 -p1 %patch165 -p1
%patch166 -p1 %patch166 -p1
%patch167 -p1
popd popd
@ -2150,6 +2152,9 @@ require "copy_jdk_configs.lua"
%endif %endif
%changelog %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 * Mon Apr 19 2021 aijm <aijiaming1@huawei.com> - 1:1.8.0.282-b08.13
- add add-missing-test-case.patch - add add-missing-test-case.patch