From: Alan Modra <amodra@gmail.com>
To: binutils@sourceware.org
Subject: PR31667, objcopy/strip corrupts solaris binaries
Date: Tue, 23 Apr 2024 21:15:36 +0930 [thread overview]
Message-ID: <ZiefYICo/Us++AnE@squeak.grove.modra.org> (raw)
Using want_p_paddr_set_to_zero in commit 45d92439aebd was wrong. Even
solaris targets don't have want_p_paddr_set_to_zero, but we should
handle them at least somewhat reasonably.
PR 31667
* elf.c (IS_SECTION_IN_INPUT_SEGMENT): Remove bed arg, add
paddr_valid. Don't use bed->want_p_paddr_set_to_zero.
(INCLUDE_SECTION_IN_SEGMENT): Likewise.
(rewrite_elf_program_header): Adjust to suit.
diff --git a/bfd/elf.c b/bfd/elf.c
index 0f4907adc32..74236a658fd 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -7578,10 +7578,9 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd, bfd_vma maxpagesize)
7. SHF_TLS sections are only in PT_TLS or PT_LOAD segments.
8. PT_DYNAMIC should not contain empty sections at the beginning
(with the possible exception of .dynamic). */
-#define IS_SECTION_IN_INPUT_SEGMENT(section, segment, bed, opb) \
+#define IS_SECTION_IN_INPUT_SEGMENT(section, segment, opb, paddr_valid) \
(((is_contained_by (section, segment, segment->p_paddr, \
- segment->p_vaddr, opb, \
- bed->want_p_paddr_set_to_zero) \
+ segment->p_vaddr, opb, !paddr_valid) \
&& (section->flags & SEC_ALLOC) != 0) \
|| is_note (section, segment)) \
&& segment->p_type != PT_GNU_STACK \
@@ -7600,8 +7599,8 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd, bfd_vma maxpagesize)
/* If the output section of a section in the input segment is NULL,
it is removed from the corresponding output segment. */
-#define INCLUDE_SECTION_IN_SEGMENT(section, segment, bed, opb) \
- (IS_SECTION_IN_INPUT_SEGMENT (section, segment, bed, opb) \
+#define INCLUDE_SECTION_IN_SEGMENT(section, segment, opb, paddr_valid) \
+ (IS_SECTION_IN_INPUT_SEGMENT (section, segment, opb, paddr_valid) \
&& section->output_section != NULL)
/* Returns TRUE iff seg1 starts after the end of seg2. */
@@ -7746,7 +7745,7 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd, bfd_vma maxpagesize)
{
/* Find the first section in the input segment, which may be
removed from the corresponding output segment. */
- if (IS_SECTION_IN_INPUT_SEGMENT (section, segment, bed, opb))
+ if (IS_SECTION_IN_INPUT_SEGMENT (section, segment, opb, p_paddr_valid))
{
if (first_section == NULL)
first_section = section;
@@ -7882,7 +7881,7 @@ rewrite_elf_program_header (bfd *ibfd, bfd *obfd, bfd_vma maxpagesize)
section != NULL;
section = section->next)
{
- if (INCLUDE_SECTION_IN_SEGMENT (section, segment, bed, opb))
+ if (INCLUDE_SECTION_IN_SEGMENT (section, segment, opb, p_paddr_valid))
{
output_section = section->output_section;
--
Alan Modra
Australia Development Lab, IBM
reply other threads:[~2024-04-23 11:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=ZiefYICo/Us++AnE@squeak.grove.modra.org \
--to=amodra@gmail.com \
--cc=binutils@sourceware.org \
/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).