Skip to content
Permalink
Browse files
8230307: ZGC: Make zGlobals and zArguments OS agnostic
Backport-of: 277ef75
  • Loading branch information
Sergey Nazarkin authored and Yuri Nesterenko committed Oct 22, 2021
1 parent b94739b commit f400e59d91f8851368cc14d07132790dfd3d1c55
Showing 7 changed files with 7 additions and 7 deletions.
@@ -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
File renamed without changes.
File renamed without changes.
@@ -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
@@ -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";

1 comment on commit f400e59

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on f400e59 Oct 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.