re PR bootstrap/43964 (4.6-20100501 (r158965) bootstrap failure on ARM, ira-color...

	PR bootstrap/43964
	* ira-color.c (assign_hard_reg): Declare rclass and add_cost
	only if HONOR_REG_ALLOC_ORDER is not defined.

From-SVN: r159022

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4195d9dd66693ae3cd49d63e4c21ce6af5842f1c..e75bd7b13183c4a1d95f664f1f35d72525b93f0d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-04  Mikael Pettersson  <mikpe@it.uu.se>
+
+       PR bootstrap/43964
+       * ira-color.c (assign_hard_reg): Declare rclass and add_cost
+       only if HONOR_REG_ALLOC_ORDER is not defined.
+
 2010-05-04  Richard Guenther  <rguenther@suse.de>
 
        PR tree-optimization/43949

diff --git a/gcc/ira-color.c b/gcc/ira-color.c
index 47aacfe4520d6e854d1a2bdc8b3e56b2a4dd0424..448fae3c8230621c48a2e12dae2471a90c473c79 100644 (file)
--- a/gcc/ira-color.c
+++ b/gcc/ira-color.c
@@ -441,14 +441,18 @@ assign_hard_reg (ira_allocno_t allocno, bool retry_p)
 {
   HARD_REG_SET conflicting_regs;
   int i, j, k, hard_regno, best_hard_regno, class_size;
-  int cost, mem_cost, min_cost, full_cost, min_full_cost, add_cost;
+  int cost, mem_cost, min_cost, full_cost, min_full_cost;
   int *a_costs;
   int *conflict_costs;
-  enum reg_class cover_class, rclass, conflict_cover_class;
+  enum reg_class cover_class, conflict_cover_class;
   enum machine_mode mode;
   ira_allocno_t a, conflict_allocno;
   ira_allocno_conflict_iterator aci;
   static int costs[FIRST_PSEUDO_REGISTER], full_costs[FIRST_PSEUDO_REGISTER];
+#ifndef HONOR_REG_ALLOC_ORDER
+  enum reg_class rclass;
+  int add_cost;
+#endif
 #ifdef STACK_REGS
   bool no_stack_reg_p;
 #endif