diff options
| author | Kazu Hirata <kazu@codesourcery.com> | 2007-01-08 18:42:37 +0000 |
|---|---|---|
| committer | Kazu Hirata <kazu@codesourcery.com> | 2007-01-08 18:42:37 +0000 |
| commit | 3bdcfdf41f04c851af504aa0b653e0c806a930f4 (patch) | |
| tree | c3b84f2be979ef63edfcca340ffb50b340af54fa /gas/config | |
| parent | 00fa51f6801ada6b33763db75f5cdab6c74ea90b (diff) | |
| download | gdb-3bdcfdf41f04c851af504aa0b653e0c806a930f4.zip gdb-3bdcfdf41f04c851af504aa0b653e0c806a930f4.tar.gz gdb-3bdcfdf41f04c851af504aa0b653e0c806a930f4.tar.bz2 | |
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 'gas/config')
| -rw-r--r-- | gas/config/tc-m68k.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c index 661c99c..c0aba89 100644 --- a/gas/config/tc-m68k.c +++ b/gas/config/tc-m68k.c @@ -425,7 +425,7 @@ static const struct m68k_cpu m68k_archs[] = {m68040, m68040_ctrl, "68040", 0}, {m68060, m68060_ctrl, "68060", 0}, {cpu32|m68881, cpu32_ctrl, "cpu32", 0}, - {cpu32|fido_a, fido_ctrl, "fidoa", 0}, + {fido_a, fido_ctrl, "fidoa", 0}, {mcfisa_a|mcfhwdiv, NULL, "isaa", 0}, {mcfisa_a|mcfhwdiv|mcfisa_aa|mcfusp, NULL, "isaaplus", 0}, {mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp, NULL, "isab", 0}, @@ -557,7 +557,7 @@ static const struct m68k_cpu m68k_cpus[] = {mcfisa_a|mcfisa_b|mcfhwdiv|mcfemac|mcfusp|cfloat, mcfv4e_ctrl, "5485", -1}, {mcfisa_a|mcfisa_b|mcfhwdiv|mcfemac|mcfusp|cfloat, mcfv4e_ctrl, "548x", 0}, - {cpu32|fido_a, fido_ctrl, "fido", 1}, + {fido_a, fido_ctrl, "fido", 1}, {0,NULL,NULL, 0} }; @@ -7514,11 +7514,9 @@ m68k_elf_final_processing (void) flags |= EF_M68K_CFV4E; /* Set file-specific flags if this is a cpu32 processor. */ if (cpu_of_arch (current_architecture) & cpu32) - { - flags |= EF_M68K_CPU32; - if (cpu_of_arch (current_architecture) & fido_a) - flags |= EF_M68K_CPU32_FIDO_A; - } + flags |= EF_M68K_CPU32; + else if (cpu_of_arch (current_architecture) & fido_a) + flags |= EF_M68K_FIDO; else if ((cpu_of_arch (current_architecture) & m68000up) && !(cpu_of_arch (current_architecture) & m68020up)) flags |= EF_M68K_M68000; |