OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Always set machine type based on cpu_variant.

This commit is contained in:
Nick Clifton 2001-03-12 23:37:39 +00:00
parent b7498e0ef0
commit 83e7603d4f
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gas/ChangeLog
View File

@ -1,3 +1,8 @@
2001-03-12 Nick Clifton <nickc@redhat.com>
* config/tc-arm.c (md_begin): Always set machine type based on
cpu_variant.
2001-03-07 Alan Modra <alan@linuxcare.com.au>
* config/tc-i386.c (struct _i386_insn): Rename disp_reloc to reloc.

39
gas/config/tc-arm.c
View File

@ -6513,29 +6513,26 @@ md_begin ()
}
/* Catch special cases. */
if (cpu_variant != (FPU_DEFAULT | CPU_DEFAULT))
if (cpu_variant & ARM_EXT_XSCALE)
mach = bfd_mach_arm_XScale;
else if (cpu_variant & ARM_EXT_V5E)
mach = bfd_mach_arm_5TE;
else if (cpu_variant & ARM_EXT_V5)
{
if (cpu_variant & ARM_EXT_XSCALE)
mach = bfd_mach_arm_XScale;
else if (cpu_variant & ARM_EXT_V5E)
mach = bfd_mach_arm_5TE;
else if (cpu_variant & ARM_EXT_V5)
{
if (cpu_variant & ARM_EXT_THUMB)
mach = bfd_mach_arm_5T;
else
mach = bfd_mach_arm_5;
}
else if (cpu_variant & ARM_EXT_HALFWORD)
{
if (cpu_variant & ARM_EXT_THUMB)
mach = bfd_mach_arm_4T;
else
mach = bfd_mach_arm_4;
}
else if (cpu_variant & ARM_EXT_LONGMUL)
mach = bfd_mach_arm_3M;
if (cpu_variant & ARM_EXT_THUMB)
mach = bfd_mach_arm_5T;
else
mach = bfd_mach_arm_5;
}
else if (cpu_variant & ARM_EXT_HALFWORD)
{
if (cpu_variant & ARM_EXT_THUMB)
mach = bfd_mach_arm_4T;
else
mach = bfd_mach_arm_4;
}
else if (cpu_variant & ARM_EXT_LONGMUL)
mach = bfd_mach_arm_3M;
bfd_set_arch_mach (stdoutput, TARGET_ARCH, mach);
}