69 lines
2.4 KiB
Diff
69 lines
2.4 KiB
Diff
diff -rup binutils.orig/bfd/elf-bfd.h binutils-2.32/bfd/elf-bfd.h
|
|
--- binutils.orig/bfd/elf-bfd.h 2019-07-02 16:03:41.758007318 +0100
|
|
+++ binutils-2.32/bfd/elf-bfd.h 2019-07-02 16:04:02.025862020 +0100
|
|
@@ -2749,6 +2749,8 @@ extern bfd_vma elf64_r_sym (bfd_vma);
|
|
extern bfd_vma elf32_r_info (bfd_vma, bfd_vma);
|
|
extern bfd_vma elf32_r_sym (bfd_vma);
|
|
|
|
+extern bfd_boolean is_debuginfo_file (bfd *);
|
|
+
|
|
/* Large common section. */
|
|
extern asection _bfd_elf_large_com_section;
|
|
|
|
Only in binutils-2.32/bfd: elf-bfd.h.orig
|
|
diff -rup binutils.orig/bfd/elf.c binutils-2.32/bfd/elf.c
|
|
--- binutils.orig/bfd/elf.c 2019-07-02 16:03:42.101004858 +0100
|
|
+++ binutils-2.32/bfd/elf.c 2019-07-02 16:04:23.909705141 +0100
|
|
@@ -5807,6 +5807,35 @@ assign_file_positions_for_load_sections
|
|
return TRUE;
|
|
}
|
|
|
|
+/* Determine if a bfd is a debuginfo file. Unfortunately there
|
|
+ is no defined method for detecting such files, so we have to
|
|
+ use heuristics instead. */
|
|
+
|
|
+bfd_boolean
|
|
+is_debuginfo_file (bfd *abfd)
|
|
+{
|
|
+ if (abfd == NULL || bfd_get_flavour (abfd) != bfd_target_elf_flavour)
|
|
+ return FALSE;
|
|
+
|
|
+ Elf_Internal_Shdr **start_headers = elf_elfsections (abfd);
|
|
+ Elf_Internal_Shdr **end_headers = start_headers + elf_numsections (abfd);
|
|
+ Elf_Internal_Shdr **headerp;
|
|
+
|
|
+ for (headerp = start_headers; headerp < end_headers; headerp ++)
|
|
+ {
|
|
+ Elf_Internal_Shdr *header = * headerp;
|
|
+
|
|
+ /* Debuginfo files do not have any allocated SHT_PROGBITS sections.
|
|
+ The only allocated sections are SHT_NOBITS or SHT_NOTES. */
|
|
+ if ((header->sh_flags & SHF_ALLOC) == SHF_ALLOC
|
|
+ && header->sh_type != SHT_NOBITS
|
|
+ && header->sh_type != SHT_NOTE)
|
|
+ return FALSE;
|
|
+ }
|
|
+
|
|
+ return TRUE;
|
|
+}
|
|
+
|
|
/* Assign file positions for the other sections. */
|
|
|
|
static bfd_boolean
|
|
@@ -5840,7 +5869,13 @@ assign_file_positions_for_non_load_secti
|
|
BFD_ASSERT (hdr->sh_offset == hdr->bfd_section->filepos);
|
|
else if ((hdr->sh_flags & SHF_ALLOC) != 0)
|
|
{
|
|
- if (hdr->sh_size != 0)
|
|
+ if (hdr->sh_size != 0
|
|
+ /* PR 24717 - debuginfo files are known to be not strictly
|
|
+ compliant with the ELF standard. In particular they often
|
|
+ have .note.gnu.property sections that are outside of any
|
|
+ loadable segment. This is not a problem for such files,
|
|
+ so do not warn about them. */
|
|
+ && ! is_debuginfo_file (abfd))
|
|
_bfd_error_handler
|
|
/* xgettext:c-format */
|
|
(_("%pB: warning: allocated section `%s' not in segment"),
|
|
Only in binutils-2.32/bfd: elf.c.orig
|