From b62bf7dbd2604e5e18fc064d43af03f0ab883183 Mon Sep 17 00:00:00 2001 From: Andrew Leonard <31470007+andrew-m-leonard@users.noreply.github.com> Date: Tue, 30 Mar 2021 14:59:25 +0100 Subject: [PATCH] Revert "Add MacOS debug symbols support patch" (#5) This reverts commit 9b1c681a6073190bb2f1553c74ec6411be3c097f. --- jdk8u/buildAarch64Repo.sh | 2 - jdk8u/buildRepo.sh | 2 - .../patches/MacOS-debug-symbols-support.patch | 169 ------------------ 3 files changed, 173 deletions(-) delete mode 100644 jdk8u/patches/MacOS-debug-symbols-support.patch diff --git a/jdk8u/buildAarch64Repo.sh b/jdk8u/buildAarch64Repo.sh index 8c9f86ff..e0064d62 100755 --- a/jdk8u/buildAarch64Repo.sh +++ b/jdk8u/buildAarch64Repo.sh @@ -47,7 +47,6 @@ git checkout -b dev # Apply our patches git am $PATCHES/company_name.patch git am $PATCHES/0001-Set-vendor-information.patch -git am $PATCHES/MacOS-debug-symbols-support.patch # Update dev to head cd $SCRIPT_DIR @@ -79,7 +78,6 @@ cd $REPO git checkout release git am --exclude common/autoconf/generated-configure.sh $PATCHES/company_name.patch git am $PATCHES/0001-Set-vendor-information.patch -git am $PATCHES/MacOS-debug-symbols-support.patch chmod +x ./common/autoconf/autogen.sh ./common/autoconf/autogen.sh diff --git a/jdk8u/buildRepo.sh b/jdk8u/buildRepo.sh index b1c69b81..9c5e268f 100755 --- a/jdk8u/buildRepo.sh +++ b/jdk8u/buildRepo.sh @@ -42,7 +42,6 @@ git checkout -b dev # Apply our patches git am $PATCHES/company_name.patch -git am $PATCHES/MacOS-debug-symbols-support.patch # Update dev to jdk8u192-b12 cd "$SCRIPT_DIR" @@ -84,7 +83,6 @@ git checkout release git am $PATCHES/company_name.patch git am $PATCHES/ppc64le_1.patch git am $PATCHES/ppc64le_2.patch -git am $PATCHES/MacOS-debug-symbols-support.patch createTag "jdk8u181-b13" diff --git a/jdk8u/patches/MacOS-debug-symbols-support.patch b/jdk8u/patches/MacOS-debug-symbols-support.patch deleted file mode 100644 index 6763382e..00000000 --- a/jdk8u/patches/MacOS-debug-symbols-support.patch +++ /dev/null @@ -1,169 +0,0 @@ -From 403d893e64d87976fcb29697daa984a3cef6ebc3 Mon Sep 17 00:00:00 2001 -From: Andrew Leonard <31470007+andrew-m-leonard@users.noreply.github.com> -Date: Mon, 22 Feb 2021 16:22:01 +0000 -Subject: [PATCH] MacOS debug symbols support - -Signed-off-by: Andrew Leonard ---- - make/common/NativeCompilation.gmk | 135 +++++++++++++++++------------- - 1 file changed, 75 insertions(+), 60 deletions(-) - -diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk -index 9980e8ab94..3da25475bd 100644 ---- a/make/common/NativeCompilation.gmk -+++ b/make/common/NativeCompilation.gmk -@@ -440,76 +440,91 @@ define SetupNativeCompilation - ifeq ($$($1_STATIC_LIBRARY),) - ifneq ($$($1_DEBUG_SYMBOLS),) - ifeq ($(ENABLE_DEBUG_SYMBOLS), true) -- ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet -- ifneq ($$($1_OUTPUT_DIR),$$($1_OBJECT_DIR)) -+ ifneq ($$($1_OUTPUT_DIR),$$($1_OBJECT_DIR)) -+ ifeq ($(OPENJDK_TARGET_OS), macosx) -+ # MacOS debug symbols are in %.dSYM directories -+ $$($1_OUTPUT_DIR)/$$($1_BASENAME).dSYM/Contents/Info.plist : $$($1_OBJECT_DIR)/$$($1_BASENAME).dSYM/Contents/Info.plist -+ mkdir -p $$(@D) -+ $(CP) $$< $$@ -+ $$($1_OUTPUT_DIR)/$$($1_BASENAME).dSYM/Contents/Resources/DWARF/$$($1_BASENAME) : $$($1_OBJECT_DIR)/$$($1_BASENAME).dSYM/Contents/Resources/DWARF/$$($1_BASENAME) -+ mkdir -p $$(@D) -+ $(CP) $$< $$@ -+ else - # The dependency on TARGET is needed on windows for debuginfo files - # to be rebuilt properly. - $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/% $$($1_TARGET) - $(CP) $$< $$@ - endif -+ endif -+ -+ # Generate debuginfo files. -+ ifeq ($(OPENJDK_TARGET_OS), windows) -+ ifneq ($$($1_STRIP_POLICY), no_strip) -+ $1_EXTRA_LDFLAGS += "-pdb:$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).pdb" \ -+ "-map:$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).map" -+ $1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).pdb \ -+ $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).map -+ -+ # This dependency dance ensures that windows debug info files get rebuilt -+ # properly if deleted. -+ $$($1_TARGET): $$($1_DEBUGINFO_FILES) -+ $$($1_DEBUGINFO_FILES): $$($1_EXPECTED_OBJS) -+ endif -+ else ifeq ($(OPENJDK_TARGET_OS), solaris) -+ ifneq ($$($1_STRIP_POLICY), no_strip) -+ $1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).debuginfo -+ # 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_DEBUGINFO_FILES): $$($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) $$< -+ $(TOUCH) $$@ -+ endif -+ else ifeq ($(OPENJDK_TARGET_OS), linux) -+ ifneq ($$($1_STRIP_POLICY), no_strip) -+ $1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).debuginfo -+ $$($1_DEBUGINFO_FILES): $$($1_TARGET) -+ $(RM) $$@ -+ $(OBJCOPY) --only-keep-debug $$< $$@ -+ $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$< -+ $(TOUCH) $$@ -+ endif -+ else ifeq ($(OPENJDK_TARGET_OS), macosx) -+ ifneq ($$($1_STRIP_POLICY), no_strip) -+ $1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_BASENAME).dSYM/Contents/Info.plist \ -+ $$($1_OBJECT_DIR)/$$($1_BASENAME).dSYM/Contents/Resources/DWARF/$$($1_BASENAME) -+ $$($1_DEBUGINFO_FILES): $$($1_TARGET) -+ $(DSYMUTIL) --out $$($1_OBJECT_DIR)/$$($1_BASENAME).dSYM $$< -+ endif -+ endif -+ -+ ifeq ($(ZIP_DEBUGINFO_FILES), true) -+ ifneq ($$($1_STRIP_POLICY), no_strip) -+ $1_DEBUGINFO_ZIP := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).diz -+ $1 += $$(subst $$($1_OBJECT_DIR),$$($1_OUTPUT_DIR),$$($1_DEBUGINFO_ZIP)) - -- # Generate debuginfo files. -- ifeq ($(OPENJDK_TARGET_OS), windows) -- ifneq ($$($1_STRIP_POLICY), no_strip) -- $1_EXTRA_LDFLAGS += "-pdb:$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).pdb" \ -- "-map:$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).map" -- $1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).pdb \ -- $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).map -- -- # This dependency dance ensures that windows debug info files get rebuilt -- # properly if deleted. -- $$($1_TARGET): $$($1_DEBUGINFO_FILES) -- $$($1_DEBUGINFO_FILES): $$($1_EXPECTED_OBJS) -- endif -- else ifeq ($(OPENJDK_TARGET_OS), solaris) -- ifneq ($$($1_STRIP_POLICY), no_strip) -- $1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).debuginfo -- # 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_DEBUGINFO_FILES): $$($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) $$< -- $(TOUCH) $$@ -- endif -- else ifeq ($(OPENJDK_TARGET_OS), linux) -- ifneq ($$($1_STRIP_POLICY), no_strip) -- $1_DEBUGINFO_FILES := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).debuginfo -- $$($1_DEBUGINFO_FILES): $$($1_TARGET) -- $(RM) $$@ -- $(OBJCOPY) --only-keep-debug $$< $$@ -- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$< -- $(TOUCH) $$@ -- endif -- endif # No MacOS X support -- -- ifeq ($(ZIP_DEBUGINFO_FILES), true) -- ifneq ($$($1_STRIP_POLICY), no_strip) -- $1_DEBUGINFO_ZIP := $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).diz -- $1 += $$(subst $$($1_OBJECT_DIR),$$($1_OUTPUT_DIR),$$($1_DEBUGINFO_ZIP)) -- -- # The dependency on TARGET is needed on windows for debuginfo files -- # to be rebuilt properly. -- $$($1_DEBUGINFO_ZIP): $$($1_DEBUGINFO_FILES) $$($1_TARGET) -+ # The dependency on TARGET is needed on windows for debuginfo files -+ # to be rebuilt properly. -+ $$($1_DEBUGINFO_ZIP): $$($1_DEBUGINFO_FILES) $$($1_TARGET) - $(CD) $$($1_OBJECT_DIR) \ - && $(ZIP) -q $$@ $$($1_DEBUGINFO_FILES) -- endif -- else -- ifneq ($$($1_STRIP_POLICY), no_strip) -- $1 += $$(subst $$($1_OBJECT_DIR),$$($1_OUTPUT_DIR),$$($1_DEBUGINFO_FILES)) -- endif -+ endif -+ else -+ ifneq ($$($1_STRIP_POLICY), no_strip) -+ $1 += $$(subst $$($1_OBJECT_DIR),$$($1_OUTPUT_DIR),$$($1_DEBUGINFO_FILES)) - endif - endif -- endif # !MacOS X -+ endif # ENABLE_DEBUG_SYMBOLS - endif # $1_DEBUG_SYMBOLS - endif # !STATIC_LIBRARY - --- -2.24.3 (Apple Git-128) -