rpms/java-1.8.0-openjdk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Removed and adapted patches to u191.

Browse Source 
Added changelog for u 191
This commit is contained in:
Jiri Vanek 2018-10-23 17:51:44 +02:00
parent 6985b32d3c
commit 1f2a7e0117
5 changed files with 24 additions and 1618 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1494
8146115-pr3508-rh1463098.patch
View File

File diff suppressed because it is too large Load Diff

17
java-1.8.0-openjdk.spec
View File

@ -1057,7 +1057,7 @@ Patch516: pr2815.patch
Patch517: pr2899.patch
Patch518: pr2934.patch
Patch519: pr3479-rh1486025.patch
# PR3183, RH1340845: Support Fedora/RHEL system crypto policy
# PR3183, RH1340845: Support Fedora/RHEL8 system crypto policy
Patch300: pr3183-rh1340845-system-crypto-policy.patch
#############################################
@ -1168,8 +1168,6 @@ Patch578: 8075942-pr3602-rh1582032.patch
Patch579: 8203182-pr3603-rh1568033.patch
# 8206406, PR3610, RH1597825: StubCodeDesc constructor publishes partially-constructed objects on StubCodeDesc::_list
Patch580: 8206406-pr3610-rh1597825.patch
# 8146115, PR3508, RH1463098: Improve docker container detection and resource configuration usage
Patch581: 8146115-pr3508-rh1463098.patch
# Patches 204 and 205 stop the build adding .gnu_debuglink sections to unstripped files
# 8206425: .gnu_debuglink sections added unconditionally when no debuginfo is stripped
Patch204: 8206425-hotspot-remove-debuglink.patch
@ -1224,10 +1222,8 @@ Patch539: pr2888.patch
Patch540: pr3575-rh1567204.patch
# Shenandoah fixes
# PR3619: Shenandoah broken on s390
Patch582: pr3619.patch
# PR3620: Shenandoah broken on ppc64
Patch583: pr3620.patch
# PR3634: Shenandoah still broken on s390 with aarch64-shenandoah-jdk8u181-b16
Patch582: pr3634.patch
#############################################
#
@ -1631,7 +1627,6 @@ sh %{SOURCE12}
%patch578
%patch579
%patch580
%patch581
%patch620
%patch621
%patch622
@ -1651,7 +1646,6 @@ sh %{SOURCE12}
# Shenandoah patches
%patch582
%patch583
%patch1000
@ -2288,6 +2282,11 @@ require "copy_jdk_configs.lua"
%endif
%changelog
* Tue Oct 23 2018 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.191.b12-1
- updated to aarch64-shenandoah-jdk8u191-b12
- deleted 8146115-pr3508-rh1463098.patch, pr3619.patch, pr3620.patch - should be upstreamed
- create pr3634.patch to fix build failure on s390
* Fri Oct 12 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:1.8.0.181.b15-7
- Add patch 8210425-03-rh1630426-hotspot-opt-fix-zero.patch:
- Annother fix for optimization gaps (annocheck issues)

45
pr3619.patch
View File

@ -1,45 +0,0 @@
diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
--- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
+++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
@@ -108,7 +108,7 @@
step = MIN2(step, (intx) MaxNormalStep);
log_info(gc, ergo)("Capacity: " SIZE_FORMAT "M, Peak Occupancy: " SIZE_FORMAT
- "M, Lowest Free: " SIZE_FORMAT "M, Free Threshold: " UINTX_FORMAT "M",
+ "M, Lowest Free: " SIZE_FORMAT "M, Free Threshold: " SIZE_FORMAT "M",
capacity / M, _peak_occupancy / M,
(capacity - _peak_occupancy) / M, ShenandoahMinFreeThreshold * capacity / 100 / M);
diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/heuristics/shenandoahStaticHeuristics.cpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/heuristics/shenandoahStaticHeuristics.cpp
--- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/heuristics/shenandoahStaticHeuristics.cpp
+++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/heuristics/shenandoahStaticHeuristics.cpp
@@ -36,7 +36,7 @@
}
void ShenandoahStaticHeuristics::print_thresholds() {
- log_info(gc, init)("Shenandoah heuristics thresholds: allocation "SIZE_FORMAT", free "SIZE_FORMAT", garbage "SIZE_FORMAT,
+ log_info(gc, init)("Shenandoah heuristics thresholds: allocation "UINTX_FORMAT", free "UINTX_FORMAT", garbage "UINTX_FORMAT,
ShenandoahAllocationThreshold,
ShenandoahFreeThreshold,
ShenandoahGarbageThreshold);
diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp
--- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp
+++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp
@@ -539,7 +539,7 @@
}
size_t average_heap_size = (initial_heap_size + max_heap_size) / 2;
region_size = MAX2(average_heap_size / ShenandoahTargetNumRegions,
- ShenandoahMinRegionSize);
+ (size_t) ShenandoahMinRegionSize);
// Now make sure that we don't go over or under our limits.
region_size = MAX2(ShenandoahMinRegionSize, region_size);
@@ -573,7 +573,7 @@
// Otherwise, mem-protecting one region may falsely protect the adjacent
// regions too.
if (UseLargePages) {
- region_size = MAX2(region_size, os::large_page_size());
+ region_size = MAX2((size_t) region_size, os::large_page_size());
}
int region_size_log = log2_long((jlong) region_size);

70
pr3620.patch
View File

@ -1,70 +0,0 @@
diff --git openjdk.orig/hotspot/make/excludeSrc.make openjdk/hotspot/make/excludeSrc.make
--- openjdk.orig/hotspot/make/excludeSrc.make
+++ openjdk/hotspot/make/excludeSrc.make
@@ -121,6 +121,7 @@
Src_Files_EXCLUDE += \
shenandoahBarrierSet_x86.cpp \
shenandoahBarrierSet_aarch64.cpp \
+ shenandoahBarrierSet_ppc.cpp \
shenandoahBarrierSet_sparc.cpp \
shenandoahBarrierSet_zero.cpp
endif
diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/shenandoahBarrierSet_ppc.cpp openjdk/hotspot/src/cpu/ppc/vm/shenandoahBarrierSet_ppc.cpp
new file mode 100644
--- /dev/null
+++ openjdk/hotspot/src/cpu/ppc/vm/shenandoahBarrierSet_ppc.cpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2018, Red Hat, Inc. and/or its affiliates.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "gc_implementation/shenandoah/brooksPointer.hpp"
+#include "gc_implementation/shenandoah/shenandoahBarrierSet.inline.hpp"
+
+#include "asm/macroAssembler.hpp"
+#include "interpreter/interpreter.hpp"
+
+#define __ masm->
+
+#ifndef CC_INTERP
+
+void ShenandoahBarrierSet::interpreter_read_barrier(MacroAssembler* masm, Register dst) {
+ Unimplemented();
+}
+
+void ShenandoahBarrierSet::interpreter_read_barrier_not_null(MacroAssembler* masm, Register dst) {
+ Unimplemented();
+}
+
+void ShenandoahBarrierSet::interpreter_write_barrier(MacroAssembler* masm, Register dst) {
+ Unimplemented();
+}
+
+void ShenandoahBarrierSet::asm_acmp_barrier(MacroAssembler* masm, Register op1, Register op2) {
+ Unimplemented();
+}
+
+void ShenandoahHeap::compile_prepare_oop(MacroAssembler* masm, Register obj) {
+ Unimplemented();
+}
+#endif

16
pr3634.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoah_globals.hpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoah_globals.hpp
--- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoah_globals.hpp
+++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoah_globals.hpp
@@ -55,10 +55,10 @@
"Size of the Shenandoah regions. " \
"Determined automatically by default.") \
\
- experimental(uintx, ShenandoahMinRegionSize, 256 * K, \
+ experimental(size_t, ShenandoahMinRegionSize, 256 * K, \
"Minimum heap region size. ") \
\
- experimental(uintx, ShenandoahMaxRegionSize, 32 * M, \
+ experimental(size_t, ShenandoahMaxRegionSize, 32 * M, \
"Maximum heap region size. ") \
\
experimental(intx, ShenandoahHumongousThreshold, 100, \