Skip to content

Commit 6f09a67

Browse files
author
duke
committed
Backport beae8843b9b2433af5e9fbe420b17e663cbdb960
1 parent 352a7a9 commit 6f09a67

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
@@ -110,11 +110,7 @@ else ifeq ($(call isTargetOs, macosx), true)
110110
endif
111111

112112
else ifeq ($(call isTargetOs, aix), true)
113-
ifeq ($(TOOLCHAIN_TYPE), clang)
114-
BUILD_LIBJVM_synchronizer.cpp_CXXFLAGS := -fno-inline
115-
else
116-
BUILD_LIBJVM_synchronizer.cpp_CXXFLAGS := -qnoinline
117-
endif
113+
BUILD_LIBJVM_synchronizer.cpp_CXXFLAGS := -fno-inline
118114
BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := $(CXX_O_FLAG_NONE)
119115
# Disable aggressive optimizations for functions in sharedRuntimeTrig.cpp
120116
# and sharedRuntimeTrans.cpp on ppc64.
@@ -138,6 +134,13 @@ else ifeq ($(call isTargetOs, aix), true)
138134
# Disable ELF decoder on AIX (AIX uses XCOFF).
139135
JVM_EXCLUDE_PATTERNS += elf
140136

137+
JVM_PRECOMPILED_HEADER_EXCLUDE := \
138+
sharedRuntimeTrig.cpp \
139+
sharedRuntimeTrans.cpp \
140+
synchronizer.cpp \
141+
$(OPT_SPEED_SRC) \
142+
#
143+
141144
else ifeq ($(call isTargetOs, windows), true)
142145
JVM_PRECOMPILED_HEADER_EXCLUDE := \
143146
bytecodeInterpreter.cpp \

0 commit comments

Comments
 (0)