Merged update from upstream sources

This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/java-1.8.0-openjdk.git#887fd98b7511938279cd7bc3c77b41e0eb240fc2
2020-12-24 01:34:15 +00:00 · 2020-12-24 01:34:15 +00:00 · 58126a81ee
commit 58126a81ee
parent b912063ca2
10 changed files with 108 additions and 4144 deletions
--- a/.gitignore
+++ b/.gitignore
@ -210,3 +210,4 @@
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b10.tar.xz
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u275-b01-4curve.tar.xz
 /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u275-b01.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u282-b01-4curve.tar.xz
--- a/63
+++ b/63
@ -3,6 +3,69 @@ Key:
 JDK-X  - https://bugs.openjdk.java.net/browse/JDK-X
 CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY

+New in release OpenJDK 8u282 (2021-01-19):
+===========================================
+Live versions of these release notes can be found at:
+  * https://bitly.com/openjdk8u282
+  * https://builds.shipilev.net/backports-monitor/release-notes-openjdk8u282.txt
+
+* Other changes
+  - JDK-6962725: Regtest javax/swing/JFileChooser/6738668/bug6738668.java fails under Linux
+  - JDK-8025936: Windows .pdb and .map files does not have proper dependencies setup
+  - JDK-8030350: Enable additional compiler warnings for GCC
+  - JDK-8031423: Test java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java fails by Timeout on Windows
+  - JDK-8036122: Fix warning 'format not a string literal'
+  - JDK-8039279: Move awt tests to openjdk repository
+  - JDK-8051853: new URI("x/").resolve("..").getSchemeSpecificPart() returns null!
+  - JDK-8062808: Turn on the -Wreturn-type warning
+  - JDK-8132664: closed/javax/swing/DataTransfer/DefaultNoDrop/DefaultNoDrop.java locks on Windows
+  - JDK-8134632: Mark javax/sound/midi/Devices/InitializationHang.java as headful
+  - JDK-8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
+  - JDK-8148916: Mark bug6400879.java as intermittently failing
+  - JDK-8148983: Fix extra comma in changes for JDK-8148916
+  - JDK-8160438: javax/swing/plaf/nimbus/8057791/bug8057791.java fails
+  - JDK-8165808: Add release barriers when allocating objects with concurrent collection
+  - JDK-8185003: JMX: Add a version of ThreadMXBean.dumpAllThreads with a maxDepth argument
+  - JDK-8197981: Missing return statement in __sync_val_compare_and_swap_8
+  - JDK-8202076: test/jdk/java/io/File/WinSpecialFiles.java on windows with VS2017
+  - JDK-8207766: [testbug] Adapt tests for Aix.
+  - JDK-8212070: Introduce diagnostic flag to abort VM on failed JIT compilation
+  - JDK-8213448: [TESTBUG] enhance jfr/jvm/TestDumpOnCrash
+  - JDK-8215727: Restore JFR thread sampler loop to old / previous behavior
+  - JDK-8220657: JFR.dump does not work when filename is set
+  - JDK-8221342: [TESTBUG] Generate Dockerfile for docker testing
+  - JDK-8224502: [TESTBUG] JDK docker test TestSystemMetrics.java fails with access issues and OOM
+  - JDK-8231209: [REDO] ThreadMXBean::getThreadAllocatedBytes() can be quicker for self thread
+  - JDK-8231968: getCurrentThreadAllocatedBytes default implementation s/b getThreadAllocatedBytes
+  - JDK-8232114: JVM crashed at imjpapi.dll in native code
+  - JDK-8234270: [REDO] JDK-8204128 NMT might report incorrect numbers for Compiler area
+  - JDK-8234339: replace JLI_StrTok in java_md_solinux.c
+  - JDK-8238448: RSASSA-PSS signature verification fail when using certain odd key sizes
+  - JDK-8242335: Additional Tests for RSASSA-PSS
+  - JDK-8244225: stringop-overflow warning on strncpy call from compile_the_world_in
+  - JDK-8245400: Upgrade to LittleCMS 2.11
+  - JDK-8248214: Add paddings for TaskQueueSuper to reduce false-sharing cache contention
+  - JDK-8249176: Update GlobalSignR6CA test certificates
+  - JDK-8250665: Wrong translation for the month name of May in ar_JO,LB,SY
+  - JDK-8250928: JFR: Improve hash algorithm for stack traces
+  - JDK-8251469: Better cleanup for test/jdk/javax/imageio/SetOutput.java
+  - JDK-8251840: Java_sun_awt_X11_XToolkit_getDefaultScreenData should not be in make/mapfiles/libawt_xawt/mapfile-vers
+  - JDK-8252384: [TESTBUG] Some tests refer to COMPAT provider rather than JRE
+  - JDK-8252395: [8u] --with-native-debug-symbols=external doesn't include debuginfo files for binaries
+  - JDK-8252497: Incorrect numeric currency code for ROL
+  - JDK-8252754: Hash code calculation of JfrStackTrace is inconsistent
+  - JDK-8252904: VM crashes when JFR is used and JFR event class is transformed
+  - JDK-8252975: [8u] JDK-8252395 breaks the build for --with-native-debug-symbols=internal
+  - JDK-8253036: Support building the Zero assembler port on AArch64
+  - JDK-8253284: Zero OrderAccess barrier mappings are incorrect
+  - JDK-8253550: [8u] JDK-8252395 breaks the build for make STRIP_POLICY=no_strip
+  - JDK-8253752: test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java fails randomly
+  - JDK-8254081: java/security/cert/PolicyNode/GetPolicyQualifiers.java fails due to an expired certificate
+  - JDK-8254144: Non-x86 Zero builds fail with return-type warning in os_linux_zero.cpp
+  - JDK-8254166: Zero: return-type warning in zeroInterpreter_zero.cpp
+  - JDK-8254683: [TEST_BUG] jdk/test/sun/tools/jconsole/WorkerDeadlockTest.java fails
+  - JDK-8255003: Build failures on Solaris
+
 New in release OpenJDK 8u275 (2020-11-05):
 ===========================================
 Live versions of these release notes can be found at:
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@ -274,7 +274,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-jdk8u275-b01
+%global shenandoah_revision    	aarch64-shenandoah-jdk8u282-b01
 # Define old aarch64/jdk8u tree variables for compatibility
 %global project         %{shenandoah_project}
 %global repo            %{shenandoah_repo}
@ -289,12 +289,12 @@
 %global updatever       %(VERSION=%{whole_update}; echo ${VERSION##*u})
 # eg jdk8u60-b27 -> b27
 %global buildver        %(VERSION=%{version_tag}; echo ${VERSION##*-})
-%global rpmrelease      6
+%global rpmrelease      0
 # Define milestone (EA for pre-releases, GA ("fcs") for releases)
 # 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 milestone          fcs
 %global milestone_version  %{nil}
@ -1312,8 +1312,6 @@ Patch512: rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch
 Patch523: pr2974-rh1337583-add_systemlineendings_option_to_keytool_and_use_line_separator_instead_of_crlf_in_pkcs10.patch
 # PR3083, RH1346460: Regression in SSL debug output without an ECC provider
 Patch528: pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch
-# PR3601: Fix additional -Wreturn-type issues introduced by 8061651
-Patch530: pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
 # PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
 # PR3575, RH1567204: System cacerts database handling should not affect jssecacerts
 Patch539: pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch
@ -1365,10 +1363,6 @@ Patch502: pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binar
 Patch571: jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch
 # 8143245, PR3548: Zero build requires disabled warnings
 Patch574: jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
-# 8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
-Patch575: jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
-# 8062808, PR3548: Turn on the -Wreturn-type warning
-Patch577: jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
 # s390: JDK-8203030, Type fixing for s390
 Patch102: jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch
 # 8035341: Allow using a system installed libpng
@ -1386,8 +1380,6 @@ Patch204: jdk8042159-allow_using_system_installed_lcms2-jdk.patch
 # able to be removed once that release is out
 # and used by this RPM.
 #############################################
-# JDK-8254177: (tz) Upgrade time-zone data to tzdata2020b
-Patch13: jdk8254177-tzdata2020b.patch

 #############################################
 #
@ -1844,14 +1836,10 @@ sh %{SOURCE12}
 %patch512
 %patch523
 %patch528
-%patch530
 %patch571
 %patch574
-%patch575
-%patch577
 %patch111
 %patch112
-%patch13

 # RPM-only fixes
 %patch539
@ -2606,6 +2594,15 @@ require "copy_jdk_configs.lua"
 %endif

 %changelog
+* Tue Dec 22 2020 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.282.b01-0.0.ea
+- Update to aarch64-shenandoah-jdk8u282-b01 (EA)
+- Update release notes for 8u282-b01.
+- Switch to EA mode.
+- Remove PR3601, covered upstream by JDK-8062808.
+- Remove upstreamed JDK-8197981/PR3548, JDK-8062808/PR3548 & JDK-8254177.
+- Extend RH1750419 alt-java fix to include external debuginfo, following JDK-8252395
+- Adapt JDK-8143245 patch, following JDK-8254166
+
 * Tue Dec 22 2020 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.275.b01-6
 - fixed missing condition for fastdebug packages being counted as debug ones

--- a/jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
+++ b/jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
@ -1,191 +0,0 @@
-# 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
- 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
-@@ -353,7 +353,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) const;  // 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) { }
--- a/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
+++ b/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
@ -34,12 +34,12 @@ diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hots
 diff --git openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
 --- openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
 +++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
-@@ -100,7 +100,7 @@
-     case T_DOUBLE:
-     case T_VOID:
+@@ -102,7 +102,7 @@
       return result;
-    default  : ShouldNotReachHere();
-+    default  : ShouldNotReachHere(); return NULL_WORD;
+     default:
+       ShouldNotReachHere();
+-      return result; // silence compiler warnings
+      return NULL_WORD; // silence compiler warnings
   }
 }
 
--- a/jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
+++ b/jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
@ -1,32 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1518667645 0
-#      Thu Feb 15 04:07:25 2018 +0000
-# Node ID 1d35411eb7bdf16191e220ffe3b1dc4d5d0c6041
-# Parent  999983606f5c61b093c6f6316a7b26c4cd4ca79e
-8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
-Summary: Fix issue discovered by -Wreturn-type on systems without LP64.
-Reviewed-by: aph
-
-diff --git openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
--- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-@@ -457,6 +457,7 @@
-     long long unsigned int oldval,
-     long long unsigned int newval) {
-     ShouldNotCallThis();
-+    return 0;
-   }
- };
- #endif // !_LP64
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-@@ -498,6 +498,7 @@
-     long long unsigned int oldval,
-     long long unsigned int newval) {
-     ShouldNotCallThis();
-+    return 0;
-   }
- };
- #endif // !_LP64
--- a/jdk8254177-tzdata2020b.patch
+++ b/jdk8254177-tzdata2020b.patch
--- a/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
+++ b/pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
@ -1,38 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1529475043 -3600
-#      Wed Jun 20 07:10:43 2018 +0100
-# Node ID f6341f4635dacb56678264d29a88cd052b74036b
-# Parent  30520d5018b509b0ae68f5fcc9a5c540e3e5b2de
-PR3601: Fix additional -Wreturn-type issues introduced by 8061651
-
-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
-@@ -835,7 +835,7 @@
- JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname))
-   JVMWrapper("JVM_KnownToNotExist");
- #if INCLUDE_CDS
-  return ClassLoaderExt::known_to_not_exist(env, loader, classname, CHECK_(false));
-+  return ClassLoaderExt::known_to_not_exist(env, loader, classname, THREAD);
- #else
-   return false;
- #endif
-@@ -845,7 +845,7 @@
- JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader))
-   JVMWrapper("JVM_GetResourceLookupCacheURLs");
- #if INCLUDE_CDS
-  return ClassLoaderExt::get_lookup_cache_urls(env, loader, CHECK_NULL);
-+  return ClassLoaderExt::get_lookup_cache_urls(env, loader, THREAD);
- #else
-   return NULL;
- #endif
-@@ -855,7 +855,7 @@
- JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name))
-   JVMWrapper("JVM_GetResourceLookupCache");
- #if INCLUDE_CDS
-  return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, CHECK_NULL);
-+  return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, THREAD);
- #else
-   return NULL;
- #endif
--- a/rh1750419-redhat_alt_java.patch
+++ b/rh1750419-redhat_alt_java.patch
@ -1,11 +1,11 @@
-diff -r 25e94aa812b2 make/CompileLaunchers.gmk
--- openjdk/jdk/make/CompileLaunchers.gmk	Wed Feb 05 12:20:36 2020 -0300
-+++ openjdk/jdk/make/CompileLaunchers.gmk	Tue Jun 02 17:15:28 2020 +0100
-@@ -234,6 +234,21 @@
+diff --git openjdk.orig/jdk/make/CompileLaunchers.gmk openjdk/jdk/make/CompileLaunchers.gmk
+--- openjdk.orig/jdk/make/CompileLaunchers.gmk
+++ openjdk/jdk/make/CompileLaunchers.gmk
+@@ -255,6 +255,33 @@
+   endif
+ endif
 
- BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX)
- 
-+#Wno-error=cpp is present to allow commented warning in ifdef part of main.c
+# -Wno-error=cpp is present to allow commented warning in ifdef part of main.c
 +$(eval $(call SetupLauncher,alt-java, \
 +    -DEXPAND_CLASSPATH_WILDCARDS -DREDHAT_ALT_JAVA -Wno-error=cpp,,,user32.lib comctl32.lib, \
 +    $(JDK_OUTPUTDIR)/objs/jli_static.lib, $(JAVA_RC_FLAGS), \
@ -16,16 +16,29 @@ diff -r 25e94aa812b2 make/CompileLaunchers.gmk
 +	$(RM) $@
 +	$(CP) $(JDK_OUTPUTDIR)/objs/java_objs$(OUTPUT_SUBDIR)/alt-java$(EXE_SUFFIX) $@
 +
+$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/alt-java$(DEBUGINFO_EXT): $(BUILD_LAUNCHER_alt-java)
+	$(MKDIR) -p $(@D)
+	$(RM) $@
+	$(CP) $(JDK_OUTPUTDIR)/objs/java_objs$(OUTPUT_SUBDIR)/alt-java$(DEBUGINFO_EXT) $@
+
 +ifeq ($(OPENJDK_TARGET_OS), linux)
 +  BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/alt-java$(EXE_SUFFIX)
+  ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
+    ifneq ($(POST_STRIP_CMD), )
+      ifneq ($(STRIP_POLICY), no_strip)
+        BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/alt-java$(DEBUGINFO_EXT)
+      endif
+    endif
+  endif
 +endif
 +
 ifeq ($(OPENJDK_TARGET_OS), windows)
   $(eval $(call SetupLauncher,javaw, \
       -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \
-diff -r 25e94aa812b2 src/share/bin/alt_main.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ openjdk/jdk/src/share/bin/alt_main.h	Tue Jun 02 17:15:28 2020 +0100
+diff --git openjdk.orig/jdk/src/share/bin/alt_main.h openjdk/jdk/src/share/bin/alt_main.h
+new file mode 100644
+--- /dev/null
+++ openjdk/jdk/src/share/bin/alt_main.h
@@ -0,0 +1,73 @@
 +/*
 + * Copyright (c) 2019, Red Hat, Inc. All rights reserved.
@ -100,9 +113,9 @@ diff -r 25e94aa812b2 src/share/bin/alt_main.h
 +}
 +
 +#endif // REDHAT_ALT_JAVA
-diff -r 25e94aa812b2 src/share/bin/main.c
--- openjdk/jdk/src/share/bin/main.c	Wed Feb 05 12:20:36 2020 -0300
-+++ openjdk/jdk/src/share/bin/main.c	Tue Jun 02 17:15:28 2020 +0100
+diff --git openjdk.orig/jdk/src/share/bin/main.c openjdk/jdk/src/share/bin/main.c
+--- openjdk.orig/jdk/src/share/bin/main.c
+++ openjdk/jdk/src/share/bin/main.c
@@ -32,6 +32,14 @@
 
 #include "defines.h"
--- a/2
+++ b/2
@ -1,2 +1,2 @@
 SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u275-b01-4curve.tar.xz) = 600f79f2f2157ca818c34860611a69a5000c6d8387ea068b3b8a534650f0d9558034d1a6b431d110e62cee533abee1fc25e2e2802baba2950055ea6324faf772
+SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u282-b01-4curve.tar.xz) = b37ee8f0e12acb717e31a1e6944377ace10a42e2dd2dd77a8c9328c1e9501cf92b5cc50f1a80467092a540e6de96dd00639e0cb0fd223a228807095c5fbc64b9