From 311657d56d1165ac24655fe105e7e87e328767fa Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 6 Jun 2018 19:04:57 +0200 Subject: [PATCH] updated to u172-b11 removed patches: patch207 8200556-pr3566.patch patch104 pr3458-rh1540242.patch patch209 8035496-hotspot.patch patch700 pr3573.patch --- .gitignore | 2 ++ 8035496-hotspot.patch | 30 ------------------------------ 8200556-pr3566.patch | 14 -------------- java-1.8.0-openjdk.spec | 33 +++++++++++---------------------- pr3458-rh1540242.patch | 22 ---------------------- pr3573.patch | 25 ------------------------- sources | 4 ++-- update_package.sh | 4 ++-- 8 files changed, 17 insertions(+), 117 deletions(-) delete mode 100644 8035496-hotspot.patch delete mode 100644 8200556-pr3566.patch delete mode 100644 pr3458-rh1540242.patch delete mode 100644 pr3573.patch diff --git a/.gitignore b/.gitignore index f0288e1..a1f0faf 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,5 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u162-b12.tar.xz /aarch64-port-jdk8u-aarch64-jdk8u171-b10.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u171-b10.tar.xz +/aarch64-port-jdk8u-aarch64-jdk8u172-b11.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u172-b11--shenandoah-merge-2018-05-15.tar.xz diff --git a/8035496-hotspot.patch b/8035496-hotspot.patch deleted file mode 100644 index 426bdbe..0000000 --- a/8035496-hotspot.patch +++ /dev/null @@ -1,30 +0,0 @@ -# HG changeset patch -# User bdelsart -# Date 1508481469 -28800 -# Fri Oct 20 14:37:49 2017 +0800 -# Node ID 111ed1a4719008b83bf427ae16bbeac2a7a516bc -# Parent 471de666658d7ec14c5d3f97076fb95f70dd6ffa -8035496: G1 ARM: missing remset entry noticed by VerifyAfterGC for vm/gc/concurrent/lp50yp10rp70mr30st0 -Summary: release_store used when registering a PerRegionTable. Also reviewed-by: vitalyd@gmail.com -Reviewed-by: jmasa, tschatzl, brutisso - -diff --git a/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp b/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp -@@ -514,7 +514,15 @@ - - PerRegionTable* first_prt = _fine_grain_regions[ind]; - prt->set_collision_list_next(first_prt); -- _fine_grain_regions[ind] = prt; -+ // The assignment into _fine_grain_regions allows the prt to -+ // start being used concurrently. In addition to -+ // collision_list_next which must be visible (else concurrent -+ // parsing of the list, if any, may fail to see other entries), -+ // the content of the prt must be visible (else for instance -+ // some mark bits may not yet seem cleared or a 'later' update -+ // performed by a concurrent thread could be undone when the -+ // zeroing becomes visible). This requires store ordering. -+ OrderAccess::release_store_ptr((volatile PerRegionTable*)&_fine_grain_regions[ind], prt); - _n_fine_entries++; - - if (G1HRRSUseSparseTable) { diff --git a/8200556-pr3566.patch b/8200556-pr3566.patch deleted file mode 100644 index ccd2f49..0000000 --- a/8200556-pr3566.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -r 214a94e9366c src/cpu/aarch64/vm/nativeInst_aarch64.cpp ---- openjdk/hotspot/src/cpu/aarch64/vm/nativeInst_aarch64.cpp Mon Jul 17 12:11:32 2017 +0000 -+++ openjdk/hotspot/src/cpu/aarch64/vm/nativeInst_aarch64.cpp Mon Jul 24 16:23:14 2017 +0100 -@@ -343,7 +343,7 @@ - CodeBuffer cb(code_pos, instruction_size); - MacroAssembler a(&cb); - -- a.mov(rscratch1, entry); -+ a.movptr(rscratch1, (uintptr_t)entry); - a.br(rscratch1); - - ICache::invalidate_range(code_pos, instruction_size); - - diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index f140768..78135ec 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -191,7 +191,7 @@ # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global project aarch64-port %global repo jdk8u -%global revision aarch64-jdk8u171-b10 +%global revision aarch64-jdk8u172-b11 # eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60 (dont forget spec escape % by %%) %global whole_update %(VERSION=%{revision}; echo ${VERSION%%-*}) # eg jdk8u60 -> 60 or aarch64-jdk8u60 -> 60 @@ -927,7 +927,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%{?1} Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: 6.%{buildver}%{?dist} +Release: 1.%{buildver}%{?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 @@ -963,7 +963,7 @@ URL: http://openjdk.java.net/ Source0: %{project}-%{repo}-%{revision}.tar.xz # Shenandoah HotSpot -Source1: aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u171-b10.tar.xz +Source1: aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u172-b11--shenandoah-merge-2018-05-15.tar.xz # Custom README for -src subpackage Source2: README.src @@ -1045,8 +1045,6 @@ Patch204: hotspot-remove-debuglink.patch Patch205: dont-add-unnecessary-debug-links.patch # Enable debug information for assembly code files Patch206: hotspot-assembler-debuginfo.patch -# 8200556, PR3566: AArch64 port crashes on slowdebug builds -Patch207: 8200556-pr3566.patch # Arch-specific upstreamable patches # PR2415: JVM -Xmx requirement is too high on s390 @@ -1055,8 +1053,6 @@ Patch100: %{name}-s390-java-opts.patch Patch102: %{name}-size_t.patch # Use "%z" for size_t on s390 as size_t != intptr_t Patch103: s390-size_t_format_flags.patch -# Fix more cases of missing return statements on AArch64 -Patch104: pr3458-rh1540242.patch # Patches which need backporting to 8u # S8073139, RH1191652; fix name of ppc64le architecture @@ -1090,7 +1086,6 @@ Patch561: 8197429-pr3456-rh1536622.patch # Patches ineligible for 8u # 8043805: Allow using a system-installed libjpeg Patch201: system-libjpeg.patch -Patch209: 8035496-hotspot.patch Patch210: suse_linuxfilestore.patch # custom securities Patch300: PR3183.patch @@ -1103,10 +1098,6 @@ Patch534: always_assumemp.patch # PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts) Patch539: pr2888.patch -# Shenandoah fixes -# PR3573: Fix TCK crash with Shenandoah -Patch700: pr3573.patch - # Non-OpenJDK fixes Patch1000: enableCommentedOutSystemNss.patch @@ -1444,8 +1435,6 @@ sh %{SOURCE12} %patch204 %patch205 %patch206 -%patch207 -%patch209 %patch210 %patch300 @@ -1460,9 +1449,6 @@ sh %{SOURCE12} %patch102 %patch103 -# AArch64 fixes -%patch104 - # ppc64le fixes %patch603 %patch601 @@ -1507,11 +1493,6 @@ popd %patch534 %endif -# Shenandoah-only patches -%if %{use_shenandoah_hotspot} -%patch700 -%endif - %patch1000 # Extract systemtap tapsets @@ -2134,6 +2115,14 @@ require "copy_jdk_configs.lua" %endif %changelog +* Wed Jun 06 2018 Jiri Vanek - 1:1.8.0.172-1.b11 +- updated to u172-b11 +- removed patches: +- patch207 8200556-pr3566.patch +- patch104 pr3458-rh1540242.patch +- patch209 8035496-hotspot.patch +- patch700 pr3573.patch + * Thu May 17 2018 Severin Gehwolf - 1:1.8.0.171-6.b10 - Move to javapackages-filesystem over javapackages-tools for directory ownership. Resolves RHBZ#1500288. diff --git a/pr3458-rh1540242.patch b/pr3458-rh1540242.patch deleted file mode 100644 index 2419b3d..0000000 --- a/pr3458-rh1540242.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp b/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp ---- openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp -+++ openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp -@@ -698,6 +698,7 @@ - - extern "C" { - int SpinPause() { -+ return 0; - } - - void _Copy_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count) { -diff --git a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp ---- openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp -+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp -@@ -408,6 +408,7 @@ - - extern "C" { - int SpinPause() { -+ return 0; - } - - diff --git a/pr3573.patch b/pr3573.patch deleted file mode 100644 index 07b9f10..0000000 --- a/pr3573.patch +++ /dev/null @@ -1,25 +0,0 @@ -# HG changeset patch -# User roland -# Date 1506520357 -7200 -# Wed Sep 27 15:52:37 2017 +0200 -# Node ID c307975d0800f8da5cc8e82cd8f1fdadbd745357 -# Parent ab0c101fa16e4cd97ac8ceff4f5ff72e2f4d5776 -[backport] fix TCK crash with shenandoah - -diff --git a/src/share/vm/opto/shenandoahSupport.cpp b/src/share/vm/opto/shenandoahSupport.cpp ---- openjdk/hotspot/src/share/vm/opto/shenandoahSupport.cpp -+++ openjdk/hotspot/src/share/vm/opto/shenandoahSupport.cpp -@@ -472,9 +472,11 @@ - Node* input = in(Memory); - if (input->Opcode() == Op_ShenandoahWBMemProj) { - Node* wb = input->in(0); -- if (wb->is_top()) return NULL; // Dead path. -+ const Type* in_type = phase->type(wb); -+ // is_top() test not sufficient here: we can come here after CCP -+ // in a dead branch of the graph that has not yet been removed. -+ if (in_type == Type::TOP) return NULL; // Dead path. - assert(wb->Opcode() == Op_ShenandoahWriteBarrier, "expect write barrier"); -- const Type* in_type = phase->type(wb); - if (is_independent(in_type, _type)) { - if (phase->is_IterGVN()) { - phase->is_IterGVN()->rehash_node_delayed(wb); diff --git a/sources b/sources index cdc7ff6..9544f7d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (systemtap-tapset-3.6.0pre02.tar.xz) = d59858bbe9e927bdf47711e3c71c88f93567596aea3e1736b33b436a7a2cb38af25a9b4b4224ca513454b3f2d0371d14e753176c1810d9745a7e4af8edae7fb8 -SHA512 (aarch64-port-jdk8u-aarch64-jdk8u171-b10.tar.xz) = f27ac541bb6b058becbfa1e56d7215ee789fca3021718f0944a3e143218a5d1e3276dc8a972d6dafa28c7a860209fa3406ad5161f6dc2d480198bbc34629c5db -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u171-b10.tar.xz) = e5e356aff131bbaaffdd816ba4e7e13e1f267bc981469cd84a267959db5620e74ea9ae81f69c09457c3aff3f041195afe0e4dccb944971eb005392c3bda3d4f5 +SHA512 (aarch64-port-jdk8u-aarch64-jdk8u172-b11.tar.xz) = 2c322d161fdc5feeaf80011698ac1bcf4311513f9dc7484cefea91a1eba1a1c5aaad024ce6a525995fe88adc30ef68100032eaaa4d00082f2310f676592d3790 +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u172-b11--shenandoah-merge-2018-05-15.tar.xz) = 7020590f7d618460ab3fc81513edfcd2452c222c15800a376628a864b6bbb611f890e66143a26011f9e4cc534e516047c2c573f7682e5b0f325425eeee05a280 diff --git a/update_package.sh b/update_package.sh index ab68e3a..ee8622e 100755 --- a/update_package.sh +++ b/update_package.sh @@ -31,7 +31,7 @@ if [ "x$REPO_NAME" = "x" ] ; then REPO_NAME="jdk8u" fi if [ "x$VERSION" = "x" ] ; then - VERSION="aarch64-jdk8u162-b12" + VERSION="aarch64-jdk8u172-b11" fi if [ "x$COMPRESSION" = "x" ] ; then @@ -109,7 +109,7 @@ if [ "x$VERSION" = "xtip" ] ; then VERSION="tip" else #hardcoding version for anything else except tip - VERSION="aarch64-shenandoah-jdk8u162-b12" + VERSION="aarch64-shenandoah-jdk8u172-b11--shenandoah-merge-2018-05-15" fi MAIN_REPO_NAME=$REPO_NAME REPO_NAME=jdk8u-shenandoah