diff options
| author | Hans-Peter Nilsson <hp@axis.com> | 2011-10-14 06:52:43 +0000 |
|---|---|---|
| committer | Hans-Peter Nilsson <hp@axis.com> | 2011-10-14 06:52:43 +0000 |
| commit | 6cb42442907274cb82d229fa04fdea38c00a3ab2 (patch) | |
| tree | 5400c4f4c3453e66877638a9363be1ddb3ee9c60 /bfd/elf32-cris.c | |
| parent | 187a4b98ea99d648cb9dd43c2d9fb282140a5b27 (diff) | |
| download | binutils-redhat-6cb42442907274cb82d229fa04fdea38c00a3ab2.tar.gz | |
* elf32-cris.c (cris_elf_gc_sweep_hook) <R_CRIS_16_GOTPLT>
<R_CRIS_32_GOTPLT>: Fix missing update of gotplt refcount for
global symbols.
<R_CRIS_8, R_CRIS_16, R_CRIS_32>: New cases for similar missing
updates of the plt refcount.
(elf_cris_adjust_gotplt_to_got): Assert integrity of the gotplt
refcount in relation to the plt refcount.
Diffstat (limited to 'bfd/elf32-cris.c')
| -rw-r--r-- | bfd/elf32-cris.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c index ea5043ac0f..243a8ec140 100644 --- a/bfd/elf32-cris.c +++ b/bfd/elf32-cris.c @@ -2663,6 +2663,9 @@ cris_elf_gc_sweep_hook (bfd *abfd, /* For local symbols, treat these like GOT relocs. */ if (h == NULL) goto local_got_reloc; + else + /* For global symbols, adjust the reloc-specific refcount. */ + elf_cris_hash_entry (h)->gotplt_refcount--; /* Fall through. */ case R_CRIS_32_PLT_GOTREL: @@ -2671,10 +2674,14 @@ cris_elf_gc_sweep_hook (bfd *abfd, local_got_refcounts[-1]--; /* Fall through. */ + case R_CRIS_8: + case R_CRIS_16: + case R_CRIS_32: case R_CRIS_8_PCREL: case R_CRIS_16_PCREL: case R_CRIS_32_PCREL: case R_CRIS_32_PLT_PCREL: + /* Negate the increment we did in cris_elf_check_relocs. */ if (h != NULL) { if (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT @@ -2733,6 +2740,11 @@ elf_cris_adjust_gotplt_to_got (h, p) { struct bfd_link_info *info = (struct bfd_link_info *) p; + /* A GOTPLT reloc, when activated, is supposed to be included into + the PLT refcount. */ + BFD_ASSERT (h->gotplt_refcount == 0 + || h->gotplt_refcount <= h->root.plt.refcount); + /* If nobody wanted a GOTPLT with this symbol, we're done. */ if (h->gotplt_refcount <= 0) return TRUE; |