* elf32-m68k.c (elf_m68k_discard_copies): Use SYMBOL_CALLS_LOCAL.
(elf_m68k_relocate_section): Use SYMBOL_CALLS_LOCAL and SYMBOL_REFERENCES_LOCAL. (elf_m68k_relocate_section): Likewise.
This commit is contained in:
parent
16a1d66ba6
commit
2516a1ee84
|
@ -1,3 +1,10 @@
|
||||||
|
2008-12-23 Andreas Schwab <schwab@suse.de>
|
||||||
|
|
||||||
|
* elf32-m68k.c (elf_m68k_discard_copies): Use SYMBOL_CALLS_LOCAL.
|
||||||
|
(elf_m68k_relocate_section): Use SYMBOL_CALLS_LOCAL and
|
||||||
|
SYMBOL_REFERENCES_LOCAL.
|
||||||
|
(elf_m68k_relocate_section): Likewise.
|
||||||
|
|
||||||
2008-12-23 Nick Clifton <nickc@redhat.com>
|
2008-12-23 Nick Clifton <nickc@redhat.com>
|
||||||
|
|
||||||
* elf-bfd.h (struct bfd_elf_section_data): Remove indirect_relocs
|
* elf-bfd.h (struct bfd_elf_section_data): Remove indirect_relocs
|
||||||
|
|
|
@ -2980,9 +2980,7 @@ elf_m68k_discard_copies (h, inf)
|
||||||
if (h->root.type == bfd_link_hash_warning)
|
if (h->root.type == bfd_link_hash_warning)
|
||||||
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
h = (struct elf_link_hash_entry *) h->root.u.i.link;
|
||||||
|
|
||||||
if (!h->def_regular
|
if (!SYMBOL_CALLS_LOCAL (info, h))
|
||||||
|| (!info->symbolic
|
|
||||||
&& !h->forced_local))
|
|
||||||
{
|
{
|
||||||
if ((info->flags & DF_TEXTREL) == 0)
|
if ((info->flags & DF_TEXTREL) == 0)
|
||||||
{
|
{
|
||||||
|
@ -3205,10 +3203,9 @@ elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section,
|
||||||
dyn = elf_hash_table (info)->dynamic_sections_created;
|
dyn = elf_hash_table (info)->dynamic_sections_created;
|
||||||
if (!WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
|
if (!WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
|
||||||
|| (info->shared
|
|| (info->shared
|
||||||
&& (info->symbolic
|
&& SYMBOL_REFERENCES_LOCAL (info, h))
|
||||||
|| h->dynindx == -1
|
|| (ELF_ST_VISIBILITY (h->other)
|
||||||
|| h->forced_local)
|
&& h->root.type == bfd_link_hash_undefweak))
|
||||||
&& h->def_regular))
|
|
||||||
{
|
{
|
||||||
/* This is actually a static link, or it is a
|
/* This is actually a static link, or it is a
|
||||||
-Bsymbolic link and the symbol is defined
|
-Bsymbolic link and the symbol is defined
|
||||||
|
@ -3348,17 +3345,12 @@ elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section,
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case R_68K_PC8:
|
|
||||||
case R_68K_PC16:
|
|
||||||
case R_68K_PC32:
|
|
||||||
if (h == NULL
|
|
||||||
|| (info->shared
|
|
||||||
&& h->forced_local))
|
|
||||||
break;
|
|
||||||
/* Fall through. */
|
|
||||||
case R_68K_8:
|
case R_68K_8:
|
||||||
case R_68K_16:
|
case R_68K_16:
|
||||||
case R_68K_32:
|
case R_68K_32:
|
||||||
|
case R_68K_PC8:
|
||||||
|
case R_68K_PC16:
|
||||||
|
case R_68K_PC32:
|
||||||
if (info->shared
|
if (info->shared
|
||||||
&& r_symndx != 0
|
&& r_symndx != 0
|
||||||
&& (input_section->flags & SEC_ALLOC) != 0
|
&& (input_section->flags & SEC_ALLOC) != 0
|
||||||
|
@ -3368,10 +3360,7 @@ elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section,
|
||||||
&& ((r_type != R_68K_PC8
|
&& ((r_type != R_68K_PC8
|
||||||
&& r_type != R_68K_PC16
|
&& r_type != R_68K_PC16
|
||||||
&& r_type != R_68K_PC32)
|
&& r_type != R_68K_PC32)
|
||||||
|| (h != NULL
|
|| !SYMBOL_CALLS_LOCAL (info, h)))
|
||||||
&& h->dynindx != -1
|
|
||||||
&& (!info->symbolic
|
|
||||||
|| !h->def_regular))))
|
|
||||||
{
|
{
|
||||||
Elf_Internal_Rela outrel;
|
Elf_Internal_Rela outrel;
|
||||||
bfd_byte *loc;
|
bfd_byte *loc;
|
||||||
|
@ -3675,10 +3664,7 @@ elf_m68k_finish_dynamic_symbol (output_bfd, info, h, sym)
|
||||||
The entry in the global offset table will already have been
|
The entry in the global offset table will already have been
|
||||||
initialized in the relocate_section function. */
|
initialized in the relocate_section function. */
|
||||||
if (info->shared
|
if (info->shared
|
||||||
&& (info->symbolic
|
&& SYMBOL_REFERENCES_LOCAL (info, h))
|
||||||
|| h->dynindx == -1
|
|
||||||
|| h->forced_local)
|
|
||||||
&& h->def_regular)
|
|
||||||
{
|
{
|
||||||
rela.r_info = ELF32_R_INFO (0, R_68K_RELATIVE);
|
rela.r_info = ELF32_R_INFO (0, R_68K_RELATIVE);
|
||||||
rela.r_addend = bfd_get_signed_32 (output_bfd,
|
rela.r_addend = bfd_get_signed_32 (output_bfd,
|
||||||
|
|
Loading…
Reference in New Issue