make/aix/makefiles/defs.make

*** 129,141 ****
--- 129,143 ----
      ifneq ($(ALT_OBJCOPY),)
        $(eval $(call print_info, "ALT_OBJCOPY=$(ALT_OBJCOPY)"))
        OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
      endif
  
+     ifeq ($(COPY_DEBUG_SYMBOLS), true)
        ifeq ($(OBJCOPY),)
          $(eval $(call print_info, "no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY."))
          ENABLE_FULL_DEBUG_SYMBOLS=0
+         COPY_DEBUG_SYMBOLS=false
          $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)"))
        else
          $(eval $(call print_info, "$(OBJCOPY) cmd found so will create .debuginfo files."))
  
          # Library stripping policies for .debuginfo configs:
*** 154,163 ****
--- 156,166 ----
  
          ZIP_DEBUGINFO_FILES ?= 1
  
          $(eval $(call print_info, "ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)"))
        endif
+     endif # COPY_DEBUG_SYMBOLS=true
    endif # ENABLE_FULL_DEBUG_SYMBOLS=1
  endif # BUILD_FLAVOR
  
  # unused JDK_INCLUDE_SUBDIR=aix
  
*** 166,176 ****
  
  EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
  
  # client and server subdirectories have symbolic links to ../libjsig.so
  EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
! #ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
  #  ifeq ($(ZIP_DEBUGINFO_FILES),1)
  #    EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.diz
  #  else
  #    EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.debuginfo
  #  endif
--- 169,179 ----
  
  EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
  
  # client and server subdirectories have symbolic links to ../libjsig.so
  EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
! #ifeq ($(COPY_DEBUG_SYMBOLS),true)
  #  ifeq ($(ZIP_DEBUGINFO_FILES),1)
  #    EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.diz
  #  else
  #    EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.debuginfo
  #  endif
*** 180,190 ****
  EXPORT_MINIMAL_DIR = $(EXPORT_LIB_ARCH_DIR)/minimal
  
  ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK) $(JVM_VARIANT_CORE)), true)
    EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
    EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
! #  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
  #    ifeq ($(ZIP_DEBUGINFO_FILES),1)
  #      EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
  #    else
  #      EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
  #    endif
--- 183,193 ----
  EXPORT_MINIMAL_DIR = $(EXPORT_LIB_ARCH_DIR)/minimal
  
  ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK) $(JVM_VARIANT_CORE)), true)
    EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
    EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
! #  ifeq ($(COPY_DEBUG_SYMBOLS),true)
  #    ifeq ($(ZIP_DEBUGINFO_FILES),1)
  #      EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
  #    else
  #      EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
  #    endif
*** 192,202 ****
  endif
  
  ifeq ($(JVM_VARIANT_CLIENT),true)
    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
! #  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
  #    ifeq ($(ZIP_DEBUGINFO_FILES),1)
  #      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
  #    else
  #      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
  #    endif
--- 195,205 ----
  endif
  
  ifeq ($(JVM_VARIANT_CLIENT),true)
    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
! #  ifeq ($(COPY_DEBUG_SYMBOLS),true)
  #    ifeq ($(ZIP_DEBUGINFO_FILES),1)
  #      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
  #    else
  #      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
  #    endif