diff --git a/.gitignore b/.gitignore index f5d72f2..4de1b52 100644 --- a/.gitignore +++ b/.gitignore @@ -177,3 +177,5 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b06.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b07-4curve.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b07.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b08-4curve.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b08.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 70a9cf3..090536d 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -229,7 +229,7 @@ # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global shenandoah_project aarch64-port %global shenandoah_repo jdk8u-shenandoah -%global shenandoah_revision aarch64-shenandoah-jdk8u252-b07 +%global shenandoah_revision aarch64-shenandoah-jdk8u252-b08 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -1132,8 +1132,6 @@ Patch401: pr3655-toggle_system_crypto_policy.patch # JDK-8218811: replace open by os::open in hotspot coding # This fixes a GCC 10 build issue Patch111: jdk8218811-perfMemory_linux.patch -# JDK-8241296: Segfault in JNIHandleBlock::oops_do() -Patch112: jdk8241296-jnihandleblock_segfault.patch # JDK-8244461: [JDK 8u] Build fails with glibc 2.32 Patch113: jdk8244461-remove_unused_sysctl.h.patch @@ -1566,7 +1564,6 @@ sh %{SOURCE12} %patch575 %patch577 %patch111 -%patch112 %patch113 %patch579 @@ -2232,6 +2229,10 @@ require "copy_jdk_configs.lua" %endif %changelog +* Thu Jun 18 2020 Andrew Hughes - 1:1.8.0.252.b08-0.0.ea +- Update to aarch64-shenandoah-jdk8u252-b08. +- Drop JDK-8241296 backport now applied upstream. + * Wed Jun 17 2020 Andrew Hughes - 1:1.8.0.252.b07-0.0.ea - Update to aarch64-shenandoah-jdk8u252-b07. diff --git a/jdk8241296-jnihandleblock_segfault.patch b/jdk8241296-jnihandleblock_segfault.patch deleted file mode 100644 index f50aca1..0000000 --- a/jdk8241296-jnihandleblock_segfault.patch +++ /dev/null @@ -1,23 +0,0 @@ -# HG changeset patch -# User aph -# Date 1584629637 0 -# Thu Mar 19 14:53:57 2020 +0000 -# Node ID e96597ea4d672793ab205fd67009efed809fae11 -# Parent 0daa6b52ba568246e8f930138fb36f8f04d9fadd -8241296: Segfault in JNIHandleBlock::oops_do() -Reviewed-by: duke - -diff --git openjdk.orig/hotspot/src/share/vm/runtime/thread.cpp openjdk/hotspot/src/share/vm/runtime/thread.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/thread.cpp -+++ openjdk/hotspot/src/share/vm/runtime/thread.cpp -@@ -836,7 +836,9 @@ - } - - void Thread::oops_do(OopClosure* f, CLDClosure* cld_f, CodeBlobClosure* cf) { -- active_handles()->oops_do(f); -+ if (active_handles() != NULL) { -+ active_handles()->oops_do(f); -+ } - // Do oop for ThreadShadow - f->do_oop((oop*)&_pending_exception); - handle_area()->oops_do(f); diff --git a/sources b/sources index 9cadd52..8d17d82 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671 -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b07-4curve.tar.xz) = e5872465055fd5a96fe196901ef726bfab014216482466835607fefb1b3dd2a2263e85c55fc356abca0a8c9c7fe72d41b4c9f44c859b05d2cc3cdb41e7fa7192 +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b08-4curve.tar.xz) = b33ce5c789981dcf85713d29c91fed71b691cb30b242edc42733c37151ba1266cfc566a6f073488fce9684000ff4b5614c9ab7f6f2ad0e1c73246f8653fda388