From 1f42d9176112a032d79bd5cace0af0c2686aadd3 Mon Sep 17 00:00:00 2001 From: MBaesken Date: Wed, 13 Nov 2024 13:13:44 +0100 Subject: [PATCH] JDK-8343698 --- make/hotspot/lib/JvmFeatures.gmk | 4 ++-- make/hotspot/lib/JvmOverrideFiles.gmk | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/make/hotspot/lib/JvmFeatures.gmk b/make/hotspot/lib/JvmFeatures.gmk index b94031515f79e..20fe725eee16b 100644 --- a/make/hotspot/lib/JvmFeatures.gmk +++ b/make/hotspot/lib/JvmFeatures.gmk @@ -170,12 +170,12 @@ ifeq ($(call check-jvm-feature, link-time-opt), true) # later on if desired JVM_OPTIMIZATION := HIGHEST_JVM ifeq ($(call isCompiler, gcc), true) - JVM_CFLAGS_FEATURES += -flto=auto -fuse-linker-plugin -fno-strict-aliasing \ + JVM_CFLAGS_FEATURES += -DINCLUDE_LTO=1 -flto=auto -fuse-linker-plugin -fno-strict-aliasing \ -fno-fat-lto-objects JVM_LDFLAGS_FEATURES += $(CXX_O_FLAG_HIGHEST_JVM) -flto=auto \ -fuse-linker-plugin -fno-strict-aliasing else ifeq ($(call isCompiler, microsoft), true) - JVM_CFLAGS_FEATURES += -GL + JVM_CFLAGS_FEATURES += -DINCLUDE_LTO=1 -GL JVM_LDFLAGS_FEATURES += -LTCG:INCREMENTAL endif else diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk index 63169b4d6724b..6a513e10c61d4 100644 --- a/make/hotspot/lib/JvmOverrideFiles.gmk +++ b/make/hotspot/lib/JvmOverrideFiles.gmk @@ -37,6 +37,10 @@ ifeq ($(TOOLCHAIN_TYPE), gcc) # Need extra inlining to collapse shared marking code into the hot marking loop BUILD_LIBJVM_shenandoahMark.cpp_CXXFLAGS := --param inline-unit-growth=1000 endif + # disable lto in g1ParScanThreadState because of special inlining/flattening used there + ifeq ($(call check-jvm-feature, link-time-opt), true) + BUILD_LIBJVM_g1ParScanThreadState.cpp_CXXFLAGS := -fno-lto + endif endif LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NONE)