From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by sourceware.org (Postfix) with ESMTPS id 0FC2B3858C39 for ; Wed, 3 Aug 2022 17:05:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0FC2B3858C39 Received: by mail-pg1-x532.google.com with SMTP id s206so15670083pgs.3 for ; Wed, 03 Aug 2022 10:05:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Htu6EXXcz0GfHXxnO2ja5n2PnULtpWNmuHYxz1fEWLs=; b=zZju8B9ZP8Rkb7QUAAWA/b85GcG0PFSvuRr99dvGbX3GnaM6zABJDi3teolmErgNFB hIhNqwkP7FAIWO8gXST7FDsrgrdU0CUyBSBMWmsIf1Qd/jaInBXDBxj5SUR4sPZ3nS9j MyPPC4DvchAT2FUbP08bbB/+EOl0GTqSK/nfCRIrfz+iKrYhL6km6KpZ1txZBvEe45Wb v/+trHVZUS95qhvNcuK1ftxGcLeUQy9uruK5btSKyrbWwn3WrCRKbbGCnAMUlH0ACrB9 ML53lmA4UReRVKlXSh2wKBohrrPb5WA9C4eV7DlfA4E/rje9fHztj5SBPoYt8IPN5F88 BEOg== X-Gm-Message-State: AJIora+C+Tw+wxci1vRE/1DbXCnGpTq0pOZk4eePqWhJ8xS3uiK9hFg0 yhmXISIi9sihRzkCQDEs95Dg9aJuYIs= X-Google-Smtp-Source: AGRyM1tcHSxZwXcAoB1gpua7QN0WOlEFmbtIBt99/JJAL+Ic8U88uHGw7ymtU/mRtt+LgvKNV0H1AQ== X-Received: by 2002:a63:f306:0:b0:41a:6258:dcd2 with SMTP id l6-20020a63f306000000b0041a6258dcd2mr20999111pgh.28.1659546313825; Wed, 03 Aug 2022 10:05:13 -0700 (PDT) Received: from gnu-tgl-3.localdomain ([172.58.37.102]) by smtp.gmail.com with ESMTPSA id d4-20020a63d644000000b00401a9bc0f33sm11244142pgj.85.2022.08.03.10.05.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Aug 2022 10:05:13 -0700 (PDT) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id E8671C0252 for ; Wed, 3 Aug 2022 10:05:11 -0700 (PDT) From: "H.J. Lu" To: binutils@sourceware.org Subject: [PATCH v2] elf: Reset alignment for each PT_LOAD segment Date: Wed, 3 Aug 2022 10:05:11 -0700 Message-Id: <20220803170511.68247-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3027.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2022 17:05:16 -0000 Reset alignment for each PT_LOAD segment to avoid using alignment from the previous PT_LOAD segment. bfd/ PR ld/29435 * elf.c (assign_file_positions_for_load_sections): Reset alignment for each PT_LOAD segment. ld/ PR ld/29435 * testsuite/ld-elf/pr29435.d: New file. * testsuite/ld-elf/pr29435.s: Likewise. --- bfd/elf.c | 7 ++++--- ld/testsuite/ld-elf/pr29435.d | 11 +++++++++++ ld/testsuite/ld-elf/pr29435.s | 6 ++++++ 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 ld/testsuite/ld-elf/pr29435.d create mode 100644 ld/testsuite/ld-elf/pr29435.s diff --git a/bfd/elf.c b/bfd/elf.c index 25f4bca34f0..3e64cdf6699 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -5440,8 +5440,6 @@ assign_file_positions_for_load_sections (bfd *abfd, Elf_Internal_Phdr *p; file_ptr off; /* Octets. */ bfd_size_type maxpagesize; - bfd_size_type p_align; - bool p_align_p = false; unsigned int alloc, actual; unsigned int i, j; struct elf_segment_map **sorted_seg_map; @@ -5526,7 +5524,6 @@ assign_file_positions_for_load_sections (bfd *abfd, qsort (sorted_seg_map, alloc, sizeof (*sorted_seg_map), elf_sort_segments); - p_align = bed->p_align; maxpagesize = 1; if ((abfd->flags & D_PAGED) != 0) { @@ -5561,6 +5558,8 @@ assign_file_positions_for_load_sections (bfd *abfd, asection **secpp; bfd_vma off_adjust; /* Octets. */ bool no_contents; + bfd_size_type p_align; + bool p_align_p; /* An ELF segment (described by Elf_Internal_Phdr) may contain a number of sections with contents contributing to both p_filesz @@ -5571,6 +5570,8 @@ assign_file_positions_for_load_sections (bfd *abfd, p = phdrs + m->idx; p->p_type = m->p_type; p->p_flags = m->p_flags; + p_align = bed->p_align; + p_align_p = false; if (m->count == 0) p->p_vaddr = m->p_vaddr_offset * opb; diff --git a/ld/testsuite/ld-elf/pr29435.d b/ld/testsuite/ld-elf/pr29435.d new file mode 100644 index 00000000000..4ca4fd086a2 --- /dev/null +++ b/ld/testsuite/ld-elf/pr29435.d @@ -0,0 +1,11 @@ +#ld: -shared -z separate-code -z relro +#xfail: ![check_shared_lib_support] +#xfail: ![check_relro_support] +#readelf: -Wl + +#failif +#... + +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ .* 0x8000 +#... + +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ .* 0x8000 +#... diff --git a/ld/testsuite/ld-elf/pr29435.s b/ld/testsuite/ld-elf/pr29435.s new file mode 100644 index 00000000000..d2d8f265f5e --- /dev/null +++ b/ld/testsuite/ld-elf/pr29435.s @@ -0,0 +1,6 @@ + .text + .balign 0x8000 + .globl foo + .type foo, %function +foo: + .byte 0 -- 2.37.1