PT_GNU_MBIND section mapping

	* elf/internal.h (ELF_SECTION_IN_SEGMENT_1): Exclude non-alloc
	sections in GNU_MBIND segments.

diff --git a/include/ChangeLog b/include/ChangeLog
index 4c841e35954a2ee39c9b72343f571f21a6b5a301..ce38864ba033b43b1685a0780bf48d425dbaeac5 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2019-07-24  Alan Modra  <amodra@gmail.com>
+
+       * elf/internal.h (ELF_SECTION_IN_SEGMENT_1): Exclude non-alloc
+       sections in GNU_MBIND segments.
+
 2019-07-23  Omar Majid  <omajid@redhat.com>
 
        * coff/i386.h (IMAGE_FILE_MACHINE_NATIVE_APPLE_OVERRIDE): Define.

diff --git a/include/elf/internal.h b/include/elf/internal.h
index e29fc40df6297790989f34298a5cb4e214e20af6..59e3ede2e03d92e3e4c03b9a6540ec8c553dd753 100644 (file)
--- a/include/elf/internal.h
+++ b/include/elf/internal.h
@@ -330,8 +330,10 @@ struct elf_segment_map
        && ((segment)->p_type == PT_LOAD                                \
            || (segment)->p_type == PT_DYNAMIC                          \
            || (segment)->p_type == PT_GNU_EH_FRAME                     \
+           || (segment)->p_type == PT_GNU_STACK                        \
            || (segment)->p_type == PT_GNU_RELRO                        \
-           || (segment)->p_type == PT_GNU_STACK))                      \
+           || ((segment)->p_type >= PT_GNU_MBIND_LO                    \
+               && (segment)->p_type <= PT_GNU_MBIND_HI)))              \
    /* Any section besides one of type SHT_NOBITS must have file                \
       offsets within the segment.  */                                  \
    && ((sec_hdr)->sh_type == SHT_NOBITS                                        \