Index: arm.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/arm/arm.c,v
retrieving revision 1.242
diff -u -p -r1.242 arm.c
--- arm.c	15 Nov 2002 11:21:35 -0000	1.242
+++ arm.c	16 Nov 2002 13:18:02 -0000
@@ -278,6 +278,9 @@ int arm_is_strong = 0;
 /* Nonzero if this chip is an XScale.  */
 int arm_is_xscale = 0;
 
+/* Nonzero if tuning for XScale  */
+int tune_xscale = 0;
+
 /* Nonzero if this chip is an ARM6 or an ARM7.  */
 int arm_is_6_or_7 = 0;
 
@@ -692,6 +695,7 @@ arm_override_options ()
   thumb_code	    = (TARGET_ARM == 0);
   arm_is_6_or_7     = (((tune_flags & (FL_MODE26 | FL_MODE32))
 		       && !(tune_flags & FL_ARCH4))) != 0;
+  tune_xscale       = (tune_flags & FL_XSCALE) != 0;
 
   /* Default value for floating point code... if no co-processor
      bus, then schedule for emulated floating point.  Otherwise,
@@ -2944,7 +2948,7 @@ arm_adjust_cost (insn, link, dep, cost)
 
   /* Some true dependencies can have a higher cost depending
      on precisely how certain input operands are used.  */
-  if (arm_is_xscale
+  if (tune_xscale
       && REG_NOTE_KIND (link) == 0
       && recog_memoized (insn) < 0
       && recog_memoized (dep) < 0)
@@ -4385,7 +4389,7 @@ arm_gen_load_multiple (base_regno, count
 
      As a compromise, we use ldr for counts of 1 or 2 regs, and ldm
      for counts of 3 or 4 regs.  */
-  if (arm_is_xscale && count <= 2 && ! optimize_size)
+  if (tune_xscale && count <= 2 && ! optimize_size)
     {
       rtx seq;
       
@@ -4452,7 +4456,7 @@ arm_gen_store_multiple (base_regno, coun
 
   /* See arm_gen_load_multiple for discussion of
      the pros/cons of ldm/stm usage for XScale.  */
-  if (arm_is_xscale && count <= 2 && ! optimize_size)
+  if (tune_xscale && count <= 2 && ! optimize_size)
     {
       rtx seq;
       
Index: arm.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/arm/arm.h,v
retrieving revision 1.168
diff -u -p -r1.168 arm.h
--- arm.h	15 Nov 2002 11:21:36 -0000	1.168
+++ arm.h	16 Nov 2002 13:18:09 -0000
@@ -573,6 +573,9 @@ extern int arm_is_strong;
 /* Nonzero if this chip is an XScale.  */
 extern int arm_is_xscale;
 
+/* Nonzero if tuning for XScale  */
+extern int tune_xscale;
+
 /* Nonzero if this chip is an ARM6 or an ARM7.  */
 extern int arm_is_6_or_7;
 
Index: arm.md
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/arm/arm.md,v
retrieving revision 1.112
diff -u -p -r1.112 arm.md
--- arm.md	24 Sep 2002 12:48:51 -0000	1.112
+++ arm.md	16 Nov 2002 13:18:29 -0000
@@ -116,7 +116,7 @@
 
 ;; Operand number of an input operand that is shifted.  Zero if the
 ;; given instruction does not shift one of its input operands.
-(define_attr "is_xscale" "no,yes" (const (symbol_ref "arm_is_xscale")))
+(define_attr "is_xscale" "no,yes" (const (symbol_ref "tune_xscale")))
 (define_attr "shift" "" (const_int 0))
 
 ; Floating Point Unit.  If we only have floating point emulation, then there