From: Mikael Pettersson Date: Tue, 4 May 2010 10:49:41 +0000 (+0200) Subject: re PR bootstrap/43964 (4.6-20100501 (r158965) bootstrap failure on ARM, ira-color... X-Git-Tag: releases/gcc-4.6.0~7511 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5c011cd7adceca81d4e9b7805aecffab8660c5e;p=thirdparty%2Fgcc.git re PR bootstrap/43964 (4.6-20100501 (r158965) bootstrap failure on ARM, ira-color.c triggers -Werror) 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 4195d9dd6669..e75bd7b13183 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-05-04 Mikael Pettersson + + 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 PR tree-optimization/43949 diff --git a/gcc/ira-color.c b/gcc/ira-color.c index 47aacfe4520d..448fae3c8230 100644 --- 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