1.1 --- a/make/linux/makefiles/vm.make Mon Feb 20 22:32:30 2012 -0800
1.2 +++ b/make/linux/makefiles/vm.make Fri Mar 23 11:50:33 2012 -0700
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -61,7 +61,7 @@
1.11 INCLUDES += $(PRECOMPILED_HEADER_DIR:%=-I%) $(Src_Dirs_I:%=-I%)
1.12
1.13 # SYMFLAG is used by {jsig,saproc}.make
1.14 -ifneq ($(OBJCOPY),)
1.15 +ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1.16 # always build with debug info when we can create .debuginfo files
1.17 SYMFLAG = -g
1.18 else
1.19 @@ -139,7 +139,9 @@
1.20 LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
1.21
1.22 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo
1.23 +LIBJVM_DIZ = lib$(JVM).diz
1.24 LIBJVM_G_DEBUGINFO = lib$(JVM)$(G_SUFFIX).debuginfo
1.25 +LIBJVM_G_DIZ = lib$(JVM)$(G_SUFFIX).diz
1.26
1.27 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt
1.28
1.29 @@ -331,7 +333,7 @@
1.30 fi \
1.31 }
1.32 ifeq ($(CROSS_COMPILE_ARCH),)
1.33 - ifneq ($(OBJCOPY),)
1.34 + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1.35 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
1.36 $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
1.37 ifeq ($(STRIP_POLICY),all_strip)
1.38 @@ -343,17 +345,25 @@
1.39 endif
1.40 endif
1.41 $(QUIETLY) [ -f $(LIBJVM_G_DEBUGINFO) ] || ln -s $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
1.42 + ifeq ($(ZIP_DEBUGINFO_FILES),1)
1.43 + $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
1.44 + $(RM) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
1.45 + [ -f $(LIBJVM_G_DIZ) ] || { ln -s $(LIBJVM_DIZ) $(LIBJVM_G_DIZ); }
1.46 + endif
1.47 endif
1.48 endif
1.49
1.50 DEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR)
1.51 DEST_JVM = $(DEST_SUBDIR)/$(LIBJVM)
1.52 DEST_JVM_DEBUGINFO = $(DEST_SUBDIR)/$(LIBJVM_DEBUGINFO)
1.53 +DEST_JVM_DIZ = $(DEST_SUBDIR)/$(LIBJVM_DIZ)
1.54
1.55 install_jvm: $(LIBJVM)
1.56 @echo "Copying $(LIBJVM) to $(DEST_JVM)"
1.57 $(QUIETLY) test -f $(LIBJVM_DEBUGINFO) && \
1.58 cp -f $(LIBJVM_DEBUGINFO) $(DEST_JVM_DEBUGINFO)
1.59 + $(QUIETLY) test -f $(LIBJVM_DIZ) && \
1.60 + cp -f $(LIBJVM_DIZ) $(DEST_JVM_DIZ)
1.61 $(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done"
1.62
1.63 #----------------------------------------------------------------------
