1.1 --- a/make/solaris/makefiles/jsig.make Tue May 15 10:52:24 2012 -0700 1.2 +++ b/make/solaris/makefiles/jsig.make Thu May 24 12:03:42 2012 -0700 1.3 @@ -52,14 +52,23 @@ 1.4 LFLAGS_JSIG += -mt -xnolib 1.5 endif 1.6 1.7 -$(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE) 1.8 +$(LIBJSIG): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE) 1.9 @echo Making signal interposition lib... 1.10 $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \ 1.11 - $(LFLAGS_JSIG) -o $@ $< -ldl 1.12 + $(LFLAGS_JSIG) -o $@ $(JSIGSRCDIR)/jsig.c -ldl 1.13 [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); } 1.14 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) 1.15 +# gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. 1.16 +# Clear the SHF_ALLOC flag (if set) from empty section headers. 1.17 +# An empty section header has sh_addr == 0 and sh_size == 0. 1.18 +# This problem has only been seen on Solaris X64, but we call this tool 1.19 +# on all Solaris builds just in case. 1.20 + $(QUIETLY) $(FIX_EMPTY_SEC_HDR_FLAGS) $@ 1.21 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO) 1.22 - $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@ 1.23 +# $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. 1.24 +# Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. 1.25 +# $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@ 1.26 + $(QUIETLY) $(ADD_GNU_DEBUGLINK) $(LIBJSIG_DEBUGINFO) $@ 1.27 ifeq ($(STRIP_POLICY),all_strip) 1.28 $(QUIETLY) $(STRIP) $@ 1.29 else