From 7ff47851adf9fe602acd31eb09fb09509efbfa48 Mon Sep 17 00:00:00 2001 From: Saint Wesonga Date: Sun, 3 Aug 2025 22:27:37 -0600 Subject: [PATCH] Disable structured exception handling in gtests on Windows --- make/hotspot/lib/CompileGtest.gmk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/make/hotspot/lib/CompileGtest.gmk b/make/hotspot/lib/CompileGtest.gmk index d2cdc7685c922..ba87fe7586baa 100644 --- a/make/hotspot/lib/CompileGtest.gmk +++ b/make/hotspot/lib/CompileGtest.gmk @@ -68,7 +68,7 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBGTEST, \ -I$(GTEST_FRAMEWORK_SRC)/googletest/include \ -I$(GTEST_FRAMEWORK_SRC)/googlemock \ -I$(GTEST_FRAMEWORK_SRC)/googlemock/include, \ - CFLAGS_windows := -EHsc, \ + CFLAGS_windows := -EHsc -DGTEST_HAS_SEH=0, \ CFLAGS_macosx := -DGTEST_OS_MAC=1, \ OPTIMIZATION := $(JVM_OPTIMIZATION), \ COPY_DEBUG_SYMBOLS := $(GTEST_COPY_DEBUG_SYMBOLS), \ @@ -98,7 +98,7 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBJVM, \ -I$(GTEST_FRAMEWORK_SRC)/googletest/include \ -I$(GTEST_FRAMEWORK_SRC)/googlemock/include \ $(addprefix -I, $(GTEST_TEST_SRC)), \ - CFLAGS_windows := -EHsc, \ + CFLAGS_windows := -EHsc -DGTEST_HAS_SEH=0, \ CFLAGS_macosx := -DGTEST_OS_MAC=1, \ DISABLED_WARNINGS_gcc := $(DISABLED_WARNINGS_gcc) \ undef stringop-overflow, \ @@ -152,6 +152,7 @@ $(eval $(call SetupJdkExecutable, BUILD_GTEST_LAUNCHER, \ -I$(GTEST_FRAMEWORK_SRC)/googletest/include \ -I$(GTEST_FRAMEWORK_SRC)/googlemock \ -I$(GTEST_FRAMEWORK_SRC)/googlemock/include, \ + CFLAGS_windows := -DGTEST_HAS_SEH=0, \ LD_SET_ORIGIN := false, \ LDFLAGS_unix := $(call SET_SHARED_LIBRARY_ORIGIN), \ JDK_LIBS := gtest:libjvm, \