make/linux/makefiles/vm.make

*** 136,151 ****
  #----------------------------------------------------------------------
  # JVM
  
  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 \! \
--- 136,148 ----
*** 321,331 ****
              $(LINK_LIB.CXX/PRE_HOOK)                                     \
              $(LINK_VM) $(LD_SCRIPT_FLAG)                                \
                         $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM);       \
              $(LINK_LIB.CXX/POST_HOOK)                                    \
              rm -f $@.1; ln -s $@ $@.1;                                  \
-             [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \
              if [ \"$(CROSS_COMPILE_ARCH)\" = \"\" ] ; then                    \
                if [ -x /usr/sbin/selinuxenabled ] ; then                 \
                  /usr/sbin/selinuxenabled;                               \
                  if [ $$? = 0 ] ; then                                   \
                    /usr/bin/chcon -t textrel_shlib_t $@;                 \
--- 318,327 ----
*** 346,360 ****
      ifeq ($(STRIP_POLICY),min_strip)
          $(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
  
  DEST_SUBDIR        = $(JDK_LIBDIR)/$(VM_SUBDIR)
  DEST_JVM           = $(DEST_SUBDIR)/$(LIBJVM)
--- 342,354 ----
      ifeq ($(STRIP_POLICY),min_strip)
          $(QUIETLY) $(STRIP) -g $@
      # implied else here is no stripping at all
      endif
    endif
    ifeq ($(ZIP_DEBUGINFO_FILES),1)
!         $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
!         $(RM) $(LIBJVM_DEBUGINFO)
    endif
  endif
  
  DEST_SUBDIR        = $(JDK_LIBDIR)/$(VM_SUBDIR)
  DEST_JVM           = $(DEST_SUBDIR)/$(LIBJVM)