make/hotspot/lib/JvmMapfile.gmk

rev 59102 : imported patch build

*** 46,67 ****
    ifneq ($(wildcard $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)-debug), )
      SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)-debug
    endif
  endif
  
- ifeq ($(call isTargetOs, solaris), true)
-   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 += $(TOPDIR)/make/hotspot/symbols/symbols-solaris-dtrace-compiler2
-     else ifeq ($(call check-jvm-feature, compiler1), true)
-       SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-solaris-dtrace-compiler1
-     endif
-   endif
- endif
- 
  ################################################################################
  # Create a dynamic list of symbols from the built object files. This is highly
  # platform dependent.
  
  ifeq ($(call isTargetOs, linux), true)
--- 46,55 ----
*** 74,97 ****
    FILTER_SYMBOLS_AWK_SCRIPT := \
        '{ \
          if ($$3 ~ /$(FILTER_SYMBOLS_PATTERN)/) print $$3; \
        }'
  
- else ifeq ($(call isTargetOs, solaris), true)
-   DUMP_SYMBOLS_CMD := $(NM) -p *.o
-   ifneq ($(FILTER_SYMBOLS_PATTERN), )
-     FILTER_SYMBOLS_PATTERN := $(FILTER_SYMBOLS_PATTERN)|
-   endif
-   FILTER_SYMBOLS_PATTERN := $(FILTER_SYMBOLS_PATTERN)^__1c.*__vtbl_$$|^gHotSpotVM
-   FILTER_SYMBOLS_PATTERN := $(FILTER_SYMBOLS_PATTERN)|^UseSharedSpaces$$
-   FILTER_SYMBOLS_PATTERN := $(FILTER_SYMBOLS_PATTERN)|^__1cJArgumentsRSharedArchivePath_$$
-   FILTER_SYMBOLS_AWK_SCRIPT := \
-       '{ \
-         if ($$2 == "U") next; \
-         if ($$3 ~ /$(FILTER_SYMBOLS_PATTERN)/) print $$3; \
-       }'
- 
  else ifeq ($(call isTargetOs, macosx), true)
    # nm on macosx prints out "warning: nm: no name list" to stderr for
    # files without symbols. Hide this, even at the expense of hiding real errors.
    DUMP_SYMBOLS_CMD := $(NM) -Uj *.o 2> /dev/null
    ifneq ($(FILTER_SYMBOLS_PATTERN), )
--- 62,71 ----