From 5c6b48aa388b9fee5068a9d3a6850387f9c37a8d Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Fri, 17 Nov 2006 14:21:51 +0000 Subject: bfd/ * elf32-m68k.c: Update uses of EF_M68K_*. binutils/ * readelf.c: Update uses of EF_M68K_*. gas/ * config/tc-m68k.c: Update uses of EF_M68K_*. include/elf * m68k.h (EF_M68K_ISA_MASK, EF_M68K_ISA_A_NODIV, EF_M68K_ISA_A, EF_M68K_ISA_A_PLUS, EF_M68K_ISA_B_NOUSP, EF_M68K_ISA_B, EF_M68K_ISA_C, EF_M68K_MAC_MASK, EF_M68K_MAC, EF_M68K_EMAC, EF_M68K_EMAC_B, EF_M68K_FLOAT): Rename to EF_M68K_CF_ISA_MASK, EF_M68K_CF_ISA_A_NODIV, EF_M68K_CF_ISA_A, EF_M68K_CF_ISA_A_PLUS, EF_M68K_CF_ISA_B_NOUSP, EF_M68K_CF_ISA_B, EF_M68K_CF_ISA_C, EF_M68K_CF_MAC_MASK, EF_M68K_CF_MAC, EF_M68K_CF_EMAC, EF_M68K_CF_EMAC_B, EF_M68K_CF_FLOAT, respectively. --- ChangeLog.csl | 22 ++++++++++++++++++++++ bfd/elf32-m68k.c | 48 ++++++++++++++++++++++++------------------------ include/elf/m68k.h | 24 ++++++++++++------------ 3 files changed, 58 insertions(+), 36 deletions(-) diff --git a/ChangeLog.csl b/ChangeLog.csl index ce11d26f003..89509cf2b7e 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,25 @@ +2006-11-17 Kazu Hirata + + bfd/ + * elf32-m68k.c: Update uses of EF_M68K_*. + + binutils/ + * readelf.c: Update uses of EF_M68K_*. + + gas/ + * config/tc-m68k.c: Update uses of EF_M68K_*. + + include/elf + * m68k.h (EF_M68K_ISA_MASK, EF_M68K_ISA_A_NODIV, + EF_M68K_ISA_A, EF_M68K_ISA_A_PLUS, EF_M68K_ISA_B_NOUSP, + EF_M68K_ISA_B, EF_M68K_ISA_C, EF_M68K_MAC_MASK, EF_M68K_MAC, + EF_M68K_EMAC, EF_M68K_EMAC_B, EF_M68K_FLOAT): Rename to + EF_M68K_CF_ISA_MASK, EF_M68K_CF_ISA_A_NODIV, EF_M68K_CF_ISA_A, + EF_M68K_CF_ISA_A_PLUS, EF_M68K_CF_ISA_B_NOUSP, + EF_M68K_CF_ISA_B, EF_M68K_CF_ISA_C, EF_M68K_CF_MAC_MASK, + EF_M68K_CF_MAC, EF_M68K_CF_EMAC, EF_M68K_CF_EMAC_B, + EF_M68K_CF_FLOAT, respectively. + 2006-11-16 Nathan Sidwell gas/testuite/ diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c index a60623ce562..daea4bdbfdc 100644 --- a/bfd/elf32-m68k.c +++ b/bfd/elf32-m68k.c @@ -445,36 +445,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; } @@ -530,8 +530,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; @@ -569,44 +569,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; } diff --git a/include/elf/m68k.h b/include/elf/m68k.h index 08d0c441988..4bc365321a3 100644 --- a/include/elf/m68k.h +++ b/include/elf/m68k.h @@ -58,18 +58,18 @@ END_RELOC_NUMBERS (R_68K_max) /* We use the bottom 8 bits to encode information about the coldfire variant. */ -#define EF_M68K_ISA_MASK 0x0F /* Which ISA */ -#define EF_M68K_ISA_A_NODIV 0x01 /* ISA A except for div */ -#define EF_M68K_ISA_A 0x02 -#define EF_M68K_ISA_A_PLUS 0x03 -#define EF_M68K_ISA_B_NOUSP 0x04 /* ISA_B except for USP */ -#define EF_M68K_ISA_B 0x05 -#define EF_M68K_ISA_C 0x06 -#define EF_M68K_MAC_MASK 0x30 -#define EF_M68K_MAC 0x10 /* MAC */ -#define EF_M68K_EMAC 0x20 /* EMAC */ -#define EF_M68K_EMAC_B 0x30 /* EMAC_B */ -#define EF_M68K_FLOAT 0x40 /* Has float insns */ +#define EF_M68K_CF_ISA_MASK 0x0F /* Which ISA */ +#define EF_M68K_CF_ISA_A_NODIV 0x01 /* ISA A except for div */ +#define EF_M68K_CF_ISA_A 0x02 +#define EF_M68K_CF_ISA_A_PLUS 0x03 +#define EF_M68K_CF_ISA_B_NOUSP 0x04 /* ISA_B except for USP */ +#define EF_M68K_CF_ISA_B 0x05 +#define EF_M68K_CF_ISA_C 0x06 +#define EF_M68K_CF_MAC_MASK 0x30 +#define EF_M68K_CF_MAC 0x10 /* MAC */ +#define EF_M68K_CF_EMAC 0x20 /* EMAC */ +#define EF_M68K_CF_EMAC_B 0x30 /* EMAC_B */ +#define EF_M68K_CF_FLOAT 0x40 /* Has float insns */ #define EF_M68K_CF_MASK 0xFF #endif -- cgit v1.2.1