Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge r1.10 from the main in-tree binutils version: 

More detailed error messages for text relocations on ppc code. Tested by
joerg@
This commit is contained in:
joerg 2016-11-06 23:46:01 +00:00
parent d74117acef
commit c4414c4118
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
external/gpl3/binutils.old/dist/bfd/elf32-ppc.c vendored
View File

@ -5483,7 +5483,7 @@ ppc_elf_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED,
/* Return true if we have dynamic relocs that apply to read-only sections. */ /* Return true if we have dynamic relocs that apply to read-only sections. */
static bfd_boolean 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; struct elf_dyn_relocs *p;
@ -5494,8 +5494,17 @@ readonly_dynrelocs (struct elf_link_hash_entry *h)
if (s != NULL if (s != NULL
&& ((s->flags & (SEC_READONLY | SEC_ALLOC)) && ((s->flags & (SEC_READONLY | SEC_ALLOC))
== (SEC_READONLY | SEC_ALLOC))) == (SEC_READONLY | SEC_ALLOC)))
{
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 TRUE;
} }
}
return FALSE; return FALSE;
} }
@ -5568,7 +5577,7 @@ ppc_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
&& h->type != STT_GNU_IFUNC && h->type != STT_GNU_IFUNC
&& !htab->is_vxworks && !htab->is_vxworks
&& !ppc_elf_hash_entry (h)->has_sda_refs && !ppc_elf_hash_entry (h)->has_sda_refs
&& !readonly_dynrelocs (h)) && !readonly_dynrelocs (h, info, FALSE))
{ {
h->pointer_equality_needed = 0; h->pointer_equality_needed = 0;
h->non_got_ref = 0; h->non_got_ref = 0;
@ -5588,7 +5597,7 @@ ppc_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
&& h->type != STT_GNU_IFUNC && h->type != STT_GNU_IFUNC
&& !htab->is_vxworks && !htab->is_vxworks
&& !ppc_elf_hash_entry (h)->has_sda_refs && !ppc_elf_hash_entry (h)->has_sda_refs
&& !readonly_dynrelocs (h)) && !readonly_dynrelocs (h, info, FALSE))
h->non_got_ref = 0; h->non_got_ref = 0;
} }
h->protected_def = 0; h->protected_def = 0;
@ -5665,7 +5674,7 @@ ppc_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
&& !ppc_elf_hash_entry (h)->has_sda_refs && !ppc_elf_hash_entry (h)->has_sda_refs
&& !htab->is_vxworks && !htab->is_vxworks
&& !h->def_regular && !h->def_regular
&& !readonly_dynrelocs (h)) && !readonly_dynrelocs (h, info, FALSE))
{ {
h->non_got_ref = 0; h->non_got_ref = 0;
return TRUE; return TRUE;
@ -6175,7 +6184,7 @@ maybe_set_textrel (struct elf_link_hash_entry *h, void *info)
if (h->root.type == bfd_link_hash_indirect) if (h->root.type == bfd_link_hash_indirect)
return TRUE; return TRUE;
if (readonly_dynrelocs (h)) if (readonly_dynrelocs (h, info, TRUE))
{ {
((struct bfd_link_info *) info)->flags |= DF_TEXTREL; ((struct bfd_link_info *) info)->flags |= DF_TEXTREL;

19
external/gpl3/binutils.old/dist/bfd/elf64-ppc.c vendored
View File

@ -7103,7 +7103,7 @@ ppc64_elf_func_desc_adjust (bfd *obfd ATTRIBUTE_UNUSED,
/* Return true if we have dynamic relocs that apply to read-only sections. */ /* Return true if we have dynamic relocs that apply to read-only sections. */
static bfd_boolean 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 ppc_link_hash_entry *eh;
struct elf_dyn_relocs *p; struct elf_dyn_relocs *p;
@ -7114,8 +7114,17 @@ readonly_dynrelocs (struct elf_link_hash_entry *h)
asection *s = p->sec->output_section; asection *s = p->sec->output_section;
if (s != NULL && (s->flags & SEC_READONLY) != 0) if (s != NULL && (s->flags & SEC_READONLY) != 0)
{
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 TRUE;
} }
}
return FALSE; return FALSE;
} }
@ -7166,7 +7175,7 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
be used instead. */ be used instead. */
if (h->pointer_equality_needed if (h->pointer_equality_needed
&& h->type != STT_GNU_IFUNC && h->type != STT_GNU_IFUNC
&& !readonly_dynrelocs (h)) && !readonly_dynrelocs (h, info, FALSE))
{ {
h->pointer_equality_needed = 0; h->pointer_equality_needed = 0;
h->non_got_ref = 0; h->non_got_ref = 0;
@ -7184,7 +7193,7 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
else if (!h->ref_regular_nonweak else if (!h->ref_regular_nonweak
&& h->non_got_ref && h->non_got_ref
&& h->type != STT_GNU_IFUNC && h->type != STT_GNU_IFUNC
&& !readonly_dynrelocs (h)) && !readonly_dynrelocs (h, info, FALSE))
h->non_got_ref = 0; h->non_got_ref = 0;
/* If making a plt entry, then we don't need copy relocs. */ /* If making a plt entry, then we don't need copy relocs. */
@ -7233,7 +7242,7 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
/* If we didn't find any dynamic relocs in read-only sections, then /* 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. */ 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; h->non_got_ref = 0;
return TRUE; return TRUE;
@ -9841,7 +9850,7 @@ maybe_set_textrel (struct elf_link_hash_entry *h, void *info)
if (h->root.type == bfd_link_hash_indirect) if (h->root.type == bfd_link_hash_indirect)
return TRUE; return TRUE;
if (readonly_dynrelocs (h)) if (readonly_dynrelocs (h, info, TRUE))
{ {
((struct bfd_link_info *) info)->flags |= DF_TEXTREL; ((struct bfd_link_info *) info)->flags |= DF_TEXTREL;