1.1 --- a/make/solaris/makefiles/vm.make Fri Dec 07 10:55:16 2012 -0800
1.2 +++ b/make/solaris/makefiles/vm.make Fri Dec 14 10:06:52 2012 -0800
1.3 @@ -157,12 +157,9 @@
1.4
1.5 JVM = jvm
1.6 LIBJVM = lib$(JVM).so
1.7 -LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
1.8
1.9 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo
1.10 LIBJVM_DIZ = lib$(JVM).diz
1.11 -LIBJVM_G_DEBUGINFO = lib$(JVM)$(G_SUFFIX).debuginfo
1.12 -LIBJVM_G_DIZ = lib$(JVM)$(G_SUFFIX).diz
1.13
1.14 SPECIAL_PATHS:=adlc c1 dist gc_implementation opto shark libadt
1.15
1.16 @@ -291,8 +288,6 @@
1.17 $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM)
1.18 $(QUIETLY) $(LINK_LIB.CXX/POST_HOOK)
1.19 $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1
1.20 - $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G)
1.21 - $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1
1.22 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1.23 # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
1.24 # Clear the SHF_ALLOC flag (if set) from empty section headers.
1.25 @@ -313,11 +308,9 @@
1.26 # implied else here is no stripping at all
1.27 endif
1.28 endif
1.29 - $(QUIETLY) [ -f $(LIBJVM_G_DEBUGINFO) ] || ln -s $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
1.30 ifeq ($(ZIP_DEBUGINFO_FILES),1)
1.31 - $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
1.32 - $(RM) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
1.33 - [ -f $(LIBJVM_G_DIZ) ] || { ln -s $(LIBJVM_DIZ) $(LIBJVM_G_DIZ); }
1.34 + $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
1.35 + $(RM) $(LIBJVM_DEBUGINFO)
1.36 endif
1.37 endif
1.38 endif # filter -sbfast -xsbfast
