Skip to content

Commit beae884

Browse files
committed
8349150: Support precompiled headers on AIX
Reviewed-by: jkern, erikj
1 parent c545a3e commit beae884

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

make/hotspot/lib/CompileJvm.gmk

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2013, 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
@@ -125,9 +125,7 @@ else ifeq ($(call And, $(call isTargetOs, linux) $(call isTargetCpu, aarch64)),
125125
endif
126126
endif
127127

128-
ifeq ($(call isTargetOs, linux macosx windows), true)
129-
JVM_PRECOMPILED_HEADER := $(TOPDIR)/src/hotspot/share/precompiled/precompiled.hpp
130-
endif
128+
JVM_PRECOMPILED_HEADER := $(TOPDIR)/src/hotspot/share/precompiled/precompiled.hpp
131129

132130
ifeq ($(call isTargetCpu, x86), true)
133131
JVM_EXCLUDE_PATTERNS += x86_64

make/hotspot/lib/JvmOverrideFiles.gmk

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,7 @@ else ifeq ($(call isTargetOs, macosx), true)
118118
endif
119119

120120
else ifeq ($(call isTargetOs, aix), true)
121-
ifeq ($(TOOLCHAIN_TYPE), clang)
122-
BUILD_LIBJVM_synchronizer.cpp_CXXFLAGS := -fno-inline
123-
else
124-
BUILD_LIBJVM_synchronizer.cpp_CXXFLAGS := -qnoinline
125-
endif
121+
BUILD_LIBJVM_synchronizer.cpp_CXXFLAGS := -fno-inline
126122
BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := $(CXX_O_FLAG_NONE)
127123
# Disable aggressive optimizations for functions in sharedRuntimeTrig.cpp
128124
# and sharedRuntimeTrans.cpp on ppc64.
@@ -146,6 +142,13 @@ else ifeq ($(call isTargetOs, aix), true)
146142
# Disable ELF decoder on AIX (AIX uses XCOFF).
147143
JVM_EXCLUDE_PATTERNS += elf
148144

145+
JVM_PRECOMPILED_HEADER_EXCLUDE := \
146+
sharedRuntimeTrig.cpp \
147+
sharedRuntimeTrans.cpp \
148+
synchronizer.cpp \
149+
$(OPT_SPEED_SRC) \
150+
#
151+
149152
else ifeq ($(call isTargetOs, windows), true)
150153
JVM_PRECOMPILED_HEADER_EXCLUDE := \
151154
bytecodeInterpreter.cpp \

0 commit comments

Comments
 (0)