8230307: ZGC: Make zGlobals and zArguments OS agnostic

Backport-of: 277ef75
openjdk · Oct 22, 2021 · f400e59d91f8851368cc14d07132790dfd3d1c55 · f400e59 · openjdk-notifier · Oct 22, 2021
1 parent b94739b
commit f400e59d91f8851368cc14d07132790dfd3d1c55
Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/...aarch64/gc/z/zArguments_linux_aarch64.cpp → ...t/cpu/aarch64/gc/z/zArguments_aarch64.cpp b/...aarch64/gc/z/zArguments_linux_aarch64.cpp → ...t/cpu/aarch64/gc/z/zArguments_aarch64.cpp
diff --git a/...x_aarch64/gc/z/zGlobals_linux_aarch64.cpp → ...pot/cpu/aarch64/gc/z/zGlobals_aarch64.cpp b/...x_aarch64/gc/z/zGlobals_linux_aarch64.cpp → ...pot/cpu/aarch64/gc/z/zGlobals_aarch64.cpp
diff --git a/...cpu/linux_x86/gc/z/zGlobals_linux_x86.hpp → ...pot/cpu/aarch64/gc/z/zGlobals_aarch64.hpp b/...cpu/linux_x86/gc/z/zGlobals_linux_x86.hpp → ...pot/cpu/aarch64/gc/z/zGlobals_aarch64.hpp
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef OS_CPU_LINUX_X86_GC_Z_ZGLOBALS_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_GC_Z_ZGLOBALS_LINUX_X86_HPP
+#ifndef CPU_AARCH64_GC_Z_ZGLOBALS_AARCH64_HPP
+#define CPU_AARCH64_GC_Z_ZGLOBALS_AARCH64_HPP
 
 //
 // Page Allocation Tiers
@@ -48,4 +48,4 @@ uintptr_t    ZPlatformAddressBase();
 size_t       ZPlatformAddressOffsetBits();
 size_t       ZPlatformAddressMetadataShift();
 
-#endif // OS_CPU_LINUX_X86_GC_Z_ZGLOBALS_LINUX_X86_HPP
+#endif // CPU_AARCH64_GC_Z_ZGLOBALS_AARCH64_HPP
diff --git a/...u/linux_x86/gc/z/zArguments_linux_x86.cpp → src/hotspot/cpu/x86/gc/z/zArguments_x86.cpp b/...u/linux_x86/gc/z/zArguments_linux_x86.cpp → src/hotspot/cpu/x86/gc/z/zArguments_x86.cpp
diff --git a/...cpu/linux_x86/gc/z/zGlobals_linux_x86.cpp → src/hotspot/cpu/x86/gc/z/zGlobals_x86.cpp b/...cpu/linux_x86/gc/z/zGlobals_linux_x86.cpp → src/hotspot/cpu/x86/gc/z/zGlobals_x86.cpp
diff --git a/...x_aarch64/gc/z/zGlobals_linux_aarch64.hpp → src/hotspot/cpu/x86/gc/z/zGlobals_x86.hpp b/...x_aarch64/gc/z/zGlobals_linux_aarch64.hpp → src/hotspot/cpu/x86/gc/z/zGlobals_x86.hpp
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef OS_CPU_LINUX_AARCH64_GC_Z_ZGLOBALS_LINUX_AARCH64_HPP
-#define OS_CPU_LINUX_AARCH64_GC_Z_ZGLOBALS_LINUX_AARCH64_HPP
+#ifndef CPU_X86_GC_Z_ZGLOBALS_X86_HPP
+#define CPU_X86_GC_Z_ZGLOBALS_X86_HPP
 
 //
 // Page Allocation Tiers
@@ -48,4 +48,4 @@ uintptr_t    ZPlatformAddressBase();
 size_t       ZPlatformAddressOffsetBits();
 size_t       ZPlatformAddressMetadataShift();
 
-#endif // OS_CPU_LINUX_AARCH64_GC_Z_ZGLOBALS_LINUX_AARCH64_HPP
+#endif // CPU_X86_GC_Z_ZGLOBALS_X86_HPP
diff --git a/src/hotspot/share/gc/z/zGlobals.hpp b/src/hotspot/share/gc/z/zGlobals.hpp
@@ -26,7 +26,7 @@
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
-#include OS_CPU_HEADER(gc/z/zGlobals)
+#include CPU_HEADER(gc/z/zGlobals)
 
 // Collector name
 const char* const ZName                         = "The Z Garbage Collector";