diff options
| author | Ian Lance Taylor <ian@airs.com> | 1996-01-29 20:01:29 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 1996-01-29 20:01:29 +0000 |
| commit | 53787b2316b0e9b4f166efc87f88748c46263096 (patch) | |
| tree | 9e046118b9fb0ff1095502490b0956f948f3b784 /bfd/elf32-m68k.c | |
| parent | bdd2e7f1797de0511de1708366dcb146e806c329 (diff) | |
| download | gdb-53787b2316b0e9b4f166efc87f88748c46263096.zip gdb-53787b2316b0e9b4f166efc87f88748c46263096.tar.gz gdb-53787b2316b0e9b4f166efc87f88748c46263096.tar.bz2 | |
* elf32-i386.c (elf_i386_relocate_section): If -Bsymbolic, when
copying relocs into a shared object, treat a defined global symbol
as a local symbol.
* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
* elf32-mips.c (mips_elf_relocate_section): Likewise.
* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
Diffstat (limited to 'bfd/elf32-m68k.c')
| -rw-r--r-- | bfd/elf32-m68k.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c index 35d6c09..d712569 100644 --- a/bfd/elf32-m68k.c +++ b/bfd/elf32-m68k.c @@ -1,5 +1,5 @@ /* Motorola 68k series support for 32-bit ELF - Copyright 1993 Free Software Foundation, Inc. + Copyright 1993, 1995, 1996 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -898,6 +898,9 @@ elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section, || (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)) || (info->shared + && (! info->symbolic + || (h->elf_link_hash_flags + & ELF_LINK_HASH_DEF_REGULAR) == 0) && (input_section->flags & SEC_ALLOC) != 0 && (r_type == R_68K_8 || r_type == R_68K_16 @@ -1142,7 +1145,10 @@ elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section, outrel.r_offset = (rel->r_offset + input_section->output_section->vma + input_section->output_offset); - if (h != NULL) + if (h != NULL + && (! info->symbolic + || (h->elf_link_hash_flags + & ELF_LINK_HASH_DEF_REGULAR) == 0)) { BFD_ASSERT (h->dynindx != -1); outrel.r_info = ELF32_R_INFO (h->dynindx, r_type); @@ -1159,11 +1165,15 @@ elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section, { long indx; - sym = local_syms + r_symndx; - - BFD_ASSERT (ELF_ST_TYPE (sym->st_info) == STT_SECTION); - - sec = local_sections[r_symndx]; + if (h == NULL) + sec = local_sections[r_symndx]; + else + { + BFD_ASSERT (h->root.type == bfd_link_hash_defined + || (h->root.type + == bfd_link_hash_defweak)); + sec = h->root.u.def.section; + } if (sec != NULL && bfd_is_abs_section (sec)) indx = 0; else if (sec == NULL || sec->owner == NULL) |