Mercurial > hg > icedtea8

changeset 2973:1f9e270d63c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump aarch32 to jdk8u272-ga-aarch32-20201026. Upstream changes: - JDK-8057003: Large reference arrays cause extremely long synchronization times - JDK-8060721: Test runtime/SharedArchiveFile/LimitSharedSizes.java fails in jdk 9 fcs new platforms/compiler - JDK-8064319: Need to enable -XX:+TraceExceptions in release builds - JDK-8080462: Update SunPKCS11 provider with PKCS11 v2.40 support - JDK-8184762: ZapStackSegments should use optimized memset - JDK-8193234: When using -Xcheck:jni an internally allocated buffer can leak - JDK-8219919: RuntimeStub name lost with PrintFrameConverterAssembly - JDK-8220313: [TESTBUG] Update base image for Docker testing to OL 7.6 - JDK-8222079: Don't use memset to initialize fields decode_env constructor in disassembler.cpp - JDK-8226575: OperatingSystemMXBean should be made container aware - JDK-8233624: Enhance JNI linkage - JDK-8236196: Improve string pooling - JDK-8240124: Better VM Interning - JDK-8240676: Meet not symmetric failure when running lucene on jdk8 - JDK-8241114: Better range handling - JDK-8243302: Advanced class supports - JDK-8244151: Update MUSCLE PC/SC-Lite headers to the latest release 1.8.26 - JDK-8244955: Additional Fix for JDK-8240124 - JDK-8245412: Better class definitions - JDK-8249158: THREAD_START and THREAD_END event posted in primordial phase - JDK-8250627: Use -XX:+/-UseContainerSupport for enabling/disabling Java container metrics - JDK-8251120: [8u] HotSpot build assumes ENABLE_JFR is set to either true or false - JDK-8252084: Minimal VM fails to bootcycle: undefined symbol: AgeTableTracer::is_tenuring_distribution_event_enabled - JDK-8252573: 8u: Windows build failed after 8222079 backport - JDK-8254673: Call to JvmtiExport::post_vm_start() was removed by the fix for JDK-8249158 - JDK-8254937: Revert JDK-8148854 for 8u272 ChangeLog: 2020-10-26 Andrew John Hughes <gnu_andrew@member.fsf.org> Bump aarch32 to jdk8u272-ga-aarch32-20201026. * patches/hotspot/aarch32/8251120-pr3793.patch: Removed as applied upstream. * Makefile.am: (ICEDTEA_PATCHES): Remove JDK-8251120/PR3793 altogether now it is in both aarch32 and shenandoah upstream bundles. * NEWS: Updated. * hotspot.map.in: Bump aarch32 to jdk8u272-ga-aarch32-20201026. * patches/hotspot/aarch32/8062808-pr3548.patch, * patches/hotspot/aarch32/pr3593.patch: Switch back to symlinks now they can share a version with Shenandoah again.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Tue, 27 Oct 2020 06:37:37 +0000
parents ca45ee064071
children 8a02d2f26a4f
files ChangeLog Makefile.am NEWS hotspot.map.in patches/hotspot/aarch32/8062808-pr3548.patch patches/hotspot/aarch32/8251120-pr3793.patch patches/hotspot/aarch32/pr3593.patch
diffstat 7 files changed, 49 insertions(+), 452 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Oct 26 06:49:22 2020 +0000
+++ b/ChangeLog	Tue Oct 27 06:37:37 2020 +0000
@@ -1,3 +1,20 @@
+2020-10-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	Bump aarch32 to jdk8u272-ga-aarch32-20201026.
+	* patches/hotspot/aarch32/8251120-pr3793.patch:
+	Removed as applied upstream.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Remove JDK-8251120/PR3793
+	altogether now it is in both aarch32 and
+	shenandoah upstream bundles.
+	* NEWS: Updated.
+	* hotspot.map.in: Bump aarch32 to
+	jdk8u272-ga-aarch32-20201026.
+	* patches/hotspot/aarch32/8062808-pr3548.patch,
+	* patches/hotspot/aarch32/pr3593.patch:
+	Switch back to symlinks now they can share a version with
+	Shenandoah again.
+
 2020-10-25  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	Bump shenandoah to aarch64-shenandoah-jdk8u272-b10.
@@ -788,7 +805,7 @@
 	* hotspot.map.in: Bump aarch32 to
 	jdk8u212-b04-aarch32-190429.
 	* patches/hotspot/aarch32/8222286-pr3727-s390.patch:
-	Symlink to Shenandoah verison.
+	Symlink to Shenandoah version.
 	* patches/hotspot/aarch32/pr1942.patch,
 	* patches/hotspot/aarch32/pr2777.patch:
 	Switch back to symlinks now they can share a version with
--- a/Makefile.am	Mon Oct 26 06:49:22 2020 +0000
+++ b/Makefile.am	Tue Oct 27 06:37:37 2020 +0000
@@ -350,8 +350,7 @@
 if WITH_AARCH32_HSBUILD
 ICEDTEA_PATCHES += \
 	patches/hotspot/$(HSBUILD)/pr3548-aarch32.patch \
-	patches/hotspot/$(HSBUILD)/8078628-pr3208.patch \
-	patches/hotspot/$(HSBUILD)/8251120-pr3793.patch
+	patches/hotspot/$(HSBUILD)/8078628-pr3208.patch
 endif
 
 ICEDTEA_PATCHES += \
--- a/NEWS	Mon Oct 26 06:49:22 2020 +0000
+++ b/NEWS	Tue Oct 27 06:37:37 2020 +0000
@@ -513,6 +513,33 @@
   - JDK-8183925, PR3797: [AArch64] Decouple crash protection from watcher thread
   - JDK-8199712, PR3797: [AArch64] Flight Recorder
   - JDK-8215961, PR3797: jdk/jfr/event/os/TestCPUInformation.java fails on AArch64
+* AArch32 port
+  - JDK-8057003: Large reference arrays cause extremely long synchronization times
+  - JDK-8060721: Test runtime/SharedArchiveFile/LimitSharedSizes.java fails in jdk 9 fcs new platforms/compiler
+  - JDK-8064319: Need to enable -XX:+TraceExceptions in release builds
+  - JDK-8080462: Update SunPKCS11 provider with PKCS11 v2.40 support
+  - JDK-8184762: ZapStackSegments should use optimized memset
+  - JDK-8193234: When using -Xcheck:jni an internally allocated buffer can leak
+  - JDK-8219919: RuntimeStub name lost with PrintFrameConverterAssembly
+  - JDK-8220313: [TESTBUG] Update base image for Docker testing to OL 7.6
+  - JDK-8222079: Don't use memset to initialize fields decode_env constructor in disassembler.cpp
+  - JDK-8226575: OperatingSystemMXBean should be made container aware
+  - JDK-8233624: Enhance JNI linkage
+  - JDK-8236196: Improve string pooling
+  - JDK-8240124: Better VM Interning
+  - JDK-8240676: Meet not symmetric failure when running lucene on jdk8
+  - JDK-8241114: Better range handling
+  - JDK-8243302: Advanced class supports
+  - JDK-8244151: Update MUSCLE PC/SC-Lite headers to the latest release 1.8.26
+  - JDK-8244955: Additional Fix for JDK-8240124
+  - JDK-8245412: Better class definitions
+  - JDK-8249158: THREAD_START and THREAD_END event posted in primordial phase
+  - JDK-8250627: Use -XX:+/-UseContainerSupport for enabling/disabling Java container metrics
+  - JDK-8251120: [8u] HotSpot build assumes ENABLE_JFR is set to either true or false
+  - JDK-8252084: Minimal VM fails to bootcycle: undefined symbol: AgeTableTracer::is_tenuring_distribution_event_enabled
+  - JDK-8252573: 8u: Windows build failed after 8222079 backport
+  - JDK-8254673: Call to JvmtiExport::post_vm_start() was removed by the fix for JDK-8249158
+  - JDK-8254937: Revert JDK-8148854 for 8u272
 
 New in release 3.16.0 (2020-05-02):
 
--- a/hotspot.map.in	Mon Oct 26 06:49:22 2020 +0000
+++ b/hotspot.map.in	Tue Oct 27 06:37:37 2020 +0000
@@ -1,4 +1,4 @@
 # version type(drop/hg) url changeset sha256sum
 default drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 9cc00eb32cbd ebb11a30796657254bdc365a72a9363ff022863d08db8103eab9434e9101e090
 shenandoah drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ efc167880db9 1718e537f195adba5f98e30d115cc15db530d3f91e88cdbaaf307ea4220f7cc9
-aarch32 drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ f700065950de 4f24a61e3422be5cb406bdcf3391a89f50f3f097f444bebf79b2057f80f14e6d
+aarch32 drop https://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ aed49822247b b164443492d7ccc2fcceefe422b2548e700c6ac2767e30463d8188a39c9034da
--- a/patches/hotspot/aarch32/8062808-pr3548.patch	Mon Oct 26 06:49:22 2020 +0000
+++ b/patches/hotspot/aarch32/8062808-pr3548.patch	Tue Oct 27 06:37:37 2020 +0000
@@ -1,191 +1,1 @@
-# HG changeset patch
-# User stefank
-# Date 1525453613 -3600
-#      Fri May 04 18:06:53 2018 +0100
-# Node ID 07a1135a327362f157955d470fad5df07cc35164
-# Parent  de79964656fc652f2085dac4fe99bcc128b5a3b1
-8062808, PR3548: Turn on the -Wreturn-type warning
-Reviewed-by: mgerdin, tschatzl, coleenp, jrose, kbarrett
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make
-@@ -210,7 +210,7 @@
-   WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body -Qunused-arguments -Wno-uninitialized
- endif
- 
--WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value
-+WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value -Wreturn-type
- 
- ifeq ($(USE_CLANG),)
-   # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
-diff --git openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
---- openjdk.orig/hotspot/src/cpu/x86/vm/x86_32.ad
-+++ openjdk/hotspot/src/cpu/x86/vm/x86_32.ad
-@@ -1250,6 +1250,7 @@
- 
- 
-   Unimplemented();
-+  return 0; // Mute compiler
- }
- 
- #ifndef PRODUCT
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
-@@ -541,6 +541,7 @@
-   err.report_and_die();
- 
-   ShouldNotReachHere();
-+  return true; // Mute compiler
- }
- 
- void os::Linux::init_thread_fpu_state(void) {
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/defaultMethods.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/defaultMethods.cpp
-@@ -506,7 +506,7 @@
-   ss.write((const char*)name->bytes(), name->utf8_length());
-   ss.write((const char*)signature->bytes(), signature->utf8_length());
-   ss.print(" is abstract");
--  return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
-+  return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
- }
- 
- Symbol* MethodFamily::generate_conflicts_message(GrowableArray<Method*>* methods, TRAPS) const {
-@@ -521,7 +521,7 @@
-     ss.print(".");
-     ss.write((const char*)name->bytes(), name->utf8_length());
-   }
--  return SymbolTable::new_symbol(ss.base(), (int)ss.size(), CHECK_NULL);
-+  return SymbolTable::new_symbol(ss.base(), (int)ss.size(), THREAD);
- }
- 
- 
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/symbolTable.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
-@@ -249,7 +249,7 @@
-   MutexLocker ml(SymbolTable_lock, THREAD);
- 
-   // Otherwise, add to symbol to table
--  return the_table()->basic_add(index, (u1*)name, len, hashValue, true, CHECK_NULL);
-+  return the_table()->basic_add(index, (u1*)name, len, hashValue, true, THREAD);
- }
- 
- Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) {
-@@ -288,7 +288,7 @@
-   // Grab SymbolTable_lock first.
-   MutexLocker ml(SymbolTable_lock, THREAD);
- 
--  return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, CHECK_NULL);
-+  return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, THREAD);
- }
- 
- Symbol* SymbolTable::lookup_only(const char* name, int len,
-diff --git openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
---- openjdk.orig/hotspot/src/share/vm/classfile/systemDictionary.cpp
-+++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
-@@ -229,15 +229,15 @@
-                  class_name->as_C_string(),
-                  class_loader.is_null() ? "null" : class_loader->klass()->name()->as_C_string()));
-   if (FieldType::is_array(class_name)) {
--    return resolve_array_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
-+    return resolve_array_class_or_null(class_name, class_loader, protection_domain, THREAD);
-   } else if (FieldType::is_obj(class_name)) {
-     ResourceMark rm(THREAD);
-     // Ignore wrapping L and ;.
-     TempNewSymbol name = SymbolTable::new_symbol(class_name->as_C_string() + 1,
-                                    class_name->utf8_length() - 2, CHECK_NULL);
--    return resolve_instance_class_or_null(name, class_loader, protection_domain, CHECK_NULL);
-+    return resolve_instance_class_or_null(name, class_loader, protection_domain, THREAD);
-   } else {
--    return resolve_instance_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
-+    return resolve_instance_class_or_null(class_name, class_loader, protection_domain, THREAD);
-   }
- }
- 
-diff --git openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
---- openjdk.orig/hotspot/src/share/vm/memory/heapInspection.hpp
-+++ openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
-@@ -367,7 +367,7 @@
-       _csv_format(csv_format), _print_help(print_help),
-       _print_class_stats(print_class_stats), _columns(columns) {}
-   void heap_inspection(outputStream* st) NOT_SERVICES_RETURN;
--  size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN;
-+  size_t populate_table(KlassInfoTable* cit, BoolObjectClosure* filter = NULL) NOT_SERVICES_RETURN_(0);
-   static void find_instances_at_safepoint(Klass* k, GrowableArray<oop>* result) NOT_SERVICES_RETURN;
-  private:
-   void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL);
-diff --git openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
---- openjdk.orig/hotspot/src/share/vm/memory/metaspaceShared.hpp
-+++ openjdk/hotspot/src/share/vm/memory/metaspaceShared.hpp
-@@ -93,7 +93,7 @@
-   static void preload_and_dump(TRAPS) NOT_CDS_RETURN;
-   static int preload_and_dump(const char * class_list_path,
-                               GrowableArray<Klass*>* class_promote_order,
--                              TRAPS) NOT_CDS_RETURN;
-+                              TRAPS) NOT_CDS_RETURN_(0);
- 
-   static ReservedSpace* shared_rs() {
-     CDS_ONLY(return _shared_rs);
-diff --git openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp openjdk/hotspot/src/share/vm/oops/constantPool.hpp
---- openjdk.orig/hotspot/src/share/vm/oops/constantPool.hpp
-+++ openjdk/hotspot/src/share/vm/oops/constantPool.hpp
-@@ -352,7 +352,7 @@
- 
-   Klass* klass_at(int which, TRAPS) {
-     constantPoolHandle h_this(THREAD, this);
--    return klass_at_impl(h_this, which, CHECK_NULL);
-+    return klass_at_impl(h_this, which, THREAD);
-   }
- 
-   Symbol* klass_name_at(int which);  // Returns the name, w/o resolving.
-diff --git openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp openjdk/hotspot/src/share/vm/prims/jvm.cpp
---- openjdk.orig/hotspot/src/share/vm/prims/jvm.cpp
-+++ openjdk/hotspot/src/share/vm/prims/jvm.cpp
-@@ -4244,7 +4244,7 @@
-     JVM_DTraceProvider* providers))
-   JVMWrapper("JVM_DTraceActivate");
-   return DTraceJSDT::activate(
--    version, module_name, providers_count, providers, CHECK_0);
-+    version, module_name, providers_count, providers, THREAD);
- JVM_END
- 
- JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method))
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp openjdk/hotspot/src/share/vm/runtime/reflection.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/reflection.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/reflection.cpp
-@@ -1093,7 +1093,7 @@
-   } else {
-     if (rtype == T_BOOLEAN || rtype == T_BYTE || rtype == T_CHAR || rtype == T_SHORT)
-       narrow((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
--    return box((jvalue*) result.get_value_addr(), rtype, CHECK_NULL);
-+    return box((jvalue*) result.get_value_addr(), rtype, THREAD);
-   }
- }
- 
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/sharedRuntime.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
-@@ -1046,7 +1046,7 @@
-   // last java frame on stack (which includes native call frames)
-   vframeStream vfst(thread, true);  // Do not skip and javaCalls
- 
--  return find_callee_info_helper(thread, vfst, bc, callinfo, CHECK_(Handle()));
-+  return find_callee_info_helper(thread, vfst, bc, callinfo, THREAD);
- }
- 
- 
-diff --git openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp openjdk/hotspot/src/share/vm/services/memTracker.hpp
---- openjdk.orig/hotspot/src/share/vm/services/memTracker.hpp
-+++ openjdk/hotspot/src/share/vm/services/memTracker.hpp
-@@ -64,7 +64,7 @@
-     const NativeCallStack& stack, MEMFLAGS flag = mtNone) { }
-   static inline void record_virtual_memory_commit(void* addr, size_t size, const NativeCallStack& stack) { }
-   static inline Tracker get_virtual_memory_uncommit_tracker() { return Tracker(); }
--  static inline Tracker get_virtual_memory_release_tracker() { }
-+  static inline Tracker get_virtual_memory_release_tracker() { return Tracker(); }
-   static inline void record_virtual_memory_type(void* addr, MEMFLAGS flag) { }
-   static inline void record_thread_stack(void* addr, size_t size) { }
-   static inline void release_thread_stack(void* addr, size_t size) { }
+../shenandoah/8062808-pr3548.patch
\ No newline at end of file
--- a/patches/hotspot/aarch32/8251120-pr3793.patch	Mon Oct 26 06:49:22 2020 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1598596701 -3600
-#      Fri Aug 28 07:38:21 2020 +0100
-# Node ID 7323b2187a50e3d04cdc3b0e35bac32875e34e09
-# Parent  b73ff161ed0a57a46fdb3ed51291e39c67d880f5
-8251120, PR3793: [8u] HotSpot build assumes ENABLE_JFR is set to either true or false
-Summary: Only test for ENABLE_JFR being true, and assume undefined == false
-Reviewed-by: neugens
-
-diff --git openjdk.orig/hotspot/make/aix/makefiles/buildtree.make openjdk/hotspot/make/aix/makefiles/buildtree.make
---- openjdk.orig/hotspot/make/aix/makefiles/buildtree.make
-+++ openjdk/hotspot/make/aix/makefiles/buildtree.make
-@@ -111,7 +111,7 @@
- endif
- endif
- 
--ifeq ($(ENABLE_JFR),false)
-+ifneq ($(ENABLE_JFR),true)
- ALWAYS_EXCLUDE_DIRS += -o -name jfr
- endif
- 
-diff --git openjdk.orig/hotspot/make/aix/makefiles/vm.make openjdk/hotspot/make/aix/makefiles/vm.make
---- openjdk.orig/hotspot/make/aix/makefiles/vm.make
-+++ openjdk/hotspot/make/aix/makefiles/vm.make
-@@ -147,7 +147,7 @@
- LIBJVM_DEBUGINFO   = lib$(JVM).debuginfo
- LIBJVM_DIZ         = lib$(JVM).diz
- 
--ifeq ($(ENABLE_JFR),false)
-+ifneq ($(ENABLE_JFR),true)
- EXCLUDE_JFR_PATHS:= -o -name jfr -prune
- endif
- 
-diff --git openjdk.orig/hotspot/make/bsd/makefiles/buildtree.make openjdk/hotspot/make/bsd/makefiles/buildtree.make
---- openjdk.orig/hotspot/make/bsd/makefiles/buildtree.make
-+++ openjdk/hotspot/make/bsd/makefiles/buildtree.make
-@@ -113,7 +113,7 @@
- endif
- endif
- 
--ifeq ($(ENABLE_JFR),false)
-+ifneq ($(ENABLE_JFR),true)
- ALWAYS_EXCLUDE_DIRS += -o -name jfr
- endif
- 
-diff --git openjdk.orig/hotspot/make/bsd/makefiles/vm.make openjdk/hotspot/make/bsd/makefiles/vm.make
---- openjdk.orig/hotspot/make/bsd/makefiles/vm.make
-+++ openjdk/hotspot/make/bsd/makefiles/vm.make
-@@ -165,7 +165,7 @@
-   LIBJVM_DIZ         = lib$(JVM).diz
- endif
- 
--ifeq ($(ENABLE_JFR),false)
-+ifneq ($(ENABLE_JFR),true)
- EXCLUDE_JFR_PATHS:= -o -name jfr -prune
- endif
- SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt
-diff --git openjdk.orig/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make
---- openjdk.orig/hotspot/make/linux/makefiles/buildtree.make
-+++ openjdk/hotspot/make/linux/makefiles/buildtree.make
-@@ -112,7 +112,7 @@
- endif
- endif
- 
--ifeq ($(ENABLE_JFR),false)
-+ifneq ($(ENABLE_JFR),true)
- ALWAYS_EXCLUDE_DIRS += -o -name jfr
- endif
- 
-diff --git openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
---- openjdk.orig/hotspot/make/linux/makefiles/vm.make
-+++ openjdk/hotspot/make/linux/makefiles/vm.make
-@@ -158,7 +158,7 @@
- LIBJVM_DEBUGINFO   = lib$(JVM).debuginfo
- LIBJVM_DIZ         = lib$(JVM).diz
- 
--ifeq ($(ENABLE_JFR),false)
-+ifneq ($(ENABLE_JFR),true)
- EXCLUDE_JFR_PATHS:= -o -name jfr -prune
- endif
- SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt
-diff --git openjdk.orig/hotspot/make/solaris/makefiles/buildtree.make openjdk/hotspot/make/solaris/makefiles/buildtree.make
---- openjdk.orig/hotspot/make/solaris/makefiles/buildtree.make
-+++ openjdk/hotspot/make/solaris/makefiles/buildtree.make
-@@ -103,7 +103,7 @@
- endif
- endif
- 
--ifeq ($(ENABLE_JFR),false)
-+ifneq ($(ENABLE_JFR),true)
- ALWAYS_EXCLUDE_DIRS += -o -name jfr
- endif
- 
-diff --git openjdk.orig/hotspot/make/solaris/makefiles/vm.make openjdk/hotspot/make/solaris/makefiles/vm.make
---- openjdk.orig/hotspot/make/solaris/makefiles/vm.make
-+++ openjdk/hotspot/make/solaris/makefiles/vm.make
-@@ -172,7 +172,7 @@
- 
- LIBJVM_DEBUGINFO   = lib$(JVM).debuginfo
- LIBJVM_DIZ         = lib$(JVM).diz
--ifeq ($(ENABLE_JFR),false)
-+ifneq ($(ENABLE_JFR),true)
- EXCLUDE_JFR_PATHS:= -o -name jfr -prune
- endif
- SPECIAL_PATHS:=adlc c1 dist gc_implementation opto shark libadt
--- a/patches/hotspot/aarch32/pr3593.patch	Mon Oct 26 06:49:22 2020 +0000
+++ b/patches/hotspot/aarch32/pr3593.patch	Tue Oct 27 06:37:37 2020 +0000
@@ -1,151 +1,1 @@
-# HG changeset patch
-# User andrew
-# Date 1526788009 -3600
-#      Sun May 20 04:46:49 2018 +0100
-# Node ID 999983606f5c61b093c6f6316a7b26c4cd4ca79e
-# Parent  7f6e1069a5719c8908b53774d3560ce851c7cd70
-PR3593: s390 needs to use '%z' format specifier for size_t arguments as size_t != int
-
-diff -Nru openjdk.orig/hotspot/src/share/vm/asm/codeBuffer.cpp openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp
---- openjdk.orig/hotspot/src/share/vm/asm/codeBuffer.cpp	2019-01-16 07:13:59.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp	2019-01-31 04:10:34.516469599 +0000
-@@ -977,7 +977,7 @@
-     for (int n = (int) CodeBuffer::SECT_FIRST; n < (int) CodeBuffer::SECT_LIMIT; n++) {
-       CodeSection* sect = code_section(n);
-       if (!sect->is_allocated() || sect->is_empty())  continue;
--      xtty->print_cr("<sect index='%d' size='" SIZE_FORMAT "' free='" SIZE_FORMAT "'/>",
-+      xtty->print_cr("<sect index='%d' size='" INTX_FORMAT "' free='" INTX_FORMAT "'/>",
-                      n, sect->limit() - sect->start(), sect->limit() - sect->end());
-     }
-     xtty->print_cr("</blob>");
-diff -Nru openjdk.orig/hotspot/src/share/vm/code/codeCache.cpp openjdk/hotspot/src/share/vm/code/codeCache.cpp
---- openjdk.orig/hotspot/src/share/vm/code/codeCache.cpp	2019-01-16 07:13:59.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/code/codeCache.cpp	2019-01-31 04:10:34.516469599 +0000
-@@ -192,7 +192,7 @@
-     }
-     if (PrintCodeCacheExtension) {
-       ResourceMark rm;
--      tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" SSIZE_FORMAT " bytes)",
-+      tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" INTX_FORMAT " bytes)",
-                     (intptr_t)_heap->low_boundary(), (intptr_t)_heap->high(),
-                     (address)_heap->high() - (address)_heap->low_boundary());
-     }
-diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
---- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp	2019-01-31 04:09:27.637523788 +0000
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp	2019-01-31 04:11:36.563491574 +0000
-@@ -598,7 +598,7 @@
-     "   [Table]\n"
-     "      [Memory Usage: " G1_STRDEDUP_BYTES_FORMAT_NS "]\n"
-     "      [Size: " SIZE_FORMAT ", Min: " SIZE_FORMAT ", Max: " SIZE_FORMAT "]\n"
--    "      [Entries: " UINTX_FORMAT ", Load: " G1_STRDEDUP_PERCENT_FORMAT_NS ", Cached: " UINTX_FORMAT ", Added: " UINTX_FORMAT ", Removed: " UINTX_FORMAT "]\n"
-+    "      [Entries: " UINTX_FORMAT ", Load: " G1_STRDEDUP_PERCENT_FORMAT_NS ", Cached: " SIZE_FORMAT ", Added: " UINTX_FORMAT ", Removed: " UINTX_FORMAT "]\n"
-     "      [Resize Count: " UINTX_FORMAT ", Shrink Threshold: " UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS "), Grow Threshold: " UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS ")]\n"
-     "      [Rehash Count: " UINTX_FORMAT ", Rehash Threshold: " UINTX_FORMAT ", Hash Seed: 0x%x]\n"
-     "      [Age Threshold: " UINTX_FORMAT "]",
-diff -Nru openjdk.orig/hotspot/src/share/vm/memory/blockOffsetTable.cpp openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp
---- openjdk.orig/hotspot/src/share/vm/memory/blockOffsetTable.cpp	2019-01-16 07:13:59.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp	2019-01-31 04:10:34.516469599 +0000
-@@ -57,7 +57,7 @@
-     gclog_or_tty->print_cr("BlockOffsetSharedArray::BlockOffsetSharedArray: ");
-     gclog_or_tty->print_cr("  "
-                   "  rs.base(): " INTPTR_FORMAT
--                  "  rs.size(): " INTPTR_FORMAT
-+                  "  rs.size(): " SIZE_FORMAT
-                   "  rs end(): " INTPTR_FORMAT,
-                   p2i(rs.base()), rs.size(), p2i(rs.base() + rs.size()));
-     gclog_or_tty->print_cr("  "
-diff -Nru openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
---- openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp	2019-01-31 04:09:27.641523725 +0000
-+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp	2019-01-31 04:10:34.516469599 +0000
-@@ -1056,7 +1056,8 @@
-     size_t expected = msp.scale_by_NewRatio_aligned(initial_heap_size);
-     assert(msp.initial_gen0_size() == expected, err_msg("%zu != %zu", msp.initial_gen0_size(), expected));
-     assert(FLAG_IS_ERGO(NewSize) && NewSize == expected,
--        err_msg("NewSize should have been set ergonomically to %zu, but was %zu", expected, NewSize));
-+        err_msg("NewSize should have been set ergonomically to " SIZE_FORMAT ", but was " UINTX_FORMAT,
-+		expected, NewSize));
-   }
- 
- private:
-diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp	2019-01-31 04:09:27.641523725 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp	2019-01-31 04:10:34.520469536 +0000
-@@ -1291,14 +1291,14 @@
-     }
-     if (PrintGCDetails && Verbose) {
-       // Too early to use gclog_or_tty
--      tty->print_cr("CMS ergo set MaxNewSize: " SIZE_FORMAT, MaxNewSize);
-+      tty->print_cr("CMS ergo set MaxNewSize: " UINTX_FORMAT, MaxNewSize);
-     }
- 
-     // Code along this path potentially sets NewSize and OldSize
-     if (PrintGCDetails && Verbose) {
-       // Too early to use gclog_or_tty
--      tty->print_cr("CMS set min_heap_size: " SIZE_FORMAT
--           " initial_heap_size:  " SIZE_FORMAT
-+      tty->print_cr("CMS set min_heap_size: " UINTX_FORMAT
-+           " initial_heap_size:  " UINTX_FORMAT
-            " max_heap: " SIZE_FORMAT,
-            min_heap_size(), InitialHeapSize, max_heap);
-     }
-@@ -1314,7 +1314,7 @@
-         FLAG_SET_ERGO(uintx, NewSize, MIN2(preferred_max_new_size, NewSize));
-         if (PrintGCDetails && Verbose) {
-           // Too early to use gclog_or_tty
--          tty->print_cr("CMS ergo set NewSize: " SIZE_FORMAT, NewSize);
-+          tty->print_cr("CMS ergo set NewSize: " UINTX_FORMAT, NewSize);
-         }
-       }
-       // Unless explicitly requested otherwise, size old gen
-@@ -1324,7 +1324,7 @@
-           FLAG_SET_ERGO(uintx, OldSize, MIN2(NewRatio*NewSize, (uintx) (max_heap - NewSize)));
-           if (PrintGCDetails && Verbose) {
-             // Too early to use gclog_or_tty
--            tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize);
-+            tty->print_cr("CMS ergo set OldSize: " UINTX_FORMAT, OldSize);
-           }
-         }
-       }
-@@ -2043,7 +2043,7 @@
- 
-       if (PrintGCDetails && Verbose) {
-         // Cannot use gclog_or_tty yet.
--        tty->print_cr("  Initial heap size " SIZE_FORMAT, (uintx)reasonable_initial);
-+        tty->print_cr("  Initial heap size " SIZE_FORMAT, (size_t)reasonable_initial);
-       }
-       FLAG_SET_ERGO(uintx, InitialHeapSize, (uintx)reasonable_initial);
-     }
-@@ -2053,7 +2053,7 @@
-       set_min_heap_size(MIN2((uintx)reasonable_minimum, InitialHeapSize));
-       if (PrintGCDetails && Verbose) {
-         // Cannot use gclog_or_tty yet.
--        tty->print_cr("  Minimum heap size " SIZE_FORMAT, min_heap_size());
-+        tty->print_cr("  Minimum heap size " UINTX_FORMAT, min_heap_size());
-       }
-     }
-   }
-diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
---- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp	2019-01-31 04:09:26.369543774 +0000
-+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp	2019-01-31 04:10:34.520469536 +0000
-@@ -1389,12 +1389,21 @@
- 
- #define INTPTR_FORMAT_W(width)   "%" #width PRIxPTR
- 
-+#if defined(S390) && !defined(_LP64)
-+#define SSIZE_FORMAT          "%z"   PRIdPTR
-+#define SIZE_FORMAT           "%z"   PRIuPTR
-+#define SIZE_FORMAT_HEX       "0x%z" PRIxPTR
-+#define SSIZE_FORMAT_W(width) "%"   #width "z" PRIdPTR
-+#define SIZE_FORMAT_W(width)  "%"   #width "z" PRIuPTR
-+#define SIZE_FORMAT_HEX_W(width) "0x%" #width "z" PRIxPTR
-+#else   // !S390
- #define SSIZE_FORMAT          "%"   PRIdPTR
- #define SIZE_FORMAT           "%"   PRIuPTR
- #define SIZE_FORMAT_HEX       "0x%" PRIxPTR
- #define SSIZE_FORMAT_W(width) "%"   #width PRIdPTR
- #define SIZE_FORMAT_W(width)  "%"   #width PRIuPTR
- #define SIZE_FORMAT_HEX_W(width) "0x%" #width PRIxPTR
-+#endif  // S390
- 
- #define INTX_FORMAT           "%" PRIdPTR
- #define UINTX_FORMAT          "%" PRIuPTR
+../shenandoah/pr3593.patch
\ No newline at end of file