Skip to content

Commit 79497ef

Browse files
Suchismith RoyVarada M
authored andcommitted
8348574: Simplify c1/c2_globals inclusions
Reviewed-by: mhaessig, kbarrett
1 parent 8416ca3 commit 79497ef

13 files changed

+6
-364
lines changed

src/hotspot/os/aix/c1_globals_aix.hpp

Lines changed: 0 additions & 37 deletions
This file was deleted.

src/hotspot/os/aix/c2_globals_aix.hpp

Lines changed: 0 additions & 37 deletions
This file was deleted.

src/hotspot/os/bsd/c1_globals_bsd.hpp

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/hotspot/os/bsd/c2_globals_bsd.hpp

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/hotspot/os/linux/c1_globals_linux.hpp

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/hotspot/os/linux/c2_globals_linux.hpp

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/hotspot/os/windows/c1_globals_windows.hpp

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/hotspot/os/windows/c2_globals_windows.hpp

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/hotspot/share/c1/c1_globals.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,9 @@
2525
#ifndef SHARE_C1_C1_GLOBALS_HPP
2626
#define SHARE_C1_C1_GLOBALS_HPP
2727

28-
#include "c1/c1_globals_pd.hpp"
2928
#include "runtime/globals_shared.hpp"
3029
#include "utilities/macros.hpp"
30+
#include CPU_HEADER(c1_globals)
3131
//
3232
// Declare all global flags used by the client compiler.
3333
//

src/hotspot/share/c1/c1_globals_pd.hpp

Lines changed: 0 additions & 34 deletions
This file was deleted.

src/hotspot/share/compiler/compiler_globals_pd.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -33,10 +33,10 @@
3333

3434
#include "runtime/globals_shared.hpp"
3535
#ifdef COMPILER1
36-
#include "c1/c1_globals_pd.hpp"
36+
#include "c1/c1_globals.hpp"
3737
#endif // COMPILER1
3838
#ifdef COMPILER2
39-
#include "opto/c2_globals_pd.hpp"
39+
#include "opto/c2_globals.hpp"
4040
#endif // COMPILER2
4141

4242
// JVMCI has no platform-specific global definitions

src/hotspot/share/opto/c2_globals.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
#ifndef SHARE_OPTO_C2_GLOBALS_HPP
2626
#define SHARE_OPTO_C2_GLOBALS_HPP
2727

28-
#include "opto/c2_globals_pd.hpp"
2928
#include "runtime/globals_shared.hpp"
3029
#include "utilities/macros.hpp"
30+
#include CPU_HEADER(c2_globals)
3131

3232
//
3333
// Defines all globals flags used by the server compiler.

0 commit comments

Comments
 (0)