Skip to content
This repository was archived by the owner on Feb 2, 2023. It is now read-only.

Commit f400e59

Browse files
Sergey NazarkinYuri Nesterenko
authored andcommitted
8230307: ZGC: Make zGlobals and zArguments OS agnostic
Backport-of: 277ef75
1 parent b94739b commit f400e59

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.hpp renamed to src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
* questions.
2222
*/
2323

24-
#ifndef OS_CPU_LINUX_X86_GC_Z_ZGLOBALS_LINUX_X86_HPP
25-
#define OS_CPU_LINUX_X86_GC_Z_ZGLOBALS_LINUX_X86_HPP
24+
#ifndef CPU_AARCH64_GC_Z_ZGLOBALS_AARCH64_HPP
25+
#define CPU_AARCH64_GC_Z_ZGLOBALS_AARCH64_HPP
2626

2727
//
2828
// Page Allocation Tiers
@@ -48,4 +48,4 @@ uintptr_t ZPlatformAddressBase();
4848
size_t ZPlatformAddressOffsetBits();
4949
size_t ZPlatformAddressMetadataShift();
5050

51-
#endif // OS_CPU_LINUX_X86_GC_Z_ZGLOBALS_LINUX_X86_HPP
51+
#endif // CPU_AARCH64_GC_Z_ZGLOBALS_AARCH64_HPP

src/hotspot/os_cpu/linux_aarch64/gc/z/zGlobals_linux_aarch64.hpp renamed to src/hotspot/cpu/x86/gc/z/zGlobals_x86.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
* questions.
2222
*/
2323

24-
#ifndef OS_CPU_LINUX_AARCH64_GC_Z_ZGLOBALS_LINUX_AARCH64_HPP
25-
#define OS_CPU_LINUX_AARCH64_GC_Z_ZGLOBALS_LINUX_AARCH64_HPP
24+
#ifndef CPU_X86_GC_Z_ZGLOBALS_X86_HPP
25+
#define CPU_X86_GC_Z_ZGLOBALS_X86_HPP
2626

2727
//
2828
// Page Allocation Tiers
@@ -48,4 +48,4 @@ uintptr_t ZPlatformAddressBase();
4848
size_t ZPlatformAddressOffsetBits();
4949
size_t ZPlatformAddressMetadataShift();
5050

51-
#endif // OS_CPU_LINUX_AARCH64_GC_Z_ZGLOBALS_LINUX_AARCH64_HPP
51+
#endif // CPU_X86_GC_Z_ZGLOBALS_X86_HPP

src/hotspot/share/gc/z/zGlobals.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#include "utilities/globalDefinitions.hpp"
2828
#include "utilities/macros.hpp"
29-
#include OS_CPU_HEADER(gc/z/zGlobals)
29+
#include CPU_HEADER(gc/z/zGlobals)
3030

3131
// Collector name
3232
const char* const ZName = "The Z Garbage Collector";

0 commit comments

Comments
 (0)