PR 9861

	* gas/config/tc-arm.c (CPU_DEFAULT): Do not define based upon build
	compiler's predefines.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 08ce82880834d911a12c61c42f0a7b472efc157b..bd4acd59dc74fadc06d3cc11aa360a4cbc708550 100644 (file)
--- 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 04b3f703248fec08b8f2fcbba2d673e1e2ce0a5d..b3096c5d73f0d872d32d69e73deec65606d4140a 100644 (file)
--- 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