aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog6
-rw-r--r--gas/config/tc-arm.c13
2 files changed, 12 insertions, 7 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 08ce828..bd4acd5 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-22 Matthew Gretton-Dann <matthew.gretton-dann@arm.com>
+
+ PR 9861
+ * config/tc-arm.c (CPU_DEFAULT): Do not define based upon build
+ compiler's predefines.
+
2010-02-19 Alan Modra <amodra@gmail.com>
* configure.tgt: Whiltespace. Sort moxie entry.
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 04b3f70..b3096c5 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -97,13 +97,12 @@ enum arm_float_abi
/* Types of processor to assemble for. */
#ifndef CPU_DEFAULT
-#if defined __XSCALE__
-#define CPU_DEFAULT ARM_ARCH_XSCALE
-#else
-#if defined __thumb__
-#define CPU_DEFAULT ARM_ARCH_V5T
-#endif
-#endif
+/* The code that was here used to select a default CPU depending on compiler
+ pre-defines which were only present when doing native builds, thus
+ changing gas' default behaviour depending upon the build host.
+
+ If you have a target that requires a default CPU option then the you
+ should define CPU_DEFAULT here. */
#endif
#ifndef FPU_DEFAULT