aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2001-03-12 23:37:39 +0000
committerNick Clifton <nickc@redhat.com>2001-03-12 23:37:39 +0000
commit83e7603d4f1229f246ccd2c9f5ffb61d05662243 (patch)
tree342de614ac49a3cc51d4f4ec6a5931aeae0c953b /gas
parentb7498e0ef0edc97635348a318aff8b4f937a37b2 (diff)
downloadgdb-83e7603d4f1229f246ccd2c9f5ffb61d05662243.zip
gdb-83e7603d4f1229f246ccd2c9f5ffb61d05662243.tar.gz
gdb-83e7603d4f1229f246ccd2c9f5ffb61d05662243.tar.bz2
Always set machine type based on cpu_variant.
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/config/tc-arm.c39
2 files changed, 23 insertions, 21 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 9b9ab32..e88ebff 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -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.
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 47b1fda..9843e1f 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -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_THUMB)
+ mach = bfd_mach_arm_5T;
+ else
+ mach = bfd_mach_arm_5;
+ }
+ else if (cpu_variant & ARM_EXT_HALFWORD)
{
- 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_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);
}