PR4499, assign file positions assumes segment offsets increasing

[deliverable/binutils-gdb.git] / include / elf / internal.h

diff --git a/include/elf/internal.h b/include/elf/internal.h
index b012820f6cf9c7e6b5879748b0b05685594987bb..794c16812eea6c3cb6acda720203920549364500 100644 (file)
--- a/include/elf/internal.h
+++ b/include/elf/internal.h
@@ -1,5 +1,5 @@
 /* ELF support for BFD.
-   Copyright (C) 1991-2018 Free Software Foundation, Inc.
+   Copyright (C) 1991-2019 Free Software Foundation, Inc.
 
    Written by Fred Fish @ Cygnus Support, from information published
    in "UNIX System V Release 4, Programmers Guide: ANSI C and
@@ -273,8 +273,6 @@ struct elf_segment_map
   bfd_vma p_align;
   /* Segment size in file and memory */
   bfd_vma p_size;
-  /* Required size of filehdr + phdrs, if non-zero */
-  bfd_vma header_size;
   /* Whether the p_flags field is valid; if not, the flags are based
      on the section flags.  */
   unsigned int p_flags_valid : 1;
@@ -291,6 +289,13 @@ struct elf_segment_map
   unsigned int includes_filehdr : 1;
   /* Whether this segment includes the program headers.  */
   unsigned int includes_phdrs : 1;
+  /* Assume this PT_LOAD header has an lma of zero when sorting
+     headers before assigning file offsets.  PT_LOAD headers with this
+     flag set are placed after one with includes_filehdr set, and
+     before PT_LOAD headers without this flag set.  */
+  unsigned int no_sort_lma : 1;
+  /* Index holding original order before sorting segments.  */
+  unsigned int idx;
   /* Number of sections (may be 0).  */
   unsigned int count;
   /* Sections.  Actual number of elements is in count field.  */
@@ -311,8 +316,8 @@ struct elf_segment_map
    VMAs are checked for alloc sections.  If STRICT, then a zero size
    section won't match at the end of a segment, unless the segment
    is also zero size.  Regardless of STRICT and CHECK_VMA, zero size
-   sections won't match at the start or end of PT_DYNAMIC, unless
-   PT_DYNAMIC is itself zero sized.  */
+   sections won't match at the start or end of PT_DYNAMIC nor PT_NOTE,
+   unless PT_DYNAMIC and PT_NOTE are themselves zero sized.  */
 #define ELF_SECTION_IN_SEGMENT_1(sec_hdr, segment, check_vma, strict)  \
   ((/* Only PT_LOAD, PT_GNU_RELRO and PT_TLS segments can contain      \
        SHF_TLS sections.  */                                           \
@@ -330,8 +335,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                                        \
@@ -342,10 +349,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)                                                \
@@ -354,8 +359,10 @@ struct elf_segment_map
           && (((sec_hdr)->sh_addr - (segment)->p_vaddr                 \
                + ELF_SECTION_SIZE(sec_hdr, segment))                   \
               <= (segment)->p_memsz)))                                 \
-   /* No zero size sections at start or end of PT_DYNAMIC.  */         \
-   && ((segment)->p_type != PT_DYNAMIC                                 \
+   /* No zero size sections at start or end of PT_DYNAMIC nor          \
+      PT_NOTE.  */                                                     \
+   && (((segment)->p_type != PT_DYNAMIC                                        \
+       && (segment)->p_type != PT_NOTE)                                \
        || (sec_hdr)->sh_size != 0                                      \
        || (segment)->p_memsz == 0                                      \
        || (((sec_hdr)->sh_type == SHT_NOBITS                           \