summaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorKazu Hirata <kazu@codesourcery.com>2007-01-08 18:42:37 +0000
committerKazu Hirata <kazu@codesourcery.com>2007-01-08 18:42:37 +0000
commit3bdcfdf41f04c851af504aa0b653e0c806a930f4 (patch)
treec3b84f2be979ef63edfcca340ffb50b340af54fa /binutils
parent00fa51f6801ada6b33763db75f5cdab6c74ea90b (diff)
downloadbinutils-gdb-3bdcfdf41f04c851af504aa0b653e0c806a930f4.tar.gz
bfd/
* archures.c (bfd_mach_cpu32_fido): Rename to bfd_mach_fido. * bfd-in2.h: Regenerate. * cpu-m68k.c (arch_info_struct): Use bfd_mach_fido instead of bfd_mach_cpu32_fido. (m68k_arch_features): Use fido_a instead of cpu32. (bfd_m68k_compatible): Reject the combination of Fido and ColdFire. Accept the combination of CPU32 and Fido with a warning. * elf32-m68k.c (elf32_m68k_object_p, elf32_m68k_merge_private_bfd_data, elf32_m68k_print_private_bfd_data): Treat Fido as an architecture by itself. binutils/ * readelf.c (get_machine_flags): Treat Fido as an architecture by itself. gas/ * config/tc-m68k.c (m68k_archs, m68k_cpus): Treat Fido as an architecture by itself. (m68k_ip): Don't issue a warning for tbl instructions on fido. (m68k_elf_final_processing): Treat Fido as an architecture by itself. include/elf/ * m68k.h (EF_M68K_FIDO): New. (EF_M68K_ARCH_MASK): OR EF_M68K_FIDO. (EF_M68K_CPU32_FIDO_A, EF_M68K_CPU32_MASK): Remove. include/opcode/ * m68k.h (m68010up): OR fido_a. opcodes/ * m68k-opc.c (m68k_opcodes): Replace cpu32 with cpu32 | fido_a except on tbl instructions.
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog5
-rw-r--r--binutils/readelf.c8
2 files changed, 8 insertions, 5 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 33ae9043ddb..893c00b7686 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-08 Kazu Hirata <kazu@codesourcery.com>
+
+ * readelf.c (get_machine_flags): Treat Fido as an architecture
+ by itself.
+
2007-01-08 Kai Tietz <kai.tietz@onevision.com>
* configure.in: Renamed target x86_64-*-mingw64 to
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 2aa6ef0e2f3..8f19a32ed41 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -2015,11 +2015,9 @@ get_machine_flags (unsigned e_flags, unsigned e_machine)
if ((e_flags & EF_M68K_ARCH_MASK) == EF_M68K_M68000)
strcat (buf, ", m68000");
else if ((e_flags & EF_M68K_ARCH_MASK) == EF_M68K_CPU32)
- {
- strcat (buf, ", cpu32");
- if (e_flags & EF_M68K_CPU32_FIDO_A)
- strcat (buf, ", fido_a");
- }
+ strcat (buf, ", cpu32");
+ else if ((e_flags & EF_M68K_ARCH_MASK) == EF_M68K_FIDO)
+ strcat (buf, ", fido_a");
else
{
char const *isa = _("unknown");