* elflink.h (elf_link_input_bfd): Remove BFD_VERSION_DATE dependent

code.
This commit is contained in:
Alan Modra
2002-10-07 00:14:28 +00:00
parent a16d5acb50
commit a6b511bd9e
2 changed files with 3 additions and 16 deletions

View File

@ -1,5 +1,8 @@
2002-10-07 Alan Modra <amodra@bigpond.net.au> 2002-10-07 Alan Modra <amodra@bigpond.net.au>
* elflink.h (elf_link_input_bfd): Remove BFD_VERSION_DATE dependent
code.
* elf64-ppc.c (ppc64_elf_build_stubs): Increment .glink indx. * elf64-ppc.c (ppc64_elf_build_stubs): Increment .glink indx.
2002-10-06 Alan Modra <amodra@bigpond.net.au> 2002-10-06 Alan Modra <amodra@bigpond.net.au>

View File

@ -6815,20 +6815,12 @@ elf_link_input_bfd (finfo, input_bfd)
|| h->root.type == bfd_link_hash_defweak) || h->root.type == bfd_link_hash_defweak)
&& elf_discarded_section (h->root.u.def.section)) && elf_discarded_section (h->root.u.def.section))
{ {
#if BFD_VERSION_DATE < 20031005
if ((o->flags & SEC_DEBUGGING) != 0) if ((o->flags & SEC_DEBUGGING) != 0)
{ {
#if BFD_VERSION_DATE > 20021005
(*finfo->info->callbacks->warning)
(finfo->info,
_("warning: relocation against removed section; zeroing"),
NULL, input_bfd, o, rel->r_offset);
#endif
BFD_ASSERT (r_symndx != 0); BFD_ASSERT (r_symndx != 0);
memset (rel, 0, sizeof (*rel)); memset (rel, 0, sizeof (*rel));
} }
else else
#endif
{ {
if (! ((*finfo->info->callbacks->undefined_symbol) if (! ((*finfo->info->callbacks->undefined_symbol)
(finfo->info, h->root.root.string, (finfo->info, h->root.root.string,
@ -6844,23 +6836,15 @@ elf_link_input_bfd (finfo, input_bfd)
if (sec != NULL && elf_discarded_section (sec)) if (sec != NULL && elf_discarded_section (sec))
{ {
#if BFD_VERSION_DATE < 20031005
if ((o->flags & SEC_DEBUGGING) != 0 if ((o->flags & SEC_DEBUGGING) != 0
|| (sec->flags & SEC_LINK_ONCE) != 0) || (sec->flags & SEC_LINK_ONCE) != 0)
{ {
#if BFD_VERSION_DATE > 20021005
(*finfo->info->callbacks->warning)
(finfo->info,
_("warning: relocation against removed section"),
NULL, input_bfd, o, rel->r_offset);
#endif
BFD_ASSERT (r_symndx != 0); BFD_ASSERT (r_symndx != 0);
rel->r_info rel->r_info
= ELF_R_INFO (0, ELF_R_TYPE (rel->r_info)); = ELF_R_INFO (0, ELF_R_TYPE (rel->r_info));
rel->r_addend = 0; rel->r_addend = 0;
} }
else else
#endif
{ {
boolean ok; boolean ok;
const char *msg const char *msg