        -mstack-alignment=16 -fPIC
    LIBSA_EXTRA_SRC := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent
  else ifeq ($(OPENJDK_TARGET_OS), windows)
-diff -Npur jdk11u-jdk-11.0.9-ga/make/test/JtregNativeJdk.gmk jdk11u-jdk-11.0.9-ga-patched/make/test/JtregNativeJdk.gmk
---- jdk11u-jdk-11.0.9-ga/make/test/JtregNativeJdk.gmk	2020-09-11 18:12:45.000000000 +0200
-+++ jdk11u-jdk-11.0.9-ga-patched/make/test/JtregNativeJdk.gmk	2021-01-16 15:56:28.000000000 +0100
-@@ -77,8 +77,8 @@ endif
- 
- ifeq ($(OPENJDK_TARGET_OS), macosx)
-   BUILD_JDK_JTREG_LIBRARIES_CFLAGS_libTestMainKeyWindow := -ObjC
--  BUILD_JDK_JTREG_LIBRARIES_LIBS_libTestMainKeyWindow := -framework JavaVM \
--      -framework Cocoa -framework JavaNativeFoundation
-+  BUILD_JDK_JTREG_LIBRARIES_LIBS_libTestMainKeyWindow := -framework Cocoa \
-+      -framework JavaNativeFoundation
- else
-   BUILD_JDK_JTREG_EXCLUDE += libTestMainKeyWindow.c
- endif
 diff -Npur jdk11u-jdk-11.0.9-ga/src/hotspot/cpu/aarch64/aarch64.ad jdk11u-jdk-11.0.9-ga-patched/src/hotspot/cpu/aarch64/aarch64.ad
 --- jdk11u-jdk-11.0.9-ga/src/hotspot/cpu/aarch64/aarch64.ad	2020-09-11 18:12:45.000000000 +0200
 +++ jdk11u-jdk-11.0.9-ga-patched/src/hotspot/cpu/aarch64/aarch64.ad	2021-01-16 15:56:28.000000000 +0100

 		      --entitlements $$(call GetEntitlementsFile, $$@) $$@
                 endif
   endif
diff -Npur jdk11u-jdk-11.0.9-ga/make/hotspot/lib/CompileJvm.gmk jdk11u-jdk-11.0.9-ga-patched/make/hotspot/lib/CompileJvm.gmk
--- jdk11u-jdk-11.0.9-ga/make/hotspot/lib/CompileJvm.gmk	2020-09-11 18:12:45.000000000 +0200
+++ jdk11u-jdk-11.0.9-ga-patched/make/hotspot/lib/CompileJvm.gmk	2021-01-16 15:56:28.000000000 +0100
@@ -57,7 +57,7 @@ JVM_LIBS += \
 JVM_EXCLUDE_FILES += args.cc
 JVM_EXCLUDES += adlc
 
-# Needed by vm_version.cpp
+# Needed by abstract_vm_version.cpp
 ifeq ($(OPENJDK_TARGET_CPU), x86_64)
   OPENJDK_TARGET_CPU_VM_VERSION := amd64
 else ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
@@ -158,7 +158,7 @@ $(eval $(call SetupNativeCompilation, BU
     EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \
     EXTRA_OBJECT_FILES := $(DTRACE_EXTRA_OBJECT_FILES), \
     CFLAGS := $(JVM_CFLAGS), \
-    vm_version.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \
+    abstract_vm_version.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \
     arguments.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \
     DISABLED_WARNINGS_clang := tautological-compare, \
     DISABLED_WARNINGS_solstudio := $(DISABLED_WARNINGS_solstudio), \
@@ -179,11 +179,11 @@ $(eval $(call SetupNativeCompilation, BU
     PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \
 ))
 
-# Always recompile vm_version.cpp if libjvm needs to be relinked. This ensures
+# Always recompile abstract_vm_version.cpp if libjvm needs to be relinked. This ensures
 # that the internal vm version is updated as it relies on __DATE__ and __TIME__
 # macros.
-VM_VERSION_OBJ := $(JVM_OUTPUTDIR)/objs/vm_version$(OBJ_SUFFIX)
-$(VM_VERSION_OBJ): $(filter-out $(VM_VERSION_OBJ) $(JVM_MAPFILE), \
+ABSTRACT_VM_VERSION_OBJ := $(JVM_OUTPUTDIR)/objs/abstract_vm_version$(OBJ_SUFFIX)
+$(ABSTRACT_VM_VERSION_OBJ): $(filter-out $(ABSTRACT_VM_VERSION_OBJ) $(JVM_MAPFILE), \
     $(BUILD_LIBJVM_TARGET_DEPS))
 
 ifneq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
diff -Npur jdk11u-jdk-11.0.9-ga/make/lib/Lib-jdk.hotspot.agent.gmk jdk11u-jdk-11.0.9-ga-patched/make/lib/Lib-jdk.hotspot.agent.gmk
--- jdk11u-jdk-11.0.9-ga/make/lib/Lib-jdk.hotspot.agent.gmk	2020-09-11 18:12:45.000000000 +0200
+++ jdk11u-jdk-11.0.9-ga-patched/make/lib/Lib-jdk.hotspot.agent.gmk	2021-01-16 15:56:28.000000000 +0100

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