make/linux/makefiles/vm.make

*** 1,7 ****
  #
! # Copyright (c) 1999, 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.
--- 1,7 ----
  #
! # Copyright (c) 1999, 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.
*** 59,69 ****
  Src_Dirs_I += $(GENERATED)
  # The order is important for the precompiled headers to work.
  INCLUDES += $(PRECOMPILED_HEADER_DIR:%=-I%) $(Src_Dirs_I:%=-I%)
  
  # SYMFLAG is used by {jsig,saproc}.make
! ifneq ($(OBJCOPY),)
    # always build with debug info when we can create .debuginfo files
    SYMFLAG = -g
  else
    ifeq (${VERSION}, debug)
      SYMFLAG = -g
--- 59,69 ----
  Src_Dirs_I += $(GENERATED)
  # The order is important for the precompiled headers to work.
  INCLUDES += $(PRECOMPILED_HEADER_DIR:%=-I%) $(Src_Dirs_I:%=-I%)
  
  # SYMFLAG is used by {jsig,saproc}.make
! ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
    # always build with debug info when we can create .debuginfo files
    SYMFLAG = -g
  else
    ifeq (${VERSION}, debug)
      SYMFLAG = -g
*** 137,147 ****
--- 137,149 ----
  JVM      = jvm
  LIBJVM   = lib$(JVM).so
  LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
  
  LIBJVM_DEBUGINFO   = lib$(JVM).debuginfo
+ LIBJVM_DIZ         = lib$(JVM).diz
  LIBJVM_G_DEBUGINFO = lib$(JVM)$(G_SUFFIX).debuginfo
+ LIBJVM_G_DIZ       = lib$(JVM)$(G_SUFFIX).diz
  
  SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt
  
  SOURCE_PATHS=\
    $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \
*** 329,339 ****
                  fi                                                      \
                fi                                                        \
              fi                                                          \
          }
  ifeq ($(CROSS_COMPILE_ARCH),)
!   ifneq ($(OBJCOPY),)
          $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
          $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
      ifeq ($(STRIP_POLICY),all_strip)
          $(QUIETLY) $(STRIP) $@
      else
--- 331,341 ----
                  fi                                                      \
                fi                                                        \
              fi                                                          \
          }
  ifeq ($(CROSS_COMPILE_ARCH),)
!   ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
          $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
          $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
      ifeq ($(STRIP_POLICY),all_strip)
          $(QUIETLY) $(STRIP) $@
      else
*** 341,361 ****
--- 343,371 ----
          $(QUIETLY) $(STRIP) -g $@
        # implied else here is no stripping at all
        endif
      endif
          $(QUIETLY) [ -f $(LIBJVM_G_DEBUGINFO) ] || ln -s $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
+     ifeq ($(ZIP_DEBUGINFO_FILES),1)
+         $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
+         $(RM) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
+         [ -f $(LIBJVM_G_DIZ) ] || { ln -s $(LIBJVM_DIZ) $(LIBJVM_G_DIZ); }
      endif
+   endif
  endif
  
  DEST_SUBDIR        = $(JDK_LIBDIR)/$(VM_SUBDIR)
  DEST_JVM           = $(DEST_SUBDIR)/$(LIBJVM)
  DEST_JVM_DEBUGINFO = $(DEST_SUBDIR)/$(LIBJVM_DEBUGINFO)
+ DEST_JVM_DIZ       = $(DEST_SUBDIR)/$(LIBJVM_DIZ)
  
  install_jvm: $(LIBJVM)
          @echo "Copying $(LIBJVM) to $(DEST_JVM)"
          $(QUIETLY) test -f $(LIBJVM_DEBUGINFO) && \
              cp -f $(LIBJVM_DEBUGINFO) $(DEST_JVM_DEBUGINFO)
+         $(QUIETLY) test -f $(LIBJVM_DIZ) && \
+             cp -f $(LIBJVM_DIZ) $(DEST_JVM_DIZ)
          $(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done"
  
  #----------------------------------------------------------------------
  # Other files