hotspot/make/lib/JvmMapfile.gmk

*** 29,63 ****
  # Combine a list of static symbols
  
  ifneq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), windows-x86_64)
    # On Windows x86_64, we should not have any symbols at all, since that
    # results in duplicate warnings from the linker (JDK-8043491).
!   SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/makefiles/symbols/symbols-shared
  endif
  
  ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
!   SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/makefiles/symbols/symbols-unix
  endif
  
! ifneq ($(wildcard $(HOTSPOT_TOPDIR)/makefiles/symbols/symbols-$(OPENJDK_TARGET_OS)), )
!   SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/makefiles/symbols/symbols-$(OPENJDK_TARGET_OS)
  endif
  
  ifneq ($(findstring debug, $(DEBUG_LEVEL)), )
!   ifneq ($(wildcard $(HOTSPOT_TOPDIR)/makefiles/symbols/symbols-$(OPENJDK_TARGET_OS)-debug), )
!     SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/makefiles/symbols/symbols-$(OPENJDK_TARGET_OS)-debug
    endif
  endif
  
  ifeq ($(OPENJDK_TARGET_OS), solaris)
    ifeq ($(call check-jvm-feature, dtrace), true)
      # Additional mapfiles that are only used when dtrace is enabled
      ifeq ($(call check-jvm-feature, compiler2), true)
        # This also covers the case of compiler1+compiler2.
!       SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/makefiles/symbols/symbols-solaris-dtrace-compiler2
      else ifeq ($(call check-jvm-feature, compiler1), true)
!       SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/makefiles/symbols/symbols-solaris-dtrace-compiler1
      endif
    endif
  endif
  
  ################################################################################
--- 29,63 ----
  # Combine a list of static symbols
  
  ifneq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), windows-x86_64)
    # On Windows x86_64, we should not have any symbols at all, since that
    # results in duplicate warnings from the linker (JDK-8043491).
!   SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-shared
  endif
  
  ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
!   SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-unix
  endif
  
! ifneq ($(wildcard $(HOTSPOT_TOPDIR)/make/symbols/symbols-$(OPENJDK_TARGET_OS)), )
!   SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-$(OPENJDK_TARGET_OS)
  endif
  
  ifneq ($(findstring debug, $(DEBUG_LEVEL)), )
!   ifneq ($(wildcard $(HOTSPOT_TOPDIR)/make/symbols/symbols-$(OPENJDK_TARGET_OS)-debug), )
!     SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-$(OPENJDK_TARGET_OS)-debug
    endif
  endif
  
  ifeq ($(OPENJDK_TARGET_OS), solaris)
    ifeq ($(call check-jvm-feature, dtrace), true)
      # Additional mapfiles that are only used when dtrace is enabled
      ifeq ($(call check-jvm-feature, compiler2), true)
        # This also covers the case of compiler1+compiler2.
!       SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-solaris-dtrace-compiler2
      else ifeq ($(call check-jvm-feature, compiler1), true)
!       SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-solaris-dtrace-compiler1
      endif
    endif
  endif
  
  ################################################################################