make/solaris/makefiles/saproc.make

*** 88,98 ****
  
  # Uncomment the following to simulate building on Nevada-B159 or later
  # when actually building on Nevada-B158 or earlier:
  #SOLARIS_11_B159_OR_LATER=-DSOLARIS_11_B159_OR_LATER
  
! $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
          $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
            echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
            exit 1; \
          fi
          @echo Making SA debugger back-end...
--- 88,98 ----
  
  # Uncomment the following to simulate building on Nevada-B159 or later
  # when actually building on Nevada-B158 or earlier:
  #SOLARIS_11_B159_OR_LATER=-DSOLARIS_11_B159_OR_LATER
  
! $(LIBSAPROC): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(SASRCFILES) $(SAMAPFILE)
          $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
            echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
            exit 1; \
          fi
          @echo Making SA debugger back-end...
*** 107,118 ****
                     $(SA_LFLAGS)                                         \
                     -o $@                                                \
                     -ldl -ldemangle -lthread -lc
          [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
          $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
!         $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
    ifeq ($(STRIP_POLICY),all_strip)
          $(QUIETLY) $(STRIP) $@
    else
      ifeq ($(STRIP_POLICY),min_strip)
          $(QUIETLY) $(STRIP) -x $@
--- 107,127 ----
                     $(SA_LFLAGS)                                         \
                     -o $@                                                \
                     -ldl -ldemangle -lthread -lc
          [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
+ # Clear the SHF_ALLOC flag (if set) from empty section headers.
+ # An empty section header has sh_addr == 0 and sh_size == 0.
+ # This problem has only been seen on Solaris X64, but we call this tool
+ # on all Solaris builds just in case.
+         $(QUIETLY) $(FIX_EMPTY_SEC_HDR_FLAGS) $@
          $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
! # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
! # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
! #       $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
!         $(QUIETLY) $(ADD_GNU_DEBUGLINK) $(LIBSAPROC_DEBUGINFO) $@
    ifeq ($(STRIP_POLICY),all_strip)
          $(QUIETLY) $(STRIP) $@
    else
      ifeq ($(STRIP_POLICY),min_strip)
          $(QUIETLY) $(STRIP) -x $@