1.1 --- a/make/solaris/makefiles/dtrace.make Fri Nov 14 07:51:50 2014 -0800
1.2 +++ b/make/solaris/makefiles/dtrace.make Sat Nov 15 11:22:07 2014 -0800
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 2005, 2014, 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 @@ -96,25 +96,16 @@
1.11 XLIBJVM_DTRACE_DEBUGINFO = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_DEBUGINFO)
1.12 XLIBJVM_DTRACE_DIZ = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_DIZ)
1.13
1.14 -$(XLIBJVM_DB): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE)
1.15 +$(XLIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE)
1.16 @echo Making $@
1.17 $(QUIETLY) mkdir -p $(XLIBJVM_DIR) ; \
1.18 $(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. -I$(GENERATED) \
1.19 $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
1.20 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1.21 -# gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
1.22 -# Clear the SHF_ALLOC flag (if set) from empty section headers.
1.23 -# An empty section header has sh_addr == 0 and sh_size == 0.
1.24 -# This problem has only been seen on Solaris X64, but we call this tool
1.25 -# on all Solaris builds just in case.
1.26 - $(QUIETLY) $(FIX_EMPTY_SEC_HDR_FLAGS) $@
1.27 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DB_DEBUGINFO)
1.28 -# $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
1.29 -# Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
1.30 -# $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) ;
1.31 # Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR) is not
1.32 # in the link name:
1.33 - ( cd $(XLIBJVM_DIR) && $(ADD_GNU_DEBUGLINK) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) )
1.34 + ( cd $(XLIBJVM_DIR) && $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) )
1.35 ifeq ($(STRIP_POLICY),all_strip)
1.36 $(QUIETLY) $(STRIP) $@
1.37 else
1.38 @@ -131,20 +122,16 @@
1.39 endif
1.40 endif
1.41
1.42 -$(XLIBJVM_DTRACE): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
1.43 +$(XLIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
1.44 @echo Making $@
1.45 $(QUIETLY) mkdir -p $(XLIBJVM_DIR) ; \
1.46 $(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. \
1.47 $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
1.48 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1.49 -# Clear the SHF_ALLOC flag (if set) from empty section headers.
1.50 - $(QUIETLY) $(FIX_EMPTY_SEC_HDR_FLAGS) $@
1.51 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DTRACE_DEBUGINFO)
1.52 -# $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
1.53 -# $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DTRACE_DEBUGINFO) $(LIBJVM_DTRACE) ;
1.54 # Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR) is not
1.55 # in the link name:
1.56 - ( cd $(XLIBJVM_DIR) && $(ADD_GNU_DEBUGLINK) $(LIBJVM_DTRACE_DEBUGINFO) $(LIBJVM_DTRACE) )
1.57 + ( cd $(XLIBJVM_DIR) && $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DTRACE_DEBUGINFO) $(LIBJVM_DTRACE) )
1.58 ifeq ($(STRIP_POLICY),all_strip)
1.59 $(QUIETLY) $(STRIP) $@
1.60 else
1.61 @@ -201,17 +188,13 @@
1.62 $(JVMOFFS.o): $(JVMOFFS).h $(JVMOFFS).cpp
1.63 $(QUIETLY) $(CXX) -c -I. -o $@ $(ARCHFLAG) -D$(TYPE) $(JVMOFFS).cpp
1.64
1.65 -$(LIBJVM_DB): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE)
1.66 +$(LIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE)
1.67 @echo Making $@
1.68 $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. -I$(GENERATED) \
1.69 $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
1.70 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1.71 -# Clear the SHF_ALLOC flag (if set) from empty section headers.
1.72 - $(QUIETLY) $(FIX_EMPTY_SEC_HDR_FLAGS) $@
1.73 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DB_DEBUGINFO)
1.74 -# $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
1.75 -# $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DB_DEBUGINFO) $@
1.76 - $(QUIETLY) $(ADD_GNU_DEBUGLINK) $(LIBJVM_DB_DEBUGINFO) $@
1.77 + $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DB_DEBUGINFO) $@
1.78 ifeq ($(STRIP_POLICY),all_strip)
1.79 $(QUIETLY) $(STRIP) $@
1.80 else
1.81 @@ -226,17 +209,13 @@
1.82 endif
1.83 endif
1.84
1.85 -$(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)
1.86 +$(LIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(XLIBJVM_DTRACE) $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
1.87 @echo Making $@
1.88 $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. \
1.89 $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
1.90 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1.91 -# Clear the SHF_ALLOC flag (if set) from empty section headers.
1.92 - $(QUIETLY) $(FIX_EMPTY_SEC_HDR_FLAGS) $@
1.93 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DTRACE_DEBUGINFO)
1.94 -# $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
1.95 -# $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DTRACE_DEBUGINFO) $@
1.96 - $(QUIETLY) $(ADD_GNU_DEBUGLINK) $(LIBJVM_DTRACE_DEBUGINFO) $@
1.97 + $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DTRACE_DEBUGINFO) $@
1.98 ifeq ($(STRIP_POLICY),all_strip)
1.99 $(QUIETLY) $(STRIP) $@
1.100 else
