From 5c73bcbf8208f517e8447c34a6e7ca213b06fc42 Mon Sep 17 00:00:00 2001 From: jdkboy Date: Wed, 3 Feb 2021 14:46:35 +0800 Subject: [PATCH 1/7] update sha512sum of arch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u282-b08.tar.xz (cherry picked from commit bbbabb0186051800f1c25fbde27147e999632fc0) --- java-1.8.0-openjdk.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index a8497f1..0a3f8c5 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -915,7 +915,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{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 @@ -2109,6 +2109,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Wed Feb 3 2021 jdkboy - 1:1.8.0.282-b08.1 +- update sha512sum of arch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u282-b08.tar.xz + * Tue Feb 2 2021 jdkboy - 1:1.8.0.282-b08.0 - updated to aarch64-shenandoah-jdk8u282-b08 (from aarch64-port/jdk8u-shenandoah) - delete 8160300.patch diff --git a/sources b/sources index 09a2aaa..552f136 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.15.0.tar.xz) = 36eed87c370306c715d7a9d0906a7d719d6d956d38d03fb8f2d528d22e0067cabb3a7df10e8a7c5b65b70f2c12b9a8e7078a78a3cac478b6031d42f36415b05f -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b10.tar.xz) = b9c84cf37cf5cadfaa0283de37a468bd87c633a91159ed67317b2ee04b125baad0b62d9354e01c9c972e4364934e12aea061757df36313114582c54d29377150 +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u282-b08.tar.xz) = c0a525bc2c8e5b81af7903952eac1e3d9e6b7793399b38ef4c1abbb14370798dcc0478bc6bbf9ef63ba4461c98e16fa99d13d642413b045ef39d4305d6312b5f -- Gitee From 1e20263663f1f8dae6082ffdb24cf5e9953f9296 Mon Sep 17 00:00:00 2001 From: jdkboy Date: Wed, 3 Feb 2021 17:33:17 +0800 Subject: [PATCH 2/7] add missing mapfile in G1-memory-uncommit.patch (cherry picked from commit be8b135d7dc921317687c2a57f449cbf386b6bb9) --- G1-memory-uncommit.patch | 12 ++++++++++++ java-1.8.0-openjdk.spec | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/G1-memory-uncommit.patch b/G1-memory-uncommit.patch index da20a27..aeecad7 100644 --- a/G1-memory-uncommit.patch +++ b/G1-memory-uncommit.patch @@ -1825,6 +1825,18 @@ index d374a47a..2a155ea1 100644 $(JDK_TOPDIR)/src/share/native/java/util \ $(JDK_TOPDIR)/src/share/native/java/util/concurrent/atomic \ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/common \ +diff --git a/jdk/make/mapfiles/libjava/mapfile-linux b/jdk/make/mapfiles/libjava/mapfile-linux +index 509279c..52959f7 100644 +--- a/jdk/make/mapfiles/libjava/mapfile-linux ++++ b/jdk/make/mapfiles/libjava/mapfile-linux +@@ -215,6 +215,7 @@ SUNWprivate_1.1 { + Java_java_lang_System_setErr0; + Java_java_lang_System_setIn0; + Java_java_lang_System_setOut0; ++ Java_com_huawei_jvm_gc_AdaptiveHeapMXBeanImpl_registerNatives; + Java_java_lang_Thread_registerNatives; + Java_java_lang_Throwable_fillInStackTrace; + Java_java_lang_Throwable_getStackTraceDepth; diff --git a/jdk/make/mapfiles/libjava/mapfile-vers b/jdk/make/mapfiles/libjava/mapfile-vers index d686924a..7aeab583 100644 --- a/jdk/make/mapfiles/libjava/mapfile-vers diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 0a3f8c5..ceab4d5 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -915,7 +915,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 1 +Release: 2 # 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 @@ -2109,6 +2109,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Wed Feb 3 2021 jdkboy - 1:1.8.0.282-b08.2 +- add missing mapfile in G1-memory-uncommit.patch + * Wed Feb 3 2021 jdkboy - 1:1.8.0.282-b08.1 - update sha512sum of arch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u282-b08.tar.xz -- Gitee From 32a381dc8326592629f33fb18add8a304b1474c4 Mon Sep 17 00:00:00 2001 From: jdkboy Date: Thu, 4 Feb 2021 15:05:27 +0800 Subject: [PATCH 3/7] fix wrong patch G1-memory-uncommit.patch (cherry picked from commit 7cc5c044c96fb53fa8bbf04de6b9a550261578f9) --- G1-memory-uncommit.patch | 80 ++++++++++++++++++++-------------------- java-1.8.0-openjdk.spec | 5 ++- 2 files changed, 44 insertions(+), 41 deletions(-) diff --git a/G1-memory-uncommit.patch b/G1-memory-uncommit.patch index aeecad7..fd8ccff 100644 --- a/G1-memory-uncommit.patch +++ b/G1-memory-uncommit.patch @@ -86,7 +86,7 @@ index 4abd2f03..b078bee0 100644 // For now just return the system wide load average (no processor sets). int os::loadavg(double values[], int nelem) { diff --git a/hotspot/src/os/bsd/vm/os_bsd.cpp b/hotspot/src/os/bsd/vm/os_bsd.cpp -index 46673771..7cd79123 100644 +index 6d1009b8..3e4d8c7e 100644 --- a/hotspot/src/os/bsd/vm/os_bsd.cpp +++ b/hotspot/src/os/bsd/vm/os_bsd.cpp @@ -4293,6 +4293,10 @@ bool os::is_thread_cpu_time_supported() { @@ -101,7 +101,7 @@ index 46673771..7cd79123 100644 // Bsd doesn't yet have a (official) notion of processor sets, // so just return the system wide load average. diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp -index 5e0c18e6..ad3a82c4 100644 +index 5848bd80..0b7f4a6e 100644 --- a/hotspot/src/os/linux/vm/os_linux.cpp +++ b/hotspot/src/os/linux/vm/os_linux.cpp @@ -38,6 +38,7 @@ @@ -112,7 +112,7 @@ index 5e0c18e6..ad3a82c4 100644 #include "prims/jniFastGetField.hpp" #include "prims/jvm.h" #include "prims/jvm_misc.hpp" -@@ -5889,6 +5890,15 @@ int os::loadavg(double loadavg[], int nelem) { +@@ -5892,6 +5893,15 @@ int os::loadavg(double loadavg[], int nelem) { return ::getloadavg(loadavg, nelem); } @@ -588,7 +588,7 @@ index 05a8dc44..8fa52137 100644 virtual void run(); // Constructor diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp -index d782c892..a69db6eb 100644 +index 14b5749f..ad696e08 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp @@ -1354,6 +1354,7 @@ void ConcurrentMark::checkpointRootsFinal(bool clear_all_soft_refs) { @@ -600,7 +600,7 @@ index d782c892..a69db6eb 100644 HandleMark hm; // handle scope Universe::heap()->prepare_for_verify(); diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp -index a90c15ea..b2d3b282 100644 +index 70646a41..ed891c50 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp @@ -47,15 +47,15 @@ G1BlockOffsetTable::block_start_const(const void* addr) const { @@ -629,7 +629,7 @@ index a90c15ea..b2d3b282 100644 u_char G1BlockOffsetSharedArray::offset_array(size_t index) const { diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp -index 91ad2e98..722e5985 100644 +index 4eccf980..273a4dd2 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp @@ -1873,6 +1873,7 @@ G1CollectedHeap::G1CollectedHeap(G1CollectorPolicy* policy_) : @@ -793,7 +793,7 @@ index 4783cbde..bde0ca4d 100644 // A set of cards where updates happened during the GC diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp -index b416917f..05a270d2 100644 +index 761b0e95..c41e6b65 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp @@ -93,6 +93,9 @@ G1CollectorPolicy::G1CollectorPolicy() : @@ -820,7 +820,7 @@ index b416917f..05a270d2 100644 _during_marking(false), _in_marking_window(false), -@@ -153,7 +163,8 @@ G1CollectorPolicy::G1CollectorPolicy() : +@@ -152,7 +162,8 @@ G1CollectorPolicy::G1CollectorPolicy() : _inc_cset_recorded_rs_lengths_diffs(0), _inc_cset_predicted_elapsed_time_ms(0.0), _inc_cset_predicted_elapsed_time_ms_diffs(0.0), @@ -830,7 +830,7 @@ index b416917f..05a270d2 100644 #ifdef _MSC_VER // the use of 'this' below gets a warning, make it go away #pragma warning( disable:4355 ) // 'this' : used in base member initializer list #endif // _MSC_VER -@@ -976,6 +987,8 @@ void G1CollectorPolicy::record_collection_pause_end(double pause_time_ms, Evacua +@@ -975,6 +986,8 @@ void G1CollectorPolicy::record_collection_pause_end(double pause_time_ms, Evacua } #endif // PRODUCT @@ -839,7 +839,7 @@ index b416917f..05a270d2 100644 last_pause_included_initial_mark = during_initial_mark_pause(); if (last_pause_included_initial_mark) { record_concurrent_mark_init_end(0.0); -@@ -1204,6 +1217,7 @@ void G1CollectorPolicy::record_heap_size_info_at_start(bool full) { +@@ -1203,6 +1216,7 @@ void G1CollectorPolicy::record_heap_size_info_at_start(bool full) { _heap_capacity_bytes_before_gc = _g1->capacity(); _heap_used_bytes_before_gc = _g1->used(); _cur_collection_pause_used_regions_at_start = _g1->num_used_regions(); @@ -847,7 +847,7 @@ index b416917f..05a270d2 100644 _eden_capacity_bytes_before_gc = (_young_list_target_length * HeapRegion::GrainBytes) - _survivor_used_bytes_before_gc; -@@ -1247,6 +1261,13 @@ void G1CollectorPolicy::print_detailed_heap_transition(bool full) { +@@ -1246,6 +1260,13 @@ void G1CollectorPolicy::print_detailed_heap_transition(bool full) { EXT_SIZE_PARAMS(heap_used_bytes_after_gc), EXT_SIZE_PARAMS(heap_capacity_bytes_after_gc)); @@ -861,7 +861,7 @@ index b416917f..05a270d2 100644 if (full) { MetaspaceAux::print_metaspace_change(_metaspace_used_bytes_before_gc); } -@@ -2160,6 +2181,53 @@ void G1CollectorPolicy::finalize_cset(double target_pause_time_ms, EvacuationInf +@@ -2159,6 +2180,53 @@ void G1CollectorPolicy::finalize_cset(double target_pause_time_ms, EvacuationInf evacuation_info.set_collectionset_regions(cset_region_length()); } @@ -1005,7 +1005,7 @@ index 02217ce4..1c918070 100644 // called when a GC alloc region is being retired. void record_bytes_copied_during_gc(size_t bytes) { diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp -index da417fb7..3066f9e6 100644 +index 4cad9234..2be3ac1b 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp @@ -206,6 +206,9 @@ public: @@ -1303,7 +1303,7 @@ index e24cc959..db7ddece 100644 G1_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG, DECLARE_MANAGEABLE_FLAG, DECLARE_PRODUCT_RW_FLAG) diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp -index f0e24811..32f8b198 100644 +index 794911ef..409399fa 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp @@ -310,7 +310,8 @@ HeapRegion::HeapRegion(uint hrm_index, @@ -1317,7 +1317,7 @@ index f0e24811..32f8b198 100644 _predicted_bytes_to_copy(0) { diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp -index b1f94fb9..27b1048f 100644 +index 52ef1d0d..9077381b 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp +++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp @@ -227,6 +227,9 @@ class HeapRegion: public G1OffsetTableContigSpace { @@ -1330,7 +1330,7 @@ index b1f94fb9..27b1048f 100644 // True iff the region is in current collection_set. bool _in_collection_set; -@@ -429,6 +432,8 @@ class HeapRegion: public G1OffsetTableContigSpace { +@@ -427,6 +430,8 @@ class HeapRegion: public G1OffsetTableContigSpace { return _humongous_start_region; } @@ -1340,7 +1340,7 @@ index b1f94fb9..27b1048f 100644 // 1 if the region is not humongous, >= 1 if the region is humongous. uint region_num() const { diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp -index 49c231d8..842550d2 100644 +index 14673df7..c4e96fda 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp @@ -53,12 +53,25 @@ void HeapRegionManager::initialize(G1RegionToSpaceMapper* heap_storage, @@ -1390,7 +1390,7 @@ index 49c231d8..842550d2 100644 _heap_mapper->uncommit_regions(start, num_regions); // Also uncommit auxiliary data -@@ -198,7 +211,7 @@ uint HeapRegionManager::find_contiguous(size_t num, bool empty_only) { +@@ -197,7 +210,7 @@ uint HeapRegionManager::find_contiguous(size_t num, bool empty_only) { while (length_found < num && cur < max_length()) { HeapRegion* hr = _regions.get_by_index(cur); @@ -1399,7 +1399,7 @@ index 49c231d8..842550d2 100644 // This region is a potential candidate for allocation into. length_found++; } else { -@@ -213,7 +226,7 @@ uint HeapRegionManager::find_contiguous(size_t num, bool empty_only) { +@@ -212,7 +225,7 @@ uint HeapRegionManager::find_contiguous(size_t num, bool empty_only) { for (uint i = found; i < (found + num); i++) { HeapRegion* hr = _regions.get_by_index(i); // sanity check @@ -1408,7 +1408,7 @@ index 49c231d8..842550d2 100644 err_msg("Found region sequence starting at " UINT32_FORMAT ", length " SIZE_FORMAT " that is not empty at " UINT32_FORMAT ". Hr is " PTR_FORMAT, found, num, i, p2i(hr))); } -@@ -239,7 +252,8 @@ void HeapRegionManager::iterate(HeapRegionClosure* blk) const { +@@ -238,7 +251,8 @@ void HeapRegionManager::iterate(HeapRegionClosure* blk) const { uint len = max_length(); for (uint i = 0; i < len; i++) { @@ -1418,7 +1418,7 @@ index 49c231d8..842550d2 100644 continue; } guarantee(at(i) != NULL, err_msg("Tried to access region %u that has a NULL HeapRegion*", i)); -@@ -265,15 +279,15 @@ uint HeapRegionManager::find_unavailable_from_idx(uint start_idx, uint* res_idx) +@@ -264,15 +278,15 @@ uint HeapRegionManager::find_unavailable_from_idx(uint start_idx, uint* res_idx) return num_regions; } *res_idx = cur; @@ -1437,7 +1437,7 @@ index 49c231d8..842550d2 100644 err_msg("The region at the current position %u must be available or at the end of the heap.", cur)); #endif return num_regions; -@@ -294,10 +308,10 @@ void HeapRegionManager::par_iterate(HeapRegionClosure* blk, uint worker_id, uint +@@ -293,10 +307,10 @@ void HeapRegionManager::par_iterate(HeapRegionClosure* blk, uint worker_id, uint const uint index = (start_index + count) % _allocated_heapregions_length; assert(0 <= index && index < _allocated_heapregions_length, "sanity"); // Skip over unavailable regions @@ -1450,7 +1450,7 @@ index 49c231d8..842550d2 100644 // We'll ignore "continues humongous" regions (we'll process them // when we come across their corresponding "start humongous" // region) and regions already claimed. -@@ -425,12 +439,12 @@ void HeapRegionManager::verify() { +@@ -424,12 +438,12 @@ void HeapRegionManager::verify() { uint num_committed = 0; HeapWord* prev_end = heap_bottom(); for (uint i = 0; i < _allocated_heapregions_length; i++) { @@ -1465,7 +1465,7 @@ index 49c231d8..842550d2 100644 guarantee(hr != NULL, err_msg("invariant: i: %u", i)); guarantee(!prev_committed || hr->bottom() == prev_end, err_msg("invariant i: %u " HR_FORMAT " prev_end: " PTR_FORMAT, -@@ -454,10 +468,38 @@ void HeapRegionManager::verify() { +@@ -453,10 +467,38 @@ void HeapRegionManager::verify() { guarantee(_regions.get_by_index(i) == NULL, err_msg("invariant i: %u", i)); } @@ -1689,7 +1689,7 @@ index 29408d77..5be14548 100644 _shenandoah_stop_vm, _shenandoah_metadata_gc_clear_softrefs, diff --git a/hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp b/hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp -index 9335a9f7..4e8dae21 100644 +index 0f8727fe..8bbcbda4 100644 --- a/hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp +++ b/hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp @@ -98,7 +98,7 @@ private: @@ -1702,7 +1702,7 @@ index 9335a9f7..4e8dae21 100644 } diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp -index 38cddfed..3a032d04 100644 +index de01fefd..e149ca64 100644 --- a/hotspot/src/share/vm/prims/jvm.cpp +++ b/hotspot/src/share/vm/prims/jvm.cpp @@ -3286,6 +3286,23 @@ JVM_ENTRY(void, JVM_SetThreadPriority(JNIEnv* env, jobject jthread, jint prio)) @@ -1769,7 +1769,7 @@ index ab3148e3..cff2e9c3 100644 static bool obsolete_option(const JavaVMOption *option); diff --git a/hotspot/src/share/vm/runtime/thread.cpp b/hotspot/src/share/vm/runtime/thread.cpp -index d0185280..710f8cbc 100644 +index 3db27350..7374eee5 100644 --- a/hotspot/src/share/vm/runtime/thread.cpp +++ b/hotspot/src/share/vm/runtime/thread.cpp @@ -99,6 +99,7 @@ @@ -1780,7 +1780,7 @@ index d0185280..710f8cbc 100644 #include "gc_implementation/parallelScavenge/pcTasks.hpp" #endif // INCLUDE_ALL_GCS #ifdef COMPILER1 -@@ -3690,6 +3691,7 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) { +@@ -3677,6 +3678,7 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) { ShenandoahControlThread::makeSurrogateLockerThread(THREAD); } else { ConcurrentMarkThread::makeSurrogateLockerThread(THREAD); @@ -1814,7 +1814,7 @@ index 2a3915c0..737aefe2 100644 +com/huawei/jvm/gc # eea35d9d56e0006e diff --git a/jdk/make/lib/CoreLibraries.gmk b/jdk/make/lib/CoreLibraries.gmk -index d374a47a..2a155ea1 100644 +index 75886a62..ea03025f 100644 --- a/jdk/make/lib/CoreLibraries.gmk +++ b/jdk/make/lib/CoreLibraries.gmk @@ -143,6 +143,7 @@ LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/l @@ -1826,19 +1826,19 @@ index d374a47a..2a155ea1 100644 $(JDK_TOPDIR)/src/share/native/java/util/concurrent/atomic \ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/common \ diff --git a/jdk/make/mapfiles/libjava/mapfile-linux b/jdk/make/mapfiles/libjava/mapfile-linux -index 509279c..52959f7 100644 +index 509279ca..52959f78 100644 --- a/jdk/make/mapfiles/libjava/mapfile-linux +++ b/jdk/make/mapfiles/libjava/mapfile-linux @@ -215,6 +215,7 @@ SUNWprivate_1.1 { - Java_java_lang_System_setErr0; - Java_java_lang_System_setIn0; - Java_java_lang_System_setOut0; -+ Java_com_huawei_jvm_gc_AdaptiveHeapMXBeanImpl_registerNatives; - Java_java_lang_Thread_registerNatives; - Java_java_lang_Throwable_fillInStackTrace; + Java_java_lang_System_setErr0; + Java_java_lang_System_setIn0; + Java_java_lang_System_setOut0; ++ Java_com_huawei_jvm_gc_AdaptiveHeapMXBeanImpl_registerNatives; + Java_java_lang_Thread_registerNatives; + Java_java_lang_Throwable_fillInStackTrace; Java_java_lang_Throwable_getStackTraceDepth; diff --git a/jdk/make/mapfiles/libjava/mapfile-vers b/jdk/make/mapfiles/libjava/mapfile-vers -index d686924a..7aeab583 100644 +index 24454049..58801c19 100644 --- a/jdk/make/mapfiles/libjava/mapfile-vers +++ b/jdk/make/mapfiles/libjava/mapfile-vers @@ -215,6 +215,7 @@ SUNWprivate_1.1 { @@ -1872,7 +1872,7 @@ index e0566b32..5b7a7ee1 100644 text: .text%Java_java_lang_ClassLoader_registerNatives; diff --git a/jdk/src/share/classes/com/huawei/jvm/gc/AdaptiveHeapMXBeanImpl.java b/jdk/src/share/classes/com/huawei/jvm/gc/AdaptiveHeapMXBeanImpl.java new file mode 100644 -index 00000000..1443fb04 +index 00000000..c23dd231 --- /dev/null +++ b/jdk/src/share/classes/com/huawei/jvm/gc/AdaptiveHeapMXBeanImpl.java @@ -0,0 +1,62 @@ @@ -1940,7 +1940,7 @@ index 00000000..1443fb04 +} diff --git a/jdk/src/share/classes/com/huawei/management/AdaptiveHeapMXBean.java b/jdk/src/share/classes/com/huawei/management/AdaptiveHeapMXBean.java new file mode 100644 -index 00000000..70563b58 +index 00000000..a8cce6eb --- /dev/null +++ b/jdk/src/share/classes/com/huawei/management/AdaptiveHeapMXBean.java @@ -0,0 +1,32 @@ @@ -2074,7 +2074,7 @@ index 6e64cb0d..9eafbbb8 100644 * for the JVM version and capabilities. sun.misc.Version defines diff --git a/jdk/src/share/native/com/huawei/jvm/gc/AdaptiveHeapMXBeanImpl.c b/jdk/src/share/native/com/huawei/jvm/gc/AdaptiveHeapMXBeanImpl.c new file mode 100644 -index 00000000..1f75e7cb +index 00000000..7647daaa --- /dev/null +++ b/jdk/src/share/native/com/huawei/jvm/gc/AdaptiveHeapMXBeanImpl.c @@ -0,0 +1,40 @@ diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index ceab4d5..13867bd 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -915,7 +915,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 2 +Release: 3 # 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 @@ -2109,6 +2109,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Thu Feb 4 2021 jdkboy - 1:1.8.0.282-b08.3 +- fix wrong patch G1-memory-uncommit.patch + * Wed Feb 3 2021 jdkboy - 1:1.8.0.282-b08.2 - add missing mapfile in G1-memory-uncommit.patch -- Gitee From d3137121d7829c25a1a8103c27c3bd6469894ae7 Mon Sep 17 00:00:00 2001 From: jdkboy Date: Thu, 4 Feb 2021 21:31:27 +0800 Subject: [PATCH 4/7] add 8240353.patch (cherry picked from commit 80af9d73d340c510a35c772436ae29c6cf17c7b1) --- 8240353.patch | 49 +++++++++++++++++++++++++++++++++++++++++ java-1.8.0-openjdk.spec | 7 +++++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 8240353.patch diff --git a/8240353.patch b/8240353.patch new file mode 100644 index 0000000..ddc27ca --- /dev/null +++ b/8240353.patch @@ -0,0 +1,49 @@ +diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp +index e25061f7d..2df587d96 100644 +--- a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp ++++ b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp +@@ -1,6 +1,6 @@ + /* + * Copyright (c) 2013, Red Hat Inc. +- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. ++ * Copyright (c) 2000, 2020, Oracle and/or its affiliates. + * All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * +@@ -434,12 +434,9 @@ int LIR_Assembler::emit_unwind_handler() { + } + + if (compilation()->env()->dtrace_method_probes()) { +- __ call_Unimplemented(); +-#if 0 +- __ movptr(Address(rsp, 0), rax); +- __ mov_metadata(Address(rsp, sizeof(void*)), method()->constant_encoding()); +- __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit))); +-#endif ++ __ mov(c_rarg0, rthread); ++ __ mov_metadata(c_rarg1, method()->constant_encoding()); ++ __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit), c_rarg0, c_rarg1); + } + + if (method()->is_synchronized() || compilation()->env()->dtrace_method_probes()) { +diff --git a/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp +index c1e48ac97..e774f2140 100644 +--- a/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp ++++ b/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp +@@ -1319,6 +1319,16 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) { + } + break; + ++ case dtrace_object_alloc_id: ++ { // c_rarg0: object ++ StubFrame f(sasm, "dtrace_object_alloc", dont_gc_arguments); ++ save_live_registers(sasm); ++ ++ __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_object_alloc), c_rarg0); ++ ++ restore_live_registers(sasm); ++ } ++ break; + + default: + { StubFrame f(sasm, "unimplemented entry", dont_gc_arguments); diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 13867bd..c14ff79 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -915,7 +915,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 3 +Release: 4 # 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 @@ -1070,6 +1070,7 @@ Patch146: 8168926.patch Patch147: 8215047.patch Patch148: 8237894.patch Patch149: Remove-the-parentheses-around-company-name.patch +Patch150: 8240353.patch ############################################# # @@ -1493,6 +1494,7 @@ pushd %{top_level_dir_name} %patch147 -p1 %patch148 -p1 %patch149 -p1 +%patch150 -p1 popd @@ -2109,6 +2111,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Thu Feb 4 2021 jdkboy - 1:1.8.0.282-b08.4 +- add 8240353.patch + * Thu Feb 4 2021 jdkboy - 1:1.8.0.282-b08.3 - fix wrong patch G1-memory-uncommit.patch -- Gitee From 2462d42b45857da97ffe67e85d53a564431335af Mon Sep 17 00:00:00 2001 From: dongbohe Date: Fri, 5 Feb 2021 15:52:23 +0800 Subject: [PATCH 5/7] delete some file header (cherry picked from commit d838439615f42c08ab4b89cf0a61b700f22371e6) --- 8160425.patch | 2 -- 8203699.patch | 4 +--- Test8167409.sh-fails-to-run-with-32bit-jdk-on-64bit-.patch | 1 - java-1.8.0-openjdk.spec | 5 ++++- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/8160425.patch b/8160425.patch index 529a556..8aac0c8 100644 --- a/8160425.patch +++ b/8160425.patch @@ -4,8 +4,6 @@ Subject: 8160425: Vectorization with signalling NaN returns wrong result Summary: : Should not use doubles/floats for vector constants in the C code -LLT: huawei/test/gc/zgc/DTS2020032004776.java -Bug url: https://bugs.openjdk.java.net/browse/JDK-8160425 https://gitlab.huawei.com/huaweijdk/jdk8u-dev/issues/2213 --- hotspot/src/cpu/sparc/vm/sparc.ad | 10 +-- hotspot/src/cpu/x86/vm/x86.ad | 10 +-- diff --git a/8203699.patch b/8203699.patch index c549623..02dd88a 100644 --- a/8203699.patch +++ b/8203699.patch @@ -33,12 +33,10 @@ new file mode 100644 index 000000000..8ab268b57 --- /dev/null +++ b/jdk/test/java/lang/invoke/lookup/TestDefenderMethodLookup.java -@@ -0,0 +1,166 @@ +@@ -0,0 +1,164 @@ +/* + * @test -+ * @author zhangli + * @bug 8203699 -+ * @summary see https://code.huawei.com/HuaweiJDK/JVM-team/JVM/issues/1368 + * @run testng/othervm test.java.lang.invoke.lookup.TestDefenderMethodLookup + */ + diff --git a/Test8167409.sh-fails-to-run-with-32bit-jdk-on-64bit-.patch b/Test8167409.sh-fails-to-run-with-32bit-jdk-on-64bit-.patch index 7e33188..b5fd0c4 100644 --- a/Test8167409.sh-fails-to-run-with-32bit-jdk-on-64bit-.patch +++ b/Test8167409.sh-fails-to-run-with-32bit-jdk-on-64bit-.patch @@ -5,7 +5,6 @@ Subject: Test8167409.sh fails to run with 32bit jdk on 64bit Summary: : Test8167409.sh fails to run with 32bit jdk on 64bit system LLT: jdk8u/hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh -Bug url: https://gitlab.huawei.com/huaweijdk/jdk8u-dev/issues/2157 --- .../criticalnatives/argumentcorruption/Test8167409.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index c14ff79..bf1c06e 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -915,7 +915,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 4 +Release: 5 # 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 @@ -2111,6 +2111,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Fri Feb 5 2021 noah - 1:1.8.0.282-b08.5 +- delete some file header + * Thu Feb 4 2021 jdkboy - 1:1.8.0.282-b08.4 - add 8240353.patch -- Gitee From afbdf95b903833394d46b787f45e1fdf75dc8443 Mon Sep 17 00:00:00 2001 From: mylee Date: Wed, 11 May 2022 14:26:00 +0800 Subject: [PATCH 6/7] fix spec changelog date --- openjdk-1.8.0.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index 6571b1a..4e7bda6 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -2234,7 +2234,7 @@ require "copy_jdk_configs.lua" * Wed Mar 2 2022 kuenking111 - 1:1.8.0.322-b06.4 - add 8268819-SA-Remove-libthread_db-dependency-on-Linux.patch -* Thu Mar 1 2022 kuenking111 - 1:1.8.0.322-b06.3 +* Tue Mar 1 2022 kuenking111 - 1:1.8.0.322-b06.3 - modified 8233280-Remove-GCLockerInvokesConcurrent-relative-logic-for-G1.patch * Wed Feb 16 2022 kuenking111 - 1:1.8.0.322-b06.2 @@ -2293,7 +2293,7 @@ require "copy_jdk_configs.lua" * Tue Nov 23 2021 lijingwei - 1:1.8.0.312-b07.1 - correct spec file release number typo -* Mon Nov 11 2021 kuenking111 - 1:1.8.0.312-b07.0 +* Mon Nov 1 2021 kuenking111 - 1:1.8.0.312-b07.0 - update to 8u312-b07(ga) - delete 8194246.patch - delete 8214418-half-closed-SSLEngine-status-may-cause-appli.patch @@ -2349,10 +2349,10 @@ require "copy_jdk_configs.lua" - delete fix-crash-in-JVMTI-debug.patch - other adaptations to jdk8u302 -* Thu Jul 12 2021 noah - 1:1.8.0.292-b10.19 +* Mon 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 +* Mon 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 @@ -2376,7 +2376,7 @@ require "copy_jdk_configs.lua" * Sat Jun 12 2021 kuenking111 - 1:1.8.0.292-b10.11 - add g1gc-numa-aware-Implementation.patch -* Wed Jun 10 2021 hu_bo_dao - 1:1.8.0.292-b10.10 +* Fri Jun 11 2021 hu_bo_dao - 1:1.8.0.292-b10.10 - add support_CMS_parallel_inspection.patch * Wed Jun 9 2021 noah - 1:1.8.0.292-b10.9 @@ -2397,13 +2397,13 @@ require "copy_jdk_configs.lua" * Thu May 27 2021 kuenking111 - 1:1.8.0.292-b10.4 - add 8264640.patch -* Fri May 20 2021 kuenking111 - 1:1.8.0.292-b10.3 +* Fri May 21 2021 kuenking111 - 1:1.8.0.292-b10.3 - add 8266929_huawei_add_oid_mapping_common_sig_types.patch -* Fri May 20 2021 kuenking111 - 1:1.8.0.292-b10.2 +* Fri May 21 2021 kuenking111 - 1:1.8.0.292-b10.2 - add 8266187_Memory_leak_in_appendBootClassPath.patch -* Fri May 20 2021 kuenking111 - 1:1.8.0.292-b10.1 +* Fri May 21 2021 kuenking111 - 1:1.8.0.292-b10.1 - add 8247691_incorrect_handling_of_VM_exceptions_in_C1_deopt_stub.patch * Tue May 18 2021 eapen - 1:1.8.0.292-b10.0 -- Gitee From 3daecfa3e38ae084abbad2c2910e0de53b9a8f13 Mon Sep 17 00:00:00 2001 From: dongbohe Date: Mon, 23 May 2022 09:51:03 +0800 Subject: [PATCH 7/7] =?UTF-8?q?I57XLW:=20openEuler:20.03:LTS:SP1=20?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E4=B8=ADopenjdk-1.8.0=E5=90=8C=E6=AD=A5maste?= =?UTF-8?q?r=E4=BB=A3=E7=A0=81=E4=BE=9D=E8=B5=96SP1=E4=B8=AD=E6=9C=AA?= =?UTF-8?q?=E9=9B=86=E6=88=90=E9=AB=98=E7=89=88=E6=9C=ACcopy-java-config?= =?UTF-8?q?=20=E5=AF=BC=E8=87=B4=E6=89=B9=E9=87=8Fjava=E5=8C=85unresolvabl?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openjdk-1.8.0.spec | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index f1c6fec..75cc3b2 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -820,7 +820,7 @@ Requires: nss-softokn%{?_isa} %{NSSSOFTOKN_BUILDTIME_VERSION} # tool to copy jdk's configs - should be Recommends only, but then only dnf/yum enforce it, # not rpm transaction and so no configs are persisted when pure rpm -u is run. It may be # considered as regression -Requires: copy-jdk-configs >= 3.9 +Requires: copy-jdk-configs >= 3.3 OrderWithRequires: copy-jdk-configs # for printing support Requires: cups-libs @@ -916,7 +916,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 2 +Release: 3 # 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 @@ -2064,13 +2064,7 @@ done -- whether copy-jdk-configs is installed or not. If so, then configs are copied -- (copy_jdk_configs from %%{_libexecdir} used) or not copied at all local posix = require "posix" - -if (os.getenv("debug") == "true") then - debug = true; - print("cjc: in spec debug is on") -else - debug = false; -end +local debug = false SOURCE1 = "%{rpm_state_dir}/copy_jdk_configs.lua" SOURCE2 = "%{_libexecdir}/copy_jdk_configs.lua" @@ -2099,9 +2093,8 @@ else end end -- run content of included file with fake args -cjc = require "copy_jdk_configs.lua" arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"} -cjc.mainProgram(arg) +require "copy_jdk_configs.lua" %post %{post_script %{nil}} @@ -2238,6 +2231,9 @@ cjc.mainProgram(arg) %endif %changelog +* Fri May 20 2022 noah - 1:1.8.0.332-b09.3 +- downgrade copy-jdk-configs from 3.9 to 3.3 in Requires + * Thu Apr 28 2022 kuenking111 - 1:1.8.0.332-b09.2 - add fix_X509TrustManagerImpl_symantec_distrust.patch -- Gitee