diff options
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 4 | ||||
| -rw-r--r-- | bfd/elf32-m68k.c | 48 |
2 files changed, 28 insertions, 24 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 5e41f14..6d06afc 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2006-12-07 Kazu Hirata <kazu@codesourcery.com> + + * elf32-m68k.c: Update uses of EF_M68K_*. + 2006-12-07 H.J. Lu <hjl@gnu.org> PR ld/3666 diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c index 81d219d..4820e47 100644 --- a/bfd/elf32-m68k.c +++ b/bfd/elf32-m68k.c @@ -433,36 +433,36 @@ elf32_m68k_object_p (bfd *abfd) features |= m68000; else if (eflags & EF_M68K_CPU32) features |= cpu32; - else if (eflags & EF_M68K_ISA_MASK) + else if (eflags & EF_M68K_CF_ISA_MASK) { - switch (eflags & EF_M68K_ISA_MASK) + switch (eflags & EF_M68K_CF_ISA_MASK) { - case EF_M68K_ISA_A_NODIV: + case EF_M68K_CF_ISA_A_NODIV: features |= mcfisa_a; break; - case EF_M68K_ISA_A: + case EF_M68K_CF_ISA_A: features |= mcfisa_a|mcfhwdiv; break; - case EF_M68K_ISA_A_PLUS: + case EF_M68K_CF_ISA_A_PLUS: features |= mcfisa_a|mcfisa_aa|mcfhwdiv|mcfusp; break; - case EF_M68K_ISA_B_NOUSP: + case EF_M68K_CF_ISA_B_NOUSP: features |= mcfisa_a|mcfisa_b|mcfhwdiv; break; - case EF_M68K_ISA_B: + case EF_M68K_CF_ISA_B: features |= mcfisa_a|mcfisa_b|mcfhwdiv|mcfusp; break; } - switch (eflags & EF_M68K_MAC_MASK) + switch (eflags & EF_M68K_CF_MAC_MASK) { - case EF_M68K_MAC: + case EF_M68K_CF_MAC: features |= mcfmac; break; - case EF_M68K_EMAC: + case EF_M68K_CF_EMAC: features |= mcfemac; break; } - if (eflags & EF_M68K_FLOAT) + if (eflags & EF_M68K_CF_FLOAT) features |= cfloat; } @@ -518,8 +518,8 @@ elf32_m68k_merge_private_bfd_data (ibfd, obfd) else { out_flags = elf_elfheader (obfd)->e_flags; - in_isa = (in_flags & EF_M68K_ISA_MASK); - out_isa = (out_flags & EF_M68K_ISA_MASK); + in_isa = (in_flags & EF_M68K_CF_ISA_MASK); + out_isa = (out_flags & EF_M68K_CF_ISA_MASK); if (in_isa > out_isa) out_flags ^= in_isa ^ out_isa; out_flags |= in_flags ^ in_isa; @@ -557,44 +557,44 @@ elf32_m68k_print_private_bfd_data (abfd, ptr) if (eflags & EF_M68K_CFV4E) fprintf (file, " [cfv4e]"); - if (eflags & EF_M68K_ISA_MASK) + if (eflags & EF_M68K_CF_ISA_MASK) { char const *isa = _("unknown"); char const *mac = _("unknown"); char const *additional = ""; - switch (eflags & EF_M68K_ISA_MASK) + switch (eflags & EF_M68K_CF_ISA_MASK) { - case EF_M68K_ISA_A_NODIV: + case EF_M68K_CF_ISA_A_NODIV: isa = "A"; additional = " [nodiv]"; break; - case EF_M68K_ISA_A: + case EF_M68K_CF_ISA_A: isa = "A"; break; - case EF_M68K_ISA_A_PLUS: + case EF_M68K_CF_ISA_A_PLUS: isa = "A+"; break; - case EF_M68K_ISA_B_NOUSP: + case EF_M68K_CF_ISA_B_NOUSP: isa = "B"; additional = " [nousp]"; break; - case EF_M68K_ISA_B: + case EF_M68K_CF_ISA_B: isa = "B"; break; } fprintf (file, " [isa %s]%s", isa, additional); - if (eflags & EF_M68K_FLOAT) + if (eflags & EF_M68K_CF_FLOAT) fprintf (file, " [float]"); - switch (eflags & EF_M68K_MAC_MASK) + switch (eflags & EF_M68K_CF_MAC_MASK) { case 0: mac = NULL; break; - case EF_M68K_MAC: + case EF_M68K_CF_MAC: mac = "mac"; break; - case EF_M68K_EMAC: + case EF_M68K_CF_EMAC: mac = "emac"; break; } |