Index: bfd/elf32-score7.c |
diff --git a/bfd/elf32-score7.c b/bfd/elf32-score7.c |
index 3615a1e7b57c1d3b29f82fb7c4ccdc21441da0af..c75c7038489371eb776311d030f34e341dd11471 100644 |
--- a/bfd/elf32-score7.c |
+++ b/bfd/elf32-score7.c |
@@ -2641,6 +2641,10 @@ s7_bfd_score_elf_check_relocs (bfd *abfd, |
{ |
while (h->root.type == bfd_link_hash_indirect) |
h = (struct elf_link_hash_entry *) h->root.u.i.link; |
+ |
+ /* PR15323, ref flags aren't set for references in the |
+ same object. */ |
+ h->root.non_ir_ref = 1; |
} |
} |
@@ -3345,7 +3349,8 @@ s7_bfd_score_elf_finish_dynamic_symbol (bfd *output_bfd, |
/* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute. */ |
name = h->root.root.string; |
- if (strcmp (name, "_DYNAMIC") == 0 || strcmp (name, "_GLOBAL_OFFSET_TABLE_") == 0) |
+ if (h == elf_hash_table (info)->hdynamic |
+ || h == elf_hash_table (info)->hgot) |
sym->st_shndx = SHN_ABS; |
else if (strcmp (name, "_DYNAMIC_LINK") == 0) |
{ |
@@ -3721,10 +3726,10 @@ s7_bfd_score_elf_grok_prstatus (bfd *abfd, Elf_Internal_Note *note) |
case 272: /* Linux/Score elf_prstatus */ |
/* pr_cursig */ |
- elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12); |
+ elf_tdata (abfd)->core->signal = bfd_get_16 (abfd, note->descdata + 12); |
/* pr_pid */ |
- elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 24); |
+ elf_tdata (abfd)->core->lwpid = bfd_get_32 (abfd, note->descdata + 24); |
/* pr_reg */ |
offset = 72; |
@@ -3736,7 +3741,8 @@ s7_bfd_score_elf_grok_prstatus (bfd *abfd, Elf_Internal_Note *note) |
} |
/* Make a ".reg/999" section. */ |
- return _bfd_elfcore_make_pseudosection (abfd, ".reg", raw_size, note->descpos + offset); |
+ return _bfd_elfcore_make_pseudosection (abfd, ".reg", raw_size, |
+ note->descpos + offset); |
} |
bfd_boolean |
@@ -3749,10 +3755,12 @@ s7_bfd_score_elf_grok_psinfo (bfd *abfd, Elf_Internal_Note *note) |
case 128: /* Linux/Score elf_prpsinfo. */ |
/* pr_fname */ |
- elf_tdata (abfd)->core_program = _bfd_elfcore_strndup (abfd, note->descdata + 32, 16); |
+ elf_tdata (abfd)->core->program |
+ = _bfd_elfcore_strndup (abfd, note->descdata + 32, 16); |
/* pr_psargs */ |
- elf_tdata (abfd)->core_command = _bfd_elfcore_strndup (abfd, note->descdata + 48, 80); |
+ elf_tdata (abfd)->core->command |
+ = _bfd_elfcore_strndup (abfd, note->descdata + 48, 80); |
break; |
} |
@@ -3761,7 +3769,7 @@ s7_bfd_score_elf_grok_psinfo (bfd *abfd, Elf_Internal_Note *note) |
implementations, so strip it off if it exists. */ |
{ |
- char *command = elf_tdata (abfd)->core_command; |
+ char *command = elf_tdata (abfd)->core->command; |
int n = strlen (command); |
if (0 < n && command[n - 1] == ' ') |