From f47de0258322e0edbd6ad0e0a74723a975af98d9 Mon Sep 17 00:00:00 2001 From: christos Date: Thu, 3 Nov 2016 01:22:59 +0000 Subject: [PATCH] More detailed error messages for text relocations on ppc code. Tested by joerg@ --- external/gpl3/binutils/dist/bfd/elf32-ppc.c | 21 +++++++++++++++------ external/gpl3/binutils/dist/bfd/elf64-ppc.c | 21 +++++++++++++++------ 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/external/gpl3/binutils/dist/bfd/elf32-ppc.c b/external/gpl3/binutils/dist/bfd/elf32-ppc.c index a3fd0daa029d..10386beb7d28 100644 --- a/external/gpl3/binutils/dist/bfd/elf32-ppc.c +++ b/external/gpl3/binutils/dist/bfd/elf32-ppc.c @@ -5557,7 +5557,7 @@ ppc_elf_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, /* Return true if we have dynamic relocs that apply to read-only sections. */ static bfd_boolean -readonly_dynrelocs (struct elf_link_hash_entry *h) +readonly_dynrelocs (struct elf_link_hash_entry *h, void *inf, bfd_boolean warn) { struct elf_dyn_relocs *p; @@ -5568,7 +5568,16 @@ readonly_dynrelocs (struct elf_link_hash_entry *h) if (s != NULL && ((s->flags & (SEC_READONLY | SEC_ALLOC)) == (SEC_READONLY | SEC_ALLOC))) - return TRUE; + { + struct bfd_link_info *info = (struct bfd_link_info *) inf; + + if (warn && ((info->warn_shared_textrel && bfd_link_pic (info)) + || info->error_textrel)) + info->callbacks->einfo (_("%P: %B: warning: relocation against `%s' in readonly section `%A'\n"), + p->sec->owner, h->root.root.string, + p->sec); + return TRUE; + } } return FALSE; } @@ -5642,7 +5651,7 @@ ppc_elf_adjust_dynamic_symbol (struct bfd_link_info *info, && h->type != STT_GNU_IFUNC && !htab->is_vxworks && !ppc_elf_hash_entry (h)->has_sda_refs - && !readonly_dynrelocs (h)) + && !readonly_dynrelocs (h, info, FALSE)) { h->pointer_equality_needed = 0; h->non_got_ref = 0; @@ -5662,7 +5671,7 @@ ppc_elf_adjust_dynamic_symbol (struct bfd_link_info *info, && h->type != STT_GNU_IFUNC && !htab->is_vxworks && !ppc_elf_hash_entry (h)->has_sda_refs - && !readonly_dynrelocs (h)) + && !readonly_dynrelocs (h, info, FALSE)) h->non_got_ref = 0; } h->protected_def = 0; @@ -5739,7 +5748,7 @@ ppc_elf_adjust_dynamic_symbol (struct bfd_link_info *info, && !ppc_elf_hash_entry (h)->has_sda_refs && !htab->is_vxworks && !h->def_regular - && !readonly_dynrelocs (h)) + && !readonly_dynrelocs (h, info, FALSE)) { h->non_got_ref = 0; return TRUE; @@ -6249,7 +6258,7 @@ maybe_set_textrel (struct elf_link_hash_entry *h, void *info) if (h->root.type == bfd_link_hash_indirect) return TRUE; - if (readonly_dynrelocs (h)) + if (readonly_dynrelocs (h, info, TRUE)) { ((struct bfd_link_info *) info)->flags |= DF_TEXTREL; diff --git a/external/gpl3/binutils/dist/bfd/elf64-ppc.c b/external/gpl3/binutils/dist/bfd/elf64-ppc.c index 2db47d538638..e86af887b3c2 100644 --- a/external/gpl3/binutils/dist/bfd/elf64-ppc.c +++ b/external/gpl3/binutils/dist/bfd/elf64-ppc.c @@ -7105,7 +7105,7 @@ ppc64_elf_func_desc_adjust (bfd *obfd ATTRIBUTE_UNUSED, /* Return true if we have dynamic relocs that apply to read-only sections. */ static bfd_boolean -readonly_dynrelocs (struct elf_link_hash_entry *h) +readonly_dynrelocs (struct elf_link_hash_entry *h, void *inf, bfd_boolean warn) { struct ppc_link_hash_entry *eh; struct elf_dyn_relocs *p; @@ -7116,7 +7116,16 @@ readonly_dynrelocs (struct elf_link_hash_entry *h) asection *s = p->sec->output_section; if (s != NULL && (s->flags & SEC_READONLY) != 0) - return TRUE; + { + struct bfd_link_info *info = (struct bfd_link_info *) inf; + + if (warn && ((info->warn_shared_textrel && bfd_link_pic (info)) + || info->error_textrel)) + info->callbacks->einfo (_("%P: %B: warning: relocation against `%s' in readonly section `%A'\n"), + p->sec->owner, h->root.root.string, + p->sec); + return TRUE; + } } return FALSE; } @@ -7168,7 +7177,7 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info, be used instead. */ if (h->pointer_equality_needed && h->type != STT_GNU_IFUNC - && !readonly_dynrelocs (h)) + && !readonly_dynrelocs (h, info, FALSE)) { h->pointer_equality_needed = 0; h->non_got_ref = 0; @@ -7186,7 +7195,7 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info, else if (!h->ref_regular_nonweak && h->non_got_ref && h->type != STT_GNU_IFUNC - && !readonly_dynrelocs (h)) + && !readonly_dynrelocs (h, info, FALSE)) h->non_got_ref = 0; /* If making a plt entry, then we don't need copy relocs. */ @@ -7235,7 +7244,7 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info, /* If we didn't find any dynamic relocs in read-only sections, then we'll be keeping the dynamic relocs and avoiding the copy reloc. */ - if (ELIMINATE_COPY_RELOCS && !readonly_dynrelocs (h)) + if (ELIMINATE_COPY_RELOCS && !readonly_dynrelocs (h, info, FALSE)) { h->non_got_ref = 0; return TRUE; @@ -9844,7 +9853,7 @@ maybe_set_textrel (struct elf_link_hash_entry *h, void *info) if (h->root.type == bfd_link_hash_indirect) return TRUE; - if (readonly_dynrelocs (h)) + if (readonly_dynrelocs (h, info, TRUE)) { ((struct bfd_link_info *) info)->flags |= DF_TEXTREL;