diff options
| author | Alan Modra <amodra@gmail.com> | 2018-06-21 23:19:41 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2018-06-26 21:28:05 +0930 |
| commit | 2393a7e3e6b3ec51bc404c6adebffea5db9f04b1 (patch) | |
| tree | 5ed9bd349bafaa18582932801abe55f35b66d54e /include | |
| parent | eca4b721468e239a6a1ca7c9bd9c967085067dfe (diff) | |
| download | binutils-2393a7e3e6b3ec51bc404c6adebffea5db9f04b1.zip binutils-2393a7e3e6b3ec51bc404c6adebffea5db9f04b1.tar.gz binutils-2393a7e3e6b3ec51bc404c6adebffea5db9f04b1.tar.bz2 | |
Revert "Use offsets instead of addresses in ELF_SECTION_IN_SEGMENT for non SHT_NOBITS"
This reverts commit 57c0d77c2ce5e583dab322e05f8291bcbad0ccd3.
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 4 | ||||
| -rw-r--r-- | include/elf/internal.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 0ccf1c1..7fb0cb3 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2018-06-26 Alan Modra <amodra@gmail.com> + + * elf/internal.h (ELF_SECTION_IN_SEGMENT): Revert last change. + 2018-06-24 Nick Clifton <nickc@redhat.com> 2.31 branch created. diff --git a/include/elf/internal.h b/include/elf/internal.h index b012820..05f9fab 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) \ |