diff --git a/.gitignore b/.gitignore index ea0275d..5cfc0ab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/shenandoah-jdk11-shenandoah-jdk-11.0.7+10-4curve.tar.xz +SOURCES/shenandoah-jdk11-shenandoah-jdk-11.0.8+1-4curve.tar.xz SOURCES/tapsets-icedtea-3.15.0.tar.xz diff --git a/.java-11-openjdk.metadata b/.java-11-openjdk.metadata index 03aff31..df6c284 100644 --- a/.java-11-openjdk.metadata +++ b/.java-11-openjdk.metadata @@ -1,2 +1,2 @@ -57888ad889e479928d3498f0d524f2314116d41b SOURCES/shenandoah-jdk11-shenandoah-jdk-11.0.7+10-4curve.tar.xz +e79f444ab44a84f8d51d5a5782c42a6fc558ebef SOURCES/shenandoah-jdk11-shenandoah-jdk-11.0.8+1-4curve.tar.xz 7ae2cba67467825b2c2a5fec7aea041865023002 SOURCES/tapsets-icedtea-3.15.0.tar.xz diff --git a/SOURCES/jdk8228407-shared_archive_crash.patch b/SOURCES/jdk8228407-shared_archive_crash.patch deleted file mode 100644 index f3c8086..0000000 --- a/SOURCES/jdk8228407-shared_archive_crash.patch +++ /dev/null @@ -1,54 +0,0 @@ -# HG changeset patch -# User ccheung -# Date 1564075552 25200 -# Thu Jul 25 10:25:52 2019 -0700 -# Node ID 1edf6cc224fbf975eadf2a1810f67816a8607d30 -# Parent 73dbc713d4ddbdbeae71375db1603d85cef47f99 -8228407: JVM crashes with shared archive file mismatch -Summary: Stop processing other header fields if initial header check has failed. -Reviewed-by: dholmes, jiangli - -diff --git a/src/hotspot/share/memory/filemap.cpp b/src/hotspot/share/memory/filemap.cpp ---- a/src/hotspot/share/memory/filemap.cpp -+++ b/src/hotspot/share/memory/filemap.cpp -@@ -1287,7 +1287,9 @@ - } - - init_from_file(_fd); -- if (!validate_header()) { -+ // UseSharedSpaces could be disabled if the checking of some of the header fields in -+ // init_from_file has failed. -+ if (!UseSharedSpaces || !validate_header()) { - return false; - } - return true; -diff --git a/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java b/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java ---- a/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java -+++ b/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java -@@ -385,8 +385,16 @@ - output.shouldNotContain("Checksum verification failed"); - - copyFile(orgJsaFile, jsa); -+ // modify _jvm_ident and run with -Xshare:auto -+ System.out.println("\n2b. Corrupt _jvm_ident run with -Xshare:auto\n"); -+ modifyJvmIdent(); -+ output = TestCommon.execAuto(execArgs); -+ output.shouldContain("The shared archive file was created by a different version or build of HotSpot"); -+ output.shouldContain("Hello World"); -+ -+ copyFile(orgJsaFile, jsa); - // modify _magic and _paths_misc_info_size, test should fail -- System.out.println("\n2b. Corrupt _magic and _paths_misc_info_size, should fail\n"); -+ System.out.println("\n2c. Corrupt _magic and _paths_misc_info_size, should fail\n"); - modifyHeaderIntField(offset_magic, 0x00000000); - modifyHeaderIntField(offset_paths_misc_info_size, Integer.MAX_VALUE); - output = TestCommon.execCommon(execArgs); -@@ -395,7 +403,7 @@ - - copyFile(orgJsaFile, jsa); - // modify _version and _paths_misc_info_size, test should fail -- System.out.println("\n2c. Corrupt _version and _paths_misc_info_size, should fail\n"); -+ System.out.println("\n2d. Corrupt _version and _paths_misc_info_size, should fail\n"); - modifyHeaderIntField(offset_version, 0x00000000); - modifyHeaderIntField(offset_paths_misc_info_size, Integer.MAX_VALUE); - output = TestCommon.execCommon(execArgs); diff --git a/SOURCES/jdk8237396-avoid_triggering_barriers.patch b/SOURCES/jdk8237396-avoid_triggering_barriers.patch deleted file mode 100644 index 90d7c65..0000000 --- a/SOURCES/jdk8237396-avoid_triggering_barriers.patch +++ /dev/null @@ -1,58 +0,0 @@ -# HG changeset patch -# User zgu -# Date 1579696811 18000 -# Wed Jan 22 07:40:11 2020 -0500 -# Node ID 91ea567eeabeade6b3f8d6cf10c02ba53f700eca -# Parent 082f1d3eb1649ff776cda165ed78d65bc7361ebc -8237396: JvmtiTagMap::weak_oops_do() should not trigger barriers -Reviewed-by: stefank, rkennke - -diff --git a/src/hotspot/share/prims/jvmtiTagMap.cpp b/src/hotspot/share/prims/jvmtiTagMap.cpp ---- a/src/hotspot/share/prims/jvmtiTagMap.cpp -+++ b/src/hotspot/share/prims/jvmtiTagMap.cpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -96,6 +96,11 @@ - inline oop object_peek() { - return NativeAccess::oop_load(object_addr()); - } -+ -+ inline oop object_raw() { -+ return RawAccess<>::oop_load(object_addr()); -+ } -+ - inline jlong tag() const { return _tag; } - - inline void set_tag(jlong tag) { -@@ -3357,7 +3362,7 @@ - JvmtiTagHashmapEntry* next = entry->next(); - - // has object been GC'ed -- if (!is_alive->do_object_b(entry->object_peek())) { -+ if (!is_alive->do_object_b(entry->object_raw())) { - // grab the tag - jlong tag = entry->tag(); - guarantee(tag != 0, "checking"); -@@ -3375,7 +3380,7 @@ - ++freed; - } else { - f->do_oop(entry->object_addr()); -- oop new_oop = entry->object_peek(); -+ oop new_oop = entry->object_raw(); - - // if the object has moved then re-hash it and move its - // entry to its new location. -@@ -3409,7 +3414,7 @@ - // Re-add all the entries which were kept aside - while (delayed_add != NULL) { - JvmtiTagHashmapEntry* next = delayed_add->next(); -- unsigned int pos = JvmtiTagHashmap::hash(delayed_add->object_peek(), size); -+ unsigned int pos = JvmtiTagHashmap::hash(delayed_add->object_raw(), size); - delayed_add->set_next(table[pos]); - table[pos] = delayed_add; - delayed_add = next; diff --git a/SPECS/java-11-openjdk.spec b/SPECS/java-11-openjdk.spec index e2f4009..8194598 100644 --- a/SPECS/java-11-openjdk.spec +++ b/SPECS/java-11-openjdk.spec @@ -212,7 +212,7 @@ # New Version-String scheme-style defines %global majorver 11 -%global securityver 7 +%global securityver 8 # buildjdkver is usually same as %%{majorver}, # but in time of bootstrap of next jdk, it is majorver-1, # and this it is better to change it here, on single place @@ -237,9 +237,9 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 10 -%global rpmrelease 3 -#%%global tagsuffix "" +%global buildver 1 +%global rpmrelease 1 +#%%global tagsuffix %%{nil} # priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit %if %is_system_jdk %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} ) @@ -255,7 +255,7 @@ # Release will be (where N is usually a number starting at 1): # - 0.N%%{?extraver}%%{?dist} for EA releases, # - N%%{?extraver}{?dist} for GA releases -%global is_ga 1 +%global is_ga 0 %if %{is_ga} %global ea_designator "" %global ea_designator_zip "" @@ -1079,8 +1079,6 @@ Patch1001: rh1655466-global_crypto_and_fips.patch # Shenandoah specific patches # ############################################# -# JDK-8237396: JvmtiTagMap::weak_oops_do() should not trigger barriers -Patch10: jdk8237396-avoid_triggering_barriers.patch # Currently empty @@ -1108,8 +1106,6 @@ Patch8: s390-8214206_fix.patch # JDK 9+ only patches # ############################################# -# JDK-8228407: JVM crashes with shared archive file mismatch -Patch9: jdk8228407-shared_archive_crash.patch BuildRequires: autoconf BuildRequires: automake @@ -1360,8 +1356,6 @@ pushd %{top_level_dir_name} %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 -%patch10 -p1 popd # openjdk %patch1000 @@ -1911,6 +1905,12 @@ require "copy_jdk_configs.lua" %endif %changelog +* Sun May 10 2020 Andrew Hughes - 1:11.0.8.1-0.1.ea +- Update to shenandoah-jdk-11.0.8+1 (EA) +- Switch to EA mode for 11.0.8 pre-release builds. +- Drop JDK-8237396 & JDK-8228407 backports now applied upstream. +- Resolves: rhbz#1838811 + * Wed Apr 22 2020 Andrew John Hughes - 1:11.0.7.10-3 - Bump release number for RHEL 8.3.0. - Resolves: rhbz#1810557