Print this page
rev 6896 : 8033602: wrong stabs data in libjvm.debuginfo on JDK 8 - SPARC
8034005: cannot debug in synchronizer.o or objectMonitor.o on Solaris X86
Summary: Solaris needs objcopy version of 2.21.1 or newer is needed to create valid .debuginfo files.
Reviewed-by: dsamersoff, sspitsyn, dholmes, ihse

Split Split Close
Expand all
Collapse all
          --- old/hotspot/make/solaris/makefiles/dtrace.make
          +++ new/hotspot/make/solaris/makefiles/dtrace.make
   1    1  #
   2      -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
        2 +# Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
   3    3  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   4    4  #
   5    5  # This code is free software; you can redistribute it and/or modify it
   6    6  # under the terms of the GNU General Public License version 2 only, as
   7    7  # published by the Free Software Foundation.
   8    8  #
   9    9  # This code is distributed in the hope that it will be useful, but WITHOUT
  10   10  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  11   11  # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  12   12  # version 2 for more details (a copy is included in the LICENSE file that
↓ open down ↓ 76 lines elided ↑ open up ↑
  89   89  
  90   90  XLIBJVM_DIR = 64
  91   91  XLIBJVM_DB = $(XLIBJVM_DIR)/$(LIBJVM_DB)
  92   92  XLIBJVM_DTRACE = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE)
  93   93  
  94   94  XLIBJVM_DB_DEBUGINFO       = $(XLIBJVM_DIR)/$(LIBJVM_DB_DEBUGINFO)
  95   95  XLIBJVM_DB_DIZ             = $(XLIBJVM_DIR)/$(LIBJVM_DB_DIZ)
  96   96  XLIBJVM_DTRACE_DEBUGINFO   = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_DEBUGINFO)
  97   97  XLIBJVM_DTRACE_DIZ         = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_DIZ)
  98   98  
  99      -$(XLIBJVM_DB): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE)
       99 +$(XLIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE)
 100  100          @echo Making $@
 101  101          $(QUIETLY) mkdir -p $(XLIBJVM_DIR) ; \
 102  102          $(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. -I$(GENERATED) \
 103  103                  $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
 104  104  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
 105      -# gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
 106      -# Clear the SHF_ALLOC flag (if set) from empty section headers.
 107      -# An empty section header has sh_addr == 0 and sh_size == 0.
 108      -# This problem has only been seen on Solaris X64, but we call this tool
 109      -# on all Solaris builds just in case.
 110      -        $(QUIETLY) $(FIX_EMPTY_SEC_HDR_FLAGS) $@
 111  105          $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DB_DEBUGINFO)
 112      -# $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
 113      -# Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
 114      -#         $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) ;
 115  106  # Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR) is not
 116  107  # in the link name:
 117      -        ( cd $(XLIBJVM_DIR) && $(ADD_GNU_DEBUGLINK) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) )
      108 +        ( cd $(XLIBJVM_DIR) && $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) )
 118  109    ifeq ($(STRIP_POLICY),all_strip)
 119  110          $(QUIETLY) $(STRIP) $@
 120  111    else
 121  112      ifeq ($(STRIP_POLICY),min_strip)
 122  113          $(QUIETLY) $(STRIP) -x $@
 123  114      # implied else here is no stripping at all
 124  115      endif
 125  116    endif
 126  117    ifeq ($(ZIP_DEBUGINFO_FILES),1)
 127  118  # Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR) is not
 128  119  # in the archived name:
 129  120          ( cd $(XLIBJVM_DIR) && $(ZIPEXE) -q -y $(LIBJVM_DB_DIZ) $(LIBJVM_DB_DEBUGINFO) )
 130  121          $(RM) $(XLIBJVM_DB_DEBUGINFO)
 131  122    endif
 132  123  endif
 133  124  
 134      -$(XLIBJVM_DTRACE): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
      125 +$(XLIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
 135  126          @echo Making $@
 136  127          $(QUIETLY) mkdir -p $(XLIBJVM_DIR) ; \
 137  128          $(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. \
 138  129                  $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
 139  130  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
 140      -# Clear the SHF_ALLOC flag (if set) from empty section headers.
 141      -        $(QUIETLY) $(FIX_EMPTY_SEC_HDR_FLAGS) $@
 142  131          $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DTRACE_DEBUGINFO)
 143      -# $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
 144      -#         $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DTRACE_DEBUGINFO) $(LIBJVM_DTRACE) ;
 145  132  # Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR) is not
 146  133  # in the link name:
 147      -        ( cd $(XLIBJVM_DIR) && $(ADD_GNU_DEBUGLINK) $(LIBJVM_DTRACE_DEBUGINFO) $(LIBJVM_DTRACE) )
      134 +        ( cd $(XLIBJVM_DIR) && $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DTRACE_DEBUGINFO) $(LIBJVM_DTRACE) )
 148  135    ifeq ($(STRIP_POLICY),all_strip)
 149  136          $(QUIETLY) $(STRIP) $@
 150  137    else
 151  138      ifeq ($(STRIP_POLICY),min_strip)
 152  139          $(QUIETLY) $(STRIP) -x $@
 153  140      # implied else here is no stripping at all
 154  141      endif
 155  142    endif
 156  143    ifeq ($(ZIP_DEBUGINFO_FILES),1)
 157  144  # Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR) is not
↓ open down ↓ 36 lines elided ↑ open up ↑
 194  181          $(QUIETLY) LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ./$(GENOFFS) -index > $@.tmp
 195  182          $(QUIETLY)  $(CONDITIONALLY_UPDATE_JVMOFFS_TARGET)
 196  183  
 197  184  $(JVMOFFS).cpp: $(GENOFFS) $(JVMOFFS).h $(JVMOFFS)Index.h
 198  185          $(QUIETLY) LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ./$(GENOFFS) -table > $@.tmp
 199  186          $(QUIETLY) $(CONDITIONALLY_UPDATE_JVMOFFS_TARGET)
 200  187  
 201  188  $(JVMOFFS.o): $(JVMOFFS).h $(JVMOFFS).cpp 
 202  189          $(QUIETLY) $(CXX) -c -I. -o $@ $(ARCHFLAG) -D$(TYPE) $(JVMOFFS).cpp
 203  190  
 204      -$(LIBJVM_DB): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE)
      191 +$(LIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE)
 205  192          @echo Making $@
 206  193          $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. -I$(GENERATED) \
 207  194                  $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
 208  195  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
 209      -# Clear the SHF_ALLOC flag (if set) from empty section headers.
 210      -        $(QUIETLY) $(FIX_EMPTY_SEC_HDR_FLAGS) $@
 211  196          $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DB_DEBUGINFO)
 212      -# $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
 213      -#       $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DB_DEBUGINFO) $@
 214      -        $(QUIETLY) $(ADD_GNU_DEBUGLINK) $(LIBJVM_DB_DEBUGINFO) $@
      197 +        $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DB_DEBUGINFO) $@
 215  198    ifeq ($(STRIP_POLICY),all_strip)
 216  199          $(QUIETLY) $(STRIP) $@
 217  200    else
 218  201      ifeq ($(STRIP_POLICY),min_strip)
 219  202          $(QUIETLY) $(STRIP) -x $@
 220  203      # implied else here is no stripping at all
 221  204      endif
 222  205    endif
 223  206    ifeq ($(ZIP_DEBUGINFO_FILES),1)
 224  207          $(ZIPEXE) -q -y $(LIBJVM_DB_DIZ) $(LIBJVM_DB_DEBUGINFO)
 225  208          $(RM) $(LIBJVM_DB_DEBUGINFO)
 226  209    endif
 227  210  endif
 228  211  
 229      -$(LIBJVM_DTRACE): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(XLIBJVM_DTRACE) $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
      212 +$(LIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(XLIBJVM_DTRACE) $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
 230  213          @echo Making $@
 231  214          $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I.  \
 232  215                  $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
 233  216  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
 234      -# Clear the SHF_ALLOC flag (if set) from empty section headers.
 235      -        $(QUIETLY) $(FIX_EMPTY_SEC_HDR_FLAGS) $@
 236  217          $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DTRACE_DEBUGINFO)
 237      -# $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
 238      -#       $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DTRACE_DEBUGINFO) $@
 239      -        $(QUIETLY) $(ADD_GNU_DEBUGLINK) $(LIBJVM_DTRACE_DEBUGINFO) $@
      218 +        $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DTRACE_DEBUGINFO) $@
 240  219    ifeq ($(STRIP_POLICY),all_strip)
 241  220          $(QUIETLY) $(STRIP) $@
 242  221    else
 243  222      ifeq ($(STRIP_POLICY),min_strip)
 244  223          $(QUIETLY) $(STRIP) -x $@
 245  224      # implied else here is no stripping at all
 246  225      endif
 247  226    endif
 248  227    ifeq ($(ZIP_DEBUGINFO_FILES),1)
 249  228          $(ZIPEXE) -q -y $(LIBJVM_DTRACE_DIZ) $(LIBJVM_DTRACE_DEBUGINFO) 
↓ open down ↓ 134 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX