make/linux/makefiles/jsig.make

*** 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.
--- 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.
*** 30,45 ****
--- 30,48 ----
  
  JSIG_G    = $(JSIG)$(G_SUFFIX)
  LIBJSIG_G = lib$(JSIG_G).so
  
  LIBJSIG_DEBUGINFO   = lib$(JSIG).debuginfo
+ LIBJSIG_DIZ         = lib$(JSIG).diz
  LIBJSIG_G_DEBUGINFO = lib$(JSIG_G).debuginfo
+ LIBJSIG_G_DIZ       = lib$(JSIG_G).diz
  
  JSIGSRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/vm
  
  DEST_JSIG           = $(JDK_LIBDIR)/$(LIBJSIG)
  DEST_JSIG_DEBUGINFO = $(JDK_LIBDIR)/$(LIBJSIG_DEBUGINFO)
+ DEST_JSIG_DIZ       = $(JDK_LIBDIR)/$(LIBJSIG_DIZ)
  
  LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
  
  # On Linux we really dont want a mapfile, as this library is small 
  # and preloaded using LD_PRELOAD, making functions private will 
*** 56,66 ****
  $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
          @echo Making signal interposition lib...
          $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
                           $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl
          $(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
! ifneq ($(OBJCOPY),)
          $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
          $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
    ifeq ($(STRIP_POLICY),all_strip)
          $(QUIETLY) $(STRIP) $@
    else
--- 59,69 ----
  $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
          @echo Making signal interposition lib...
          $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
                           $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl
          $(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
! ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
          $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
          $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
    ifeq ($(STRIP_POLICY),all_strip)
          $(QUIETLY) $(STRIP) $@
    else
*** 68,81 ****
--- 71,91 ----
          $(QUIETLY) $(STRIP) -g $@
      # implied else here is no stripping at all
      endif
    endif
          [ -f $(LIBJSIG_G_DEBUGINFO) ] || { ln -s $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO); }
+   ifeq ($(ZIP_DEBUGINFO_FILES),1)
+         $(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO)
+         $(RM) $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO)
+         [ -f $(LIBJSIG_G_DIZ) ] || { ln -s $(LIBJSIG_DIZ) $(LIBJSIG_G_DIZ); }
+   endif
  endif
  
  install_jsig: $(LIBJSIG)
          @echo "Copying $(LIBJSIG) to $(DEST_JSIG)"
          $(QUIETLY) test -f $(LIBJSIG_DEBUGINFO) && \
              cp -f $(LIBJSIG_DEBUGINFO) $(DEST_JSIG_DEBUGINFO)
+         $(QUIETLY) test -f $(LIBJSIG_DIZ) && \
+             cp -f $(LIBJSIG_DIZ) $(DEST_JSIG_DIZ)
          $(QUIETLY) cp -f $(LIBJSIG) $(DEST_JSIG) && echo "Done"
  
  .PHONY: install_jsig