* bfd/aoutx.h (swap_std_reloc_out): Use bfd_asymbol_flavour.

* ld/emultempl/amiga.em (amiga_assign_attribute): Use bfd_get_flavour.
* ld/ldctor.c (ldctor_build_sets): Likewise.
This commit is contained in:
Gunther Nikl 2008-12-23 16:23:14 +00:00
parent 895c223cb3
commit 31f7d6e4ba
3 changed files with 4 additions and 4 deletions

View File

@ -2070,7 +2070,7 @@ NAME(aout,swap_std_reloc_out) (abfd, g, natptr)
r_pcrel = (int) g->howto->pc_relative; /* Relative to PC? */
#if 1
/* FIXME! "#if 1" is the wrong way to select this Amiga specific code. */
switch (bfd_asymbol_bfd(sym)->xvec->flavour)
switch (bfd_asymbol_flavour(sym))
{
case bfd_target_amiga_flavour:
case bfd_target_aout_flavour:

View File

@ -173,7 +173,7 @@ amiga_assign_attribute (inp)
{
asection *s;
if (inp->the_bfd->xvec->flavour==bfd_target_amiga_flavour)
if (bfd_get_flavour(inp->the_bfd)==bfd_target_amiga_flavour)
{
for (s=inp->the_bfd->sections;s!=NULL;s=s->next)
amiga_per_section(s)->attribute=inp->amiga_attribute;

View File

@ -269,7 +269,7 @@ ldctor_build_sets ()
/* dgv -- libnix v1.1 uses absolute sets that are also explicitly
defined in the library so that the sets need to be build even
if the symbol is defined */
if ((output_bfd->xvec->flavour != bfd_target_amiga_flavour) &&
if ((bfd_get_flavour (output_bfd) != bfd_target_amiga_flavour) &&
(p->h->type == bfd_link_hash_defined
|| p->h->type == bfd_link_hash_defweak))
continue;
@ -378,7 +378,7 @@ ldctor_build_sets ()
/* dgv -- on the amiga, we want the constructors to be relocateable
objects. However, this should be arranged somewhere else (FIXME) */
if (link_info.relocateable ||
(output_bfd->xvec->flavour == bfd_target_amiga_flavour &&
(bfd_get_flavour (output_bfd) == bfd_target_amiga_flavour &&
e->section != bfd_abs_section_ptr))
lang_add_reloc (p->reloc, howto, e->section, e->name,
exp_intop (e->value));