From 6461e6c2dad5a080f6a71a26eeb523b4d9b5160c Mon Sep 17 00:00:00 2001 From: noah Date: Thu, 8 Jul 2021 11:39:58 +0800 Subject: [PATCH 1/3] I3AGUR: remove debug log to reduce build time --- openjdk-1.8.0.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index 317844e..07b12e0 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -918,7 +918,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 16 +Release: 17 # 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 @@ -1700,7 +1700,6 @@ fi make \ JAVAC_FLAGS=-g \ - LOG=trace \ SCTP_WERROR= \ ${maketargets} || ( pwd; find $top_dir_abs_path -name "hs_err_pid*.log" | xargs cat && false ) @@ -2186,6 +2185,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Thu Jul 8 2021 noah - 1:1.8.0.292-b10.17 +- remove debug log to reduce build time + * Mon Jul 5 2021 noah - 1:1.8.0.292-b10.16 - add Fix-ECDH-and-DH-memory-usage.patch -- Gitee From 20cfe522f61997f58026f2b6ea0d688015e032aa Mon Sep 17 00:00:00 2001 From: kuenking111 Date: Mon, 12 Jul 2021 14:41:30 +0800 Subject: [PATCH 2/3] I407YB: fix run SPECjvm2008 failed on 32 bit system --- ..._SPECjvm2008_failed_on_32_bit_system.patch | 30 +++++++++++++++++++ openjdk-1.8.0.spec | 7 ++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100755 fix_run_SPECjvm2008_failed_on_32_bit_system.patch diff --git a/fix_run_SPECjvm2008_failed_on_32_bit_system.patch b/fix_run_SPECjvm2008_failed_on_32_bit_system.patch new file mode 100755 index 0000000..92ed52c --- /dev/null +++ b/fix_run_SPECjvm2008_failed_on_32_bit_system.patch @@ -0,0 +1,30 @@ +diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp +index cf2812597..a8a87cc1b 100644 +--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp ++++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp +@@ -60,12 +60,6 @@ jint ParallelScavengeHeap::initialize() { + _collector_policy->initialize_all(); + + const size_t heap_size = _collector_policy->max_heap_byte_size(); +- _workers = new FlexibleWorkGang("GC Thread",ParallelGCThreads, true, false); +- if (_workers == NULL) { +- vm_exit_during_initialization("Failed necessary allocation."); +- } else { +- _workers->initialize_workers(); +- } + ReservedSpace heap_rs = Universe::reserve_heap(heap_size, _collector_policy->heap_alignment()); + MemTracker::record_virtual_memory_type((address)heap_rs.base(), mtJavaHeap); + +@@ -130,6 +124,12 @@ jint ParallelScavengeHeap::initialize() { + + // Set up the GCTaskManager + _gc_task_manager = GCTaskManager::create(ParallelGCThreads); ++ _workers = new FlexibleWorkGang("GC Thread",ParallelGCThreads, true, false); ++ if (_workers == NULL) { ++ vm_exit_during_initialization("Failed necessary allocation."); ++ } else { ++ _workers->initialize_workers(); ++ } + + if (UseParallelOldGC && !PSParallelCompact::initialize()) { + return JNI_ENOMEM; diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index 07b12e0..f91a2e9 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -918,7 +918,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 17 +Release: 18 # 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 @@ -1111,6 +1111,7 @@ Patch197: implementation_of_Blas_hotspot_function_in_Intrinsics.patch Patch198: fix_G1GC_memory_leak_in_numa.patch Patch199: delete_untrustworthy_cacert_soneraclass2ca.patch Patch200: Fix-ECDH-and-DH-memory-usage.patch +Patch201: fix_run_SPECjvm2008_failed_on_32_bit_system.patch ############################################# # @@ -1570,6 +1571,7 @@ pushd %{top_level_dir_name} %patch198 -p1 %patch199 -p1 %patch200 -p1 +%patch201 -p1 popd # System library fixes @@ -2185,6 +2187,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Thu Jul 12 2021 kuenking111 - 1:1.8.0.292-b10.18 +- fix run SPECjvm2008 failed on 32 bit system + * Thu Jul 8 2021 noah - 1:1.8.0.292-b10.17 - remove debug log to reduce build time -- Gitee From f77771d33a204de6ff247c5318c770e8e21bf536 Mon Sep 17 00:00:00 2001 From: noah Date: Mon, 12 Jul 2021 15:57:54 +0800 Subject: [PATCH 3/3] I408S7: Fix RSACipher memory usage --- Fix-RSACipher-memory-usage.patch | 20 ++++++++++++++++++++ openjdk-1.8.0.spec | 7 ++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 Fix-RSACipher-memory-usage.patch diff --git a/Fix-RSACipher-memory-usage.patch b/Fix-RSACipher-memory-usage.patch new file mode 100644 index 0000000..962a367 --- /dev/null +++ b/Fix-RSACipher-memory-usage.patch @@ -0,0 +1,20 @@ +commit 59b41b317972a826715c705da489bb36d1a0a5a9 +Author: noah +Date: Mon Jul 12 15:54:23 2021 +0800 + + I408SI: Fix RSACipher memory usage + +diff --git a/jdk/src/solaris/native/org/openeuler/security/openssl/kae_cipher_rsa.c b/jdk/src/solaris/native/org/openeuler/security/openssl/kae_cipher_rsa.c +index cbab7bdb..d1aedf5f 100644 +--- a/jdk/src/solaris/native/org/openeuler/security/openssl/kae_cipher_rsa.c ++++ b/jdk/src/solaris/native/org/openeuler/security/openssl/kae_cipher_rsa.c +@@ -82,6 +82,9 @@ cleanup: + if (inBytes != NULL) { + (*env)->ReleaseByteArrayElements(env, in, inBytes, 0); + } ++ if (rsa != NULL) { ++ RSA_free(rsa); ++ } + return resultSize; + } + diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index f91a2e9..daf19aa 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -918,7 +918,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 18 +Release: 19 # 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 @@ -1112,6 +1112,7 @@ Patch198: fix_G1GC_memory_leak_in_numa.patch Patch199: delete_untrustworthy_cacert_soneraclass2ca.patch Patch200: Fix-ECDH-and-DH-memory-usage.patch Patch201: fix_run_SPECjvm2008_failed_on_32_bit_system.patch +Patch202: Fix-RSACipher-memory-usage.patch ############################################# # @@ -1572,6 +1573,7 @@ pushd %{top_level_dir_name} %patch199 -p1 %patch200 -p1 %patch201 -p1 +%patch202 -p1 popd # System library fixes @@ -2187,6 +2189,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Thu Jul 12 2021 noah - 1:1.8.0.292-b10.19 +- add Fix-RSACipher-memory-usage.patch + * Thu Jul 12 2021 kuenking111 - 1:1.8.0.292-b10.18 - fix run SPECjvm2008 failed on 32 bit system -- Gitee