make/common/shared/Sanity.gmk

*** 1,7 ****
  #
! # Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 1029,1043 ****
--- 1029,1054 ----
              "      Please check your access to \n" \
              "          $(HOTSPOT_LIB_PATH)/jvm.lib \n" \
              "      and/or check your value of ALT_HOTSPOT_LIB_PATH. \n" \
              "" >> $(ERROR_FILE) ; \
          fi
+   ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
          @#
          @# Check for the .map files - its OK if they are not there..
          @#
      ifeq ($(ARCH_DATA_MODEL), 32)
          @# There is no 64-bit HotSpot client VM
+       ifeq ($(ZIP_DEBUGINFO_FILES),1)
+         @if [ ! -r $(HOTSPOT_CLIENT_PATH)/jvm.diz ]; then \
+           $(ECHO) "WARNING: HOTSPOT_CLIENT_PATH does not point to valid HotSpot .diz files. \n" \
+             "        These files are optional and aid in the debugging of the JVM. \n" \
+             "        Please check your access to \n" \
+             "          $(HOTSPOT_CLIENT_PATH)/jvm.diz \n" \
+             "        and/or check your value of ALT_HOTSPOT_CLIENT_PATH. \n" \
+             "" >> $(WARNING_FILE) ; \
+         fi
+       else
          @if [ ! -r $(HOTSPOT_CLIENT_PATH)/jvm.map ]; then \
            $(ECHO) "WARNING: HOTSPOT_CLIENT_PATH does not point to valid HotSpot .map files. \n" \
              "        These files are optional and aid in the debugging of the JVM. \n" \
              "        Please check your access to \n" \
              "          $(HOTSPOT_CLIENT_PATH)/jvm.map \n" \
*** 1051,1060 ****
--- 1062,1082 ----
              "          $(HOTSPOT_CLIENT_PATH)/jvm.pdb \n" \
              "        and/or check your value of ALT_HOTSPOT_CLIENT_PATH. \n" \
              "" >> $(WARNING_FILE) ; \
          fi
        endif
+     endif
+     ifeq ($(ZIP_DEBUGINFO_FILES),1)
+         @if [ ! -r $(HOTSPOT_SERVER_PATH)/jvm.diz ]; then \
+           $(ECHO) "WARNING: HOTSPOT_SERVER_PATH does not point to valid HotSpot .diz files. \n" \
+             "        These files are optional and aid in the debugging of the JVM. \n" \
+             "        Please check your access to \n" \
+             "          $(HOTSPOT_SERVER_PATH)/jvm.diz \n" \
+             "        and/or check your value of ALT_HOTSPOT_SERVER_PATH. \n" \
+             "" >> $(WARNING_FILE) ; \
+         fi
+     else
          @if [ ! -r $(HOTSPOT_SERVER_PATH)/jvm.map ]; then \
            $(ECHO) "WARNING: HOTSPOT_SERVER_PATH does not point to valid HotSpot .map files. \n" \
              "        These files are optional and aid in the debugging of the JVM. \n" \
              "        Please check your access to \n" \
              "          $(HOTSPOT_SERVER_PATH)/jvm.map \n" \
*** 1067,1076 ****
--- 1089,1100 ----
              "        Please check your access to \n" \
              "          $(HOTSPOT_SERVER_PATH)/jvm.pdb \n" \
              "        and/or check your value of ALT_HOTSPOT_SERVER_PATH. \n" \
              "" >> $(WARNING_FILE) ; \
          fi
+     endif
+   endif 
  endif   
  
  
  ######################################################
  # Check for existence of misc Hotspot imported files