8258449: Move make/hotspot/symbols to make/data

Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2021-01-11 07:37:37 +00:00
parent 3974fd4f33
commit d21a0ea1ff
7 changed files with 6 additions and 6 deletions

View File

@ -31,20 +31,20 @@ $(eval $(call IncludeCustomExtension, hotspot/lib/JvmMapfile.gmk))
ifeq ($(call And, $(call isTargetOs, windows) $(call isTargetCpu, x86_64)), false) ifeq ($(call And, $(call isTargetOs, windows) $(call isTargetCpu, x86_64)), false)
# On Windows x86_64, we should not have any symbols at all, since that # On Windows x86_64, we should not have any symbols at all, since that
# results in duplicate warnings from the linker (JDK-8043491). # results in duplicate warnings from the linker (JDK-8043491).
SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-shared SYMBOLS_SRC += $(TOPDIR)/make/data/hotspot-symbols/symbols-shared
endif endif
ifeq ($(call isTargetOsType, unix), true) ifeq ($(call isTargetOsType, unix), true)
SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-unix SYMBOLS_SRC += $(TOPDIR)/make/data/hotspot-symbols/symbols-unix
endif endif
ifneq ($(wildcard $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)), ) ifneq ($(wildcard $(TOPDIR)/make/data/hotspot-symbols/symbols-$(OPENJDK_TARGET_OS)), )
SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS) SYMBOLS_SRC += $(TOPDIR)/make/data/hotspot-symbols/symbols-$(OPENJDK_TARGET_OS)
endif endif
ifneq ($(findstring debug, $(DEBUG_LEVEL)), ) ifneq ($(findstring debug, $(DEBUG_LEVEL)), )
ifneq ($(wildcard $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)-debug), ) ifneq ($(wildcard $(TOPDIR)/make/data/hotspot-symbols/symbols-$(OPENJDK_TARGET_OS)-debug), )
SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)-debug SYMBOLS_SRC += $(TOPDIR)/make/data/hotspot-symbols/symbols-$(OPENJDK_TARGET_OS)-debug
endif endif
endif endif