Skip to content

Commit 3eb57f6

Browse files
committed
8349140: Size optimization (opt-size) build fails after recent PCH changes
Reviewed-by: jwaters, erikj, ihse
1 parent 3cf04de commit 3eb57f6

File tree

1 file changed

+6
-17
lines changed

1 file changed

+6
-17
lines changed

make/hotspot/lib/JvmOverrideFiles.gmk

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,11 @@ ifeq ($(call isTargetOs, linux), true)
5555
BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
5656
BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
5757

58-
ifeq ($(TOOLCHAIN_TYPE), clang)
59-
JVM_PRECOMPILED_HEADER_EXCLUDE := \
60-
sharedRuntimeTrig.cpp \
61-
sharedRuntimeTrans.cpp \
62-
$(OPT_SPEED_SRC) \
63-
#
64-
endif
65-
66-
ifeq ($(call isTargetCpu, ppc64le)+$(TOOLCHAIN_TYPE), true+gcc)
67-
JVM_PRECOMPILED_HEADER_EXCLUDE := \
68-
sharedRuntimeTrig.cpp \
69-
sharedRuntimeTrans.cpp \
70-
$(OPT_SPEED_SRC) \
71-
#
72-
endif
58+
JVM_PRECOMPILED_HEADER_EXCLUDE := \
59+
sharedRuntimeTrig.cpp \
60+
sharedRuntimeTrans.cpp \
61+
$(OPT_SPEED_SRC) \
62+
#
7363

7464
ifeq ($(call isTargetCpu, x86), true)
7565
# Performance measurements show that by compiling GC related code, we could
@@ -151,13 +141,12 @@ else ifeq ($(call isTargetOs, aix), true)
151141

152142
else ifeq ($(call isTargetOs, windows), true)
153143
JVM_PRECOMPILED_HEADER_EXCLUDE := \
154-
bytecodeInterpreter.cpp \
155-
bytecodeInterpreterWithChecks.cpp \
156144
opcodes.cpp \
157145
os_windows.cpp \
158146
os_windows_x86.cpp \
159147
osThread_windows.cpp \
160148
jvmciCompilerToVMInit.cpp \
149+
$(OPT_SPEED_SRC) \
161150
#
162151

163152
# Workaround for jvmciCompilerToVM.cpp long compilation time

0 commit comments

Comments
 (0)