From 66b29a9af572e8c15c4528cba552f692287ddb69 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Mon, 19 Nov 2018 16:54:37 +0000 Subject: [PATCH] Revise Shenandoah PR3634 patch following upstream discussion. --- java-1.8.0-openjdk.spec | 5 ++++- pr3634.patch | 30 ++++++++++++++---------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 60d8c28..d75b755 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -966,7 +966,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 9%{?dist} +Release: 10%{?dist} # 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 @@ -2328,6 +2328,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Tue Nov 13 2018 Andrew Hughes - 1:1.8.0.191.b12-10 +- Revise Shenandoah PR3634 patch following upstream discussion. + * Wed Nov 07 2018 Jiri Vanek - 1:1.8.0.191.b12-9 - headfull suggests of cups, replaced by Requires of cups-libs in headless diff --git a/pr3634.patch b/pr3634.patch index caba2ac..20a4625 100644 --- a/pr3634.patch +++ b/pr3634.patch @@ -1,16 +1,14 @@ -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, \ +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 +@@ -524,8 +524,8 @@ + region_size = max_heap_size / ShenandoahTargetNumRegions; + + // Now make sure that we don't go over or under our limits. +- region_size = MAX2(ShenandoahMinRegionSize, region_size); +- region_size = MIN2(ShenandoahMaxRegionSize, region_size); ++ region_size = MAX2(ShenandoahMinRegionSize, region_size); ++ region_size = MIN2(ShenandoahMaxRegionSize, region_size); + + } else { + if (ShenandoahHeapRegionSize > initial_heap_size / MIN_NUM_REGIONS) {