21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
22 # or visit www.oracle.com if you need additional information or have any |
22 # or visit www.oracle.com if you need additional information or have any |
23 # questions. |
23 # questions. |
24 # |
24 # |
25 |
25 |
26 $(eval $(call IncludeCustomExtension, hotspot, lib/JvmMapfile.gmk)) |
26 $(eval $(call IncludeCustomExtension, , hotspot/lib/JvmMapfile.gmk)) |
27 |
27 |
28 ################################################################################ |
28 ################################################################################ |
29 # Combine a list of static symbols |
29 # Combine a list of static symbols |
30 |
30 |
31 ifneq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), windows-x86_64) |
31 ifneq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), windows-x86_64) |
32 # On Windows x86_64, we should not have any symbols at all, since that |
32 # On Windows x86_64, we should not have any symbols at all, since that |
33 # results in duplicate warnings from the linker (JDK-8043491). |
33 # results in duplicate warnings from the linker (JDK-8043491). |
34 SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-shared |
34 SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-shared |
35 endif |
35 endif |
36 |
36 |
37 ifeq ($(OPENJDK_TARGET_OS_TYPE), unix) |
37 ifeq ($(OPENJDK_TARGET_OS_TYPE), unix) |
38 SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-unix |
38 SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-unix |
39 endif |
39 endif |
40 |
40 |
41 ifneq ($(wildcard $(HOTSPOT_TOPDIR)/make/symbols/symbols-$(OPENJDK_TARGET_OS)), ) |
41 ifneq ($(wildcard $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)), ) |
42 SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-$(OPENJDK_TARGET_OS) |
42 SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS) |
43 endif |
43 endif |
44 |
44 |
45 ifneq ($(findstring debug, $(DEBUG_LEVEL)), ) |
45 ifneq ($(findstring debug, $(DEBUG_LEVEL)), ) |
46 ifneq ($(wildcard $(HOTSPOT_TOPDIR)/make/symbols/symbols-$(OPENJDK_TARGET_OS)-debug), ) |
46 ifneq ($(wildcard $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)-debug), ) |
47 SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-$(OPENJDK_TARGET_OS)-debug |
47 SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)-debug |
48 endif |
48 endif |
49 endif |
49 endif |
50 |
50 |
51 ifeq ($(OPENJDK_TARGET_OS), solaris) |
51 ifeq ($(OPENJDK_TARGET_OS), solaris) |
52 ifeq ($(call check-jvm-feature, dtrace), true) |
52 ifeq ($(call check-jvm-feature, dtrace), true) |
53 # Additional mapfiles that are only used when dtrace is enabled |
53 # Additional mapfiles that are only used when dtrace is enabled |
54 ifeq ($(call check-jvm-feature, compiler2), true) |
54 ifeq ($(call check-jvm-feature, compiler2), true) |
55 # This also covers the case of compiler1+compiler2. |
55 # This also covers the case of compiler1+compiler2. |
56 SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-solaris-dtrace-compiler2 |
56 SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-solaris-dtrace-compiler2 |
57 else ifeq ($(call check-jvm-feature, compiler1), true) |
57 else ifeq ($(call check-jvm-feature, compiler1), true) |
58 SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-solaris-dtrace-compiler1 |
58 SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-solaris-dtrace-compiler1 |
59 endif |
59 endif |
60 endif |
60 endif |
61 endif |
61 endif |
62 |
62 |
63 ################################################################################ |
63 ################################################################################ |