stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8330820: Remove remnants of operator_new.cpp in build system

Browse Source 
Reviewed-by: tbell
This commit is contained in:
Magnus Ihse Bursie 2024-04-22 13:32:02 +00:00
parent 936a47d7d6
commit 3e65d90b4d
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
make/hotspot/lib/CompileGtest.gmk
View File

@ -89,8 +89,7 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBJVM, \
EXCLUDES := $(JVM_EXCLUDES), \ EXCLUDES := $(JVM_EXCLUDES), \
EXCLUDE_FILES := gtestLauncher.cpp, \ EXCLUDE_FILES := gtestLauncher.cpp, \
EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \ EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \
EXTRA_OBJECT_FILES := $(filter-out %/operator_new$(OBJ_SUFFIX), \ EXTRA_OBJECT_FILES := $(BUILD_LIBJVM_ALL_OBJS), \
$(BUILD_LIBJVM_ALL_OBJS)), \
DEFAULT_CFLAGS := false, \ DEFAULT_CFLAGS := false, \
CFLAGS := $(JVM_CFLAGS) \ CFLAGS := $(JVM_CFLAGS) \
-I$(GTEST_FRAMEWORK_SRC)/googletest/include \ -I$(GTEST_FRAMEWORK_SRC)/googletest/include \

8
make/hotspot/lib/CompileJvm.gmk
View File

@ -137,13 +137,6 @@ JVM_STRIPFLAGS ?= $(STRIPFLAGS)
# This source set is reused so save in cache. # This source set is reused so save in cache.
$(call FillFindCache, $(JVM_SRC_DIRS)) $(call FillFindCache, $(JVM_SRC_DIRS))
# The global operator new functions defined in operator_new.cpp are intended
# to detect and prevent the VM code from calling them. See more details in
# operator_new.cpp. Exclude operator_new.o when statically linking the VM
# code with JDK natives, as the JDK natives might need to call the global
# operator new.
LIBJVM_STATIC_EXCLUDE_OBJS := operator_new.o
ifeq ($(call isTargetOs, windows), true) ifeq ($(call isTargetOs, windows), true)
ifeq ($(STATIC_LIBS), true) ifeq ($(STATIC_LIBS), true)
WIN_EXPORT_FILE := $(JVM_OUTPUTDIR)/static-win-exports.def WIN_EXPORT_FILE := $(JVM_OUTPUTDIR)/static-win-exports.def
@ -217,7 +210,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
RC_FILEDESC := $(HOTSPOT_VM_DISTRO) $(OPENJDK_TARGET_CPU_BITS)-Bit $(JVM_VARIANT) VM, \ RC_FILEDESC := $(HOTSPOT_VM_DISTRO) $(OPENJDK_TARGET_CPU_BITS)-Bit $(JVM_VARIANT) VM, \
PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \ PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \
PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \ PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \
STATIC_LIB_EXCLUDE_OBJS := $(LIBJVM_STATIC_EXCLUDE_OBJS), \
)) ))
ifeq ($(call isTargetOs, windows), true) ifeq ($(call isTargetOs, windows), true)