From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id C555C3851514; Fri, 28 Oct 2022 14:27:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C555C3851514 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666967266; bh=DVCXRVztWnyZgbSH/Qrfoi8qL5Im7wBye0vs64BcDDI=; h=From:To:Subject:Date:From; b=ngCG1nVQRDUGgmc1/zda1vfR9stcE1JzKLxmL+gNRTr7vMCdP3+OJdZn0Yy92lUBb ZynJPn/DwRfk/TWkbO97nF2dLZc63hu7PEJ9UAYzTCk6MHh+TE4I47MwF4KXXvyvt/ baa+SQZ7dRvbAgnxfRJ1xbUfDe+eygADrj1sGndk= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: drop objcopy .gnu_debuglink juggle X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: 49df152de7cba665e08a807e5cbc3dea846c88fa X-Git-Newrev: ebbff10ae1ba25c541be34213a6f7f9d9a2f2774 Message-Id: <20221028142746.C555C3851514@sourceware.org> Date: Fri, 28 Oct 2022 14:27:46 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Debbff10ae1b= a25c541be34213a6f7f9d9a2f2774 commit ebbff10ae1ba25c541be34213a6f7f9d9a2f2774 Author: Corinna Vinschen Date: Thu Oct 27 13:05:36 2022 +0200 Cygwin: drop objcopy .gnu_debuglink juggle =20 Prior to 591fec858d01 ("Cygwin: decouple cygheap from Cygwin DLL") the .cygheap section was required to stay the last section in the final binary. That required some juggling with objcopy to make sure the .gnu_debuglink section is prior to the .cygheap section in the final DLL. =20 This isn't required anymore, so just drop it. =20 Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/Makefile.am | 22 +++++----------------- winsup/cygwin/cygwin.sc.in | 16 ---------------- 2 files changed, 5 insertions(+), 33 deletions(-) diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am index 8debd0144..024634d28 100644 --- a/winsup/cygwin/Makefile.am +++ b/winsup/cygwin/Makefile.am @@ -576,28 +576,16 @@ $(PRE_DLL_NAME): $(LDSCRIPT) libdll.a $(VERSION_OFILE= S) $(LIBSERVER)\ =20 # create cygwin1.dbg file $(DBG_DLL_NAME): $(PRE_DLL_NAME) - $(AM_V_GEN)$(OBJCOPY) -R .gnu_debuglink_overlay \ - --add-gnu-debuglink=3D/dev/null \ + $(AM_V_GEN)$(OBJCOPY) --add-gnu-debuglink=3D/dev/null \ --only-keep-debug \ $(PRE_DLL_NAME) \ $(DBG_DLL_NAME) =20 -# create stripped, temporary DLL, append .gnu_debuglink section, move -# .gnu_debuglink section in place of .gnu_debuglink_overlay placeholder -# section and store result in new-cygwin1.dll +# create stripped release DLL, append .gnu_debuglink section $(NEW_DLL_NAME): $(PRE_DLL_NAME) $(DBG_DLL_NAME) - $(AM_V_GEN)TMP_DLL_NAME=3D$$( mktemp --suffix=3D.dll ) && \ - $(OBJCOPY) -g \ - --keep-section=3D.gnu_debuglink_overlay \ - --add-gnu-debuglink=3D$(DBG_DLL_NAME) \ - $(PRE_DLL_NAME) $${TMP_DLL_NAME} && \ - vma=3D$$( objdump --headers $${TMP_DLL_NAME} | \ - awk '/.gnu_debuglink_overlay/{print $$4;}' ) && \ - $(OBJCOPY) -R .gnu_debuglink_overlay \ - --change-section-address .gnu_debuglink=3D0x$${vma} \ - --set-section-flag .gnu_debuglink=3Dcontents,readonly,debug,noload \ - $${TMP_DLL_NAME} $(NEW_DLL_NAME) && \ - rm $${TMP_DLL_NAME} + $(AM_V_GEN)$(OBJCOPY) -g \ + --add-gnu-debuglink=3D$(DBG_DLL_NAME) \ + $(PRE_DLL_NAME) $(NEW_DLL_NAME) =20 # cygwin import library toolopts=3D--cpu=3D@target_cpu@ --ar=3D@AR@ --as=3D@AS@ --nm=3D@NM@ --objc= opy=3D@OBJCOPY@ diff --git a/winsup/cygwin/cygwin.sc.in b/winsup/cygwin/cygwin.sc.in index d984c51c9..69526f5d8 100644 --- a/winsup/cygwin/cygwin.sc.in +++ b/winsup/cygwin/cygwin.sc.in @@ -116,22 +116,6 @@ SECTIONS *(.rsrc) *(SORT(.rsrc$*)) } - .gnu_debuglink_overlay ALIGN(__section_alignment__) (NOLOAD): - { - BYTE(0) /* c */ - BYTE(0) /* y */ - BYTE(0) /* g */ - BYTE(0) /* w */ - BYTE(0) /* i */ - BYTE(0) /* n */ - BYTE(0) /* 1 */ - BYTE(0) /* . */ - BYTE(0) /* d */ - BYTE(0) /* b */ - BYTE(0) /* g */ - BYTE(0) /* \0 */ - LONG(0) /* checksum */ - } /DISCARD/ : { *(.debug$S)