From: Peilin Ye <yepeilin.cs@gmail.com>
To: binutils@sourceware.org
Cc: Nick Clifton <nickc@redhat.com>, Alan Modra <amodra@gmail.com>,
Cong Wang <xiyou.wangcong@gmail.com>,
Peilin Ye <yepeilin.cs@gmail.com>,
Peilin Ye <peilin.ye@bytedance.com>
Subject: [PATCH v2] objcopy: Fix --only-keep-debug
Date: Fri, 28 Jan 2022 15:00:30 -0800 [thread overview]
Message-ID: <20220128230030.67552-1-yepeilin.cs@gmail.com> (raw)
In-Reply-To: <20220128035817.65910-1-yepeilin.cs@gmail.com>
From: Peilin Ye <peilin.ye@bytedance.com>
objcopy's --only-keep-debug option has been broken for ELF files since
commit 8c803a2dd7d3 ("elf_backend_section_flags and
_bfd_elf_init_private_section_data"):
1. binutils/objcopy.c:setup_section() marks non-debug OSECs as
SHT_NOBITS, then calls bfd_copy_private_section_data(), see
"mark_nobits";
2. If ISEC and OSEC share the same section flags,
bfd/elf.c:_bfd_elf_init_private_section_data() restores OSEC's
section type back to ISEC's section type, effectively undoing
"mark_nobits".
This makes objcopy's --only-keep-debug a no-op. As an example, Linux's
scripts/package/builddeb script depends on this option to generate
debug-info-only kernel modules.
As suggested by Nick and Alan, fix --only-keep-debug by marking
non-debug OSECs as SHT_NOBITS after calling
bfd_copy_private_section_data() in setup_section().
binutils/ChangeLog:
* objcopy.c (setup_section): For --only-keep-debug, mark
non-debug output sections as SHT_NOBITS after calling
bfd_copy_private_section_data()
Reported-by: Omar Sandoval <osandov@osandov.com>
Fixes: 8c803a2dd7d3 ("elf_backend_section_flags and _bfd_elf_init_private_section_data")
Suggested-by: Alan Modra <amodra@gmail.com>
Signed-off-by: Peilin Ye <peilin.ye@bytedance.com>
---
change since v1:
- fix objcopy instead of touching _bfd_elf_init_private_section_data()
(suggested by Nick and Alan)
binutils/objcopy.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index d16d8ee67e4d..d53aa5c6000f 100644
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -4085,9 +4085,6 @@ setup_section (bfd *ibfd, sec_ptr isection, void *obfdarg)
goto loser;
}
- if (make_nobits)
- elf_section_type (osection) = SHT_NOBITS;
-
size = bfd_section_size (isection);
size = bfd_convert_section_size (ibfd, isection, obfd, size);
if (copy_byte >= 0)
@@ -4181,6 +4178,9 @@ setup_section (bfd *ibfd, sec_ptr isection, void *obfdarg)
goto loser;
}
+ if (make_nobits)
+ elf_section_type (osection) = SHT_NOBITS;
+
/* All went well. */
return;
--
2.20.1
next prev parent reply other threads:[~2022-01-28 23:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-28 3:58 [RFC PATCH] bfd: Handle objcopy --only-keep-debug in _bfd_elf_init_private_section_data() Peilin Ye
2022-01-28 12:42 ` Nick Clifton
2022-01-28 12:52 ` Alan Modra
2022-01-28 23:37 ` Peilin Ye
2022-01-29 9:15 ` Peilin Ye
2022-01-30 1:08 ` Peilin Ye
2022-01-28 23:00 ` Peilin Ye [this message]
2022-02-01 0:20 ` [PATCH v3 1/2] objcopy: Fix --only-keep-debug for ELF relocatables Peilin Ye
2022-02-01 0:21 ` [PATCH v3 2/2] binutils/testsuite: Test " Peilin Ye
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220128230030.67552-1-yepeilin.cs@gmail.com \
--to=yepeilin.cs@gmail.com \
--cc=amodra@gmail.com \
--cc=binutils@sourceware.org \
--cc=nickc@redhat.com \
--cc=peilin.ye@bytedance.com \
--cc=xiyou.wangcong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).