diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2005-01-11 09:32:53 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2005-01-11 09:32:53 +0000 |
| commit | cef27e59e3fe874c4afb3481acd94aee850dfdd8 (patch) | |
| tree | fc0b699f53abf401d70a716d4ed16a33004bcdb8 /bfd/elf32-m68k.c | |
| parent | e5542126197fc54a9b8a8543ab4322d4f274d3c3 (diff) | |
| download | gdb-cef27e59e3fe874c4afb3481acd94aee850dfdd8.tar.gz | |
* elf64-ppc.c (ppc64_elf_gc_sweep_hook): Follow indirect and warning
symbols.
* elf32-arm.c (elf32_arm_gc_sweep_hook): Likewise.
* elf32-cris.c (cris_elf_gc_sweep_hook): Likewise.
* elf32-hppa.c (elf32_hppa_gc_sweep_hook): Likewise.
* elf32-i386.c (elf_i386_gc_sweep_hook): Likewise.
* elf32-m32r.c (m32r_elf_gc_sweep_hook): Likewise.
* elf32-m68k.c (elf_m68k_gc_sweep_hook): Likewise.
* elf32-ppc.c (ppc_elf_gc_sweep_hook): Likewise.
* elf32-s390.c (elf_s390_gc_sweep_hook): Likewise.
* elf32-sh.c (sh_elf_gc_sweep_hook): Likewise.
* elf32-sparc.c (elf32_sparc_gc_sweep_hook): Likewise.
* elf32-vax.c (elf_vax_gc_sweep_hook): Likewise.
* elf32-xtensa.c (elf_xtensa_gc_sweep_hook): Likewise.
* elf64-s390.c (elf_s390_gc_sweep_hook): Likewise.
* elf64-x86-64.c (elf64_x86_64_gc_sweep_hook): Likewise.
Diffstat (limited to 'bfd/elf32-m68k.c')
| -rw-r--r-- | bfd/elf32-m68k.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c index 44863f2d5a6..53ea5878ae6 100644 --- a/bfd/elf32-m68k.c +++ b/bfd/elf32-m68k.c @@ -1,6 +1,6 @@ /* Motorola 68k series support for 32-bit ELF Copyright 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004 Free Software Foundation, Inc. + 2004, 2005 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -835,7 +835,16 @@ elf_m68k_gc_sweep_hook (abfd, info, sec, relocs) for (rel = relocs; rel < relend; rel++) { unsigned long r_symndx; - struct elf_link_hash_entry *h; + struct elf_link_hash_entry *h = NULL; + + r_symndx = ELF32_R_SYM (rel->r_info); + if (r_symndx >= symtab_hdr->sh_info) + { + h = sym_hashes[r_symndx - symtab_hdr->sh_info]; + while (h->root.type == bfd_link_hash_indirect + || h->root.type == bfd_link_hash_warning) + h = (struct elf_link_hash_entry *) h->root.u.i.link; + } switch (ELF32_R_TYPE (rel->r_info)) { @@ -845,10 +854,8 @@ elf_m68k_gc_sweep_hook (abfd, info, sec, relocs) case R_68K_GOT8O: case R_68K_GOT16O: case R_68K_GOT32O: - r_symndx = ELF32_R_SYM (rel->r_info); - if (r_symndx >= symtab_hdr->sh_info) + if (h != NULL) { - h = sym_hashes[r_symndx - symtab_hdr->sh_info]; if (h->got.refcount > 0) { --h->got.refcount; @@ -888,10 +895,8 @@ elf_m68k_gc_sweep_hook (abfd, info, sec, relocs) case R_68K_8: case R_68K_16: case R_68K_32: - r_symndx = ELF32_R_SYM (rel->r_info); - if (r_symndx >= symtab_hdr->sh_info) + if (h != NULL) { - h = sym_hashes[r_symndx - symtab_hdr->sh_info]; if (h->plt.refcount > 0) --h->plt.refcount; } |