78 lines
3.7 KiB
Diff
78 lines
3.7 KiB
Diff
|
--- openjdk/make/common/NativeCompilation.gmk
|
||
|
|
+++ openjdk/make/common/NativeCompilation.gmk
|
||
|
|
@@ -437,29 +437,6 @@
|
||
|
|
|
||
|
|
ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X
|
||
|
|
ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows
|
||
|
|
- ifeq ($(OPENJDK_TARGET_OS), solaris)
|
||
|
|
- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
|
||
|
|
- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
|
||
|
|
- # empty section headers until a fixed $(OBJCOPY) is available.
|
||
|
|
- # 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.
|
||
|
|
- #
|
||
|
|
- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
|
||
|
|
- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
|
||
|
|
- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
|
||
|
|
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
|
||
|
|
- $(RM) $$@
|
||
|
|
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
|
||
|
|
- $(OBJCOPY) --only-keep-debug $$< $$@
|
||
|
|
- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
|
||
|
|
- else # not solaris
|
||
|
|
- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
|
||
|
|
- $(RM) $$@
|
||
|
|
- $(OBJCOPY) --only-keep-debug $$< $$@
|
||
|
|
- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
|
||
|
|
- endif # Touch to not retrigger rule on rebuild
|
||
|
|
- $(TOUCH) $$@
|
||
|
|
endif # !windows
|
||
|
|
endif # !macosx
|
||
|
|
|
||
|
|
@@ -483,7 +460,6 @@
|
||
|
|
$1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \
|
||
|
|
$$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb
|
||
|
|
else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
|
||
|
|
- $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
|
||
|
|
endif
|
||
|
|
endif
|
||
|
|
endif
|
||
|
|
@@ -522,28 +498,8 @@
|
||
|
|
ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X
|
||
|
|
ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows
|
||
|
|
ifeq ($(OPENJDK_TARGET_OS), solaris)
|
||
|
|
- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
|
||
|
|
- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
|
||
|
|
- # empty section headers until a fixed $(OBJCOPY) is available.
|
||
|
|
- # 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.
|
||
|
|
- #
|
||
|
|
- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
|
||
|
|
- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
|
||
|
|
- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
|
||
|
|
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
|
||
|
|
- $(RM) $$@
|
||
|
|
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
|
||
|
|
- $(OBJCOPY) --only-keep-debug $$< $$@
|
||
|
|
- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
|
||
|
|
else # not solaris
|
||
|
|
- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
|
||
|
|
- $(RM) $$@
|
||
|
|
- $(OBJCOPY) --only-keep-debug $$< $$@
|
||
|
|
- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
|
||
|
|
endif
|
||
|
|
- $(TOUCH) $$@
|
||
|
|
endif # !windows
|
||
|
|
endif # !macosx
|
||
|
|
|
||
|
|
@@ -567,7 +523,6 @@
|
||
|
|
$1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \
|
||
|
|
$$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb
|
||
|
|
else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
|
||
|
|
- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo
|
||
|
|
endif
|
||
|
|
endif
|
||
|
|
endif
|