From 2393a7e3e6b3ec51bc404c6adebffea5db9f04b1 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 21 Jun 2018 23:19:41 +0930 Subject: [PATCH] Revert "Use offsets instead of addresses in ELF_SECTION_IN_SEGMENT for non SHT_NOBITS" This reverts commit 57c0d77c2ce5e583dab322e05f8291bcbad0ccd3. --- include/ChangeLog | 4 ++++ include/elf/internal.h | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index 0ccf1c1063..7fb0cb3de0 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2018-06-26 Alan Modra + + * elf/internal.h (ELF_SECTION_IN_SEGMENT): Revert last change. + 2018-06-24 Nick Clifton 2.31 branch created. diff --git a/include/elf/internal.h b/include/elf/internal.h index b012820f6c..05f9fab89c 100644 --- a/include/elf/internal.h +++ b/include/elf/internal.h @@ -342,10 +342,8 @@ struct elf_segment_map && (((sec_hdr)->sh_offset - (segment)->p_offset \ + ELF_SECTION_SIZE(sec_hdr, segment)) \ <= (segment)->p_filesz))) \ - /* SHT_NOBITS sections with SHF_ALLOC must have VMAs within the \ - segment. */ \ + /* SHF_ALLOC sections must have VMAs within the segment. */ \ && (!(check_vma) \ - || (sec_hdr)->sh_type != SHT_NOBITS \ || ((sec_hdr)->sh_flags & SHF_ALLOC) == 0 \ || ((sec_hdr)->sh_addr >= (segment)->p_vaddr \ && (!(strict) \