1.1 --- a/make/linux/makefiles/vm.make Mon Apr 23 11:03:30 2012 -0700
1.2 +++ b/make/linux/makefiles/vm.make Tue Apr 24 15:20:40 2012 -0700
1.3 @@ -61,7 +61,7 @@
1.4 INCLUDES += $(PRECOMPILED_HEADER_DIR:%=-I%) $(Src_Dirs_I:%=-I%)
1.5
1.6 # SYMFLAG is used by {jsig,saproc}.make
1.7 -ifneq ($(OBJCOPY),)
1.8 +ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1.9 # always build with debug info when we can create .debuginfo files
1.10 SYMFLAG = -g
1.11 else
1.12 @@ -139,7 +139,9 @@
1.13 LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
1.14
1.15 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo
1.16 +LIBJVM_DIZ = lib$(JVM).diz
1.17 LIBJVM_G_DEBUGINFO = lib$(JVM)$(G_SUFFIX).debuginfo
1.18 +LIBJVM_G_DIZ = lib$(JVM)$(G_SUFFIX).diz
1.19
1.20 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt
1.21
1.22 @@ -331,7 +333,7 @@
1.23 fi \
1.24 }
1.25 ifeq ($(CROSS_COMPILE_ARCH),)
1.26 - ifneq ($(OBJCOPY),)
1.27 + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1.28 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
1.29 $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
1.30 ifeq ($(STRIP_POLICY),all_strip)
1.31 @@ -343,17 +345,25 @@
1.32 endif
1.33 endif
1.34 $(QUIETLY) [ -f $(LIBJVM_G_DEBUGINFO) ] || ln -s $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
1.35 + ifeq ($(ZIP_DEBUGINFO_FILES),1)
1.36 + $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
1.37 + $(RM) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
1.38 + [ -f $(LIBJVM_G_DIZ) ] || { ln -s $(LIBJVM_DIZ) $(LIBJVM_G_DIZ); }
1.39 + endif
1.40 endif
1.41 endif
1.42
1.43 DEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR)
1.44 DEST_JVM = $(DEST_SUBDIR)/$(LIBJVM)
1.45 DEST_JVM_DEBUGINFO = $(DEST_SUBDIR)/$(LIBJVM_DEBUGINFO)
1.46 +DEST_JVM_DIZ = $(DEST_SUBDIR)/$(LIBJVM_DIZ)
1.47
1.48 install_jvm: $(LIBJVM)
1.49 @echo "Copying $(LIBJVM) to $(DEST_JVM)"
1.50 $(QUIETLY) test -f $(LIBJVM_DEBUGINFO) && \
1.51 cp -f $(LIBJVM_DEBUGINFO) $(DEST_JVM_DEBUGINFO)
1.52 + $(QUIETLY) test -f $(LIBJVM_DIZ) && \
1.53 + cp -f $(LIBJVM_DIZ) $(DEST_JVM_DIZ)
1.54 $(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done"
1.55
1.56 #----------------------------------------------------------------------
