  instruct AddExtL_uxtb_and_shift(iRegLNoSp dst, iRegL src1, iRegL src2, immL_255 mask, immIExt lshift, rFlagsReg cr)
  %{
    match(Set dst (AddL src1 (LShiftL (AndL src2 mask) lshift)));
-@@ -12092,6 +12343,8 @@ instruct AddExtL_uxtb_and_shift(iRegLNoS
-   ins_pipe(ialu_reg_reg_shift);
- %}
- 
-+// This pattern is automatically generated from aarch64_ad.m4
-+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
- instruct AddExtL_uxth_and_shift(iRegLNoSp dst, iRegL src1, iRegL src2, immL_65535 mask, immIExt lshift, rFlagsReg cr)
- %{
-   match(Set dst (AddL src1 (LShiftL (AndL src2 mask) lshift)));
-@@ -12105,6 +12358,8 @@ instruct AddExtL_uxth_and_shift(iRegLNoS
-   ins_pipe(ialu_reg_reg_shift);
- %}
- 
-+// This pattern is automatically generated from aarch64_ad.m4
-+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
- instruct AddExtL_uxtw_and_shift(iRegLNoSp dst, iRegL src1, iRegL src2, immL_4294967295 mask, immIExt lshift, rFlagsReg cr)
- %{
-   match(Set dst (AddL src1 (LShiftL (AndL src2 mask) lshift)));
-@@ -12118,6 +12373,8 @@ instruct AddExtL_uxtw_and_shift(iRegLNoS
-   ins_pipe(ialu_reg_reg_shift);
- %}
- 
-+// This pattern is automatically generated from aarch64_ad.m4
-+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
- instruct SubExtL_uxtb_and_shift(iRegLNoSp dst, iRegL src1, iRegL src2, immL_255 mask, immIExt lshift, rFlagsReg cr)
- %{
-   match(Set dst (SubL src1 (LShiftL (AndL src2 mask) lshift)));
-@@ -12131,6 +12388,8 @@ instruct SubExtL_uxtb_and_shift(iRegLNoS
-   ins_pipe(ialu_reg_reg_shift);
- %}
- 
-+// This pattern is automatically generated from aarch64_ad.m4
-+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
- instruct SubExtL_uxth_and_shift(iRegLNoSp dst, iRegL src1, iRegL src2, immL_65535 mask, immIExt lshift, rFlagsReg cr)
- %{
-   match(Set dst (SubL src1 (LShiftL (AndL src2 mask) lshift)));
-@@ -12144,6 +12403,8 @@ instruct SubExtL_uxth_and_shift(iRegLNoS
-   ins_pipe(ialu_reg_reg_shift);
- %}
- 
-+// This pattern is automatically generated from aarch64_ad.m4
-+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
- instruct SubExtL_uxtw_and_shift(iRegLNoSp dst, iRegL src1, iRegL src2, immL_4294967295 mask, immIExt lshift, rFlagsReg cr)
- %{
-   match(Set dst (SubL src1 (LShiftL (AndL src2 mask) lshift)));
-@@ -12157,6 +12418,8 @@ instruct SubExtL_uxtw_and_shift(iRegLNoS
-   ins_pipe(ialu_reg_reg_shift);
- %}
- 
-+// This pattern is automatically generated from aarch64_ad.m4
-+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
- instruct AddExtI_uxtb_and_shift(iRegINoSp dst, iRegIorL2I src1, iRegIorL2I src2, immI_255 mask, immIExt lshift, rFlagsReg cr)
- %{
-   match(Set dst (AddI src1 (LShiftI (AndI src2 mask) lshift)));
-@@ -12170,6 +12433,8 @@ instruct AddExtI_uxtb_and_shift(iRegINoS
-   ins_pipe(ialu_reg_reg_shift);
- %}
- 
-+// This pattern is automatically generated from aarch64_ad.m4
-+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
- instruct AddExtI_uxth_and_shift(iRegINoSp dst, iRegIorL2I src1, iRegIorL2I src2, immI_65535 mask, immIExt lshift, rFlagsReg cr)
- %{
-   match(Set dst (AddI src1 (LShiftI (AndI src2 mask) lshift)));
-@@ -12183,6 +12448,8 @@ instruct AddExtI_uxth_and_shift(iRegINoS
-   ins_pipe(ialu_reg_reg_shift);
- %}
- 
-+// This pattern is automatically generated from aarch64_ad.m4
-+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
- instruct SubExtI_uxtb_and_shift(iRegINoSp dst, iRegIorL2I src1, iRegIorL2I src2, immI_255 mask, immIExt lshift, rFlagsReg cr)
- %{
-   match(Set dst (SubI src1 (LShiftI (AndI src2 mask) lshift)));
-@@ -12196,6 +12463,8 @@ instruct SubExtI_uxtb_and_shift(iRegINoS
-   ins_pipe(ialu_reg_reg_shift);
- %}
- 
-+// This pattern is automatically generated from aarch64_ad.m4
-+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
- instruct SubExtI_uxth_and_shift(iRegINoSp dst, iRegIorL2I src1, iRegIorL2I src2, immI_65535 mask, immIExt lshift, rFlagsReg cr)
- %{
-   match(Set dst (SubI src1 (LShiftI (AndI src2 mask) lshift)));
 @@ -12208,8 +12477,12 @@ instruct SubExtI_uxth_and_shift(iRegINoS
     %}
    ins_pipe(ialu_reg_reg_shift);

+private:
+
 #endif // OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP
diff -Npur jdk11u-jdk-11.0.9-ga/src/hotspot/os_cpu/linux_zero/vm_version_linux_zero.cpp jdk11u-jdk-11.0.9-ga-patched/src/hotspot/os_cpu/linux_zero/vm_version_linux_zero.cpp
--- jdk11u-jdk-11.0.9-ga/src/hotspot/os_cpu/linux_zero/vm_version_linux_zero.cpp	2020-09-11 18:12:45.000000000 +0200
+++ jdk11u-jdk-11.0.9-ga-patched/src/hotspot/os_cpu/linux_zero/vm_version_linux_zero.cpp	2021-01-16 15:56:28.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -25,6 +25,6 @@
 
 #include "precompiled.hpp"
 #include "runtime/os.hpp"
-#include "vm_version_zero.hpp"
+#include "runtime/vm_version.hpp"
 
 // This file is intentionally empty
diff -Npur jdk11u-jdk-11.0.9-ga/src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.hpp jdk11u-jdk-11.0.9-ga-patched/src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.hpp
--- jdk11u-jdk-11.0.9-ga/src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.hpp	2020-09-11 18:12:45.000000000 +0200
+++ jdk11u-jdk-11.0.9-ga-patched/src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.hpp	2021-01-16 15:56:28.000000000 +0100

+public:
+
 #endif // OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_HPP
diff -Npur jdk11u-jdk-11.0.9-ga/src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp jdk11u-jdk-11.0.9-ga-patched/src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp
--- jdk11u-jdk-11.0.9-ga/src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp	2020-09-11 18:12:45.000000000 +0200
+++ jdk11u-jdk-11.0.9-ga-patched/src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp	2021-01-16 15:56:28.000000000 +0100
