aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Pettersson <mikpe@it.uu.se>2011-08-22 11:38:14 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2011-08-22 11:38:14 +0200
commitfbddb81da4ad58ed1cff9188ad02abf6f5334551 (patch)
tree9075ee3fe60da26c9f70218a48bb68f8ff636413
parentba259d527abbca0bfb6b8a6af77024e4f10ac504 (diff)
downloadgcc-fbddb81da4ad58ed1cff9188ad02abf6f5334551.zip
gcc-fbddb81da4ad58ed1cff9188ad02abf6f5334551.tar.gz
gcc-fbddb81da4ad58ed1cff9188ad02abf6f5334551.tar.bz2
re PR bootstrap/50146 (unused variable saved_nregs in ira-color.c broke arm-linux-gnueabi bootstrap)
PR bootstrap/50146 * ira-color.c (assign_hard_reg): Move saved_nregs declaration to #ifndef HONOR_REG_ALLOC_ORDER block. From-SVN: r177951
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/ira-color.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4cf9a5f..4793d03 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-22 Mikael Pettersson <mikpe@it.uu.se>
+
+ PR bootstrap/50146
+ * ira-color.c (assign_hard_reg): Move saved_nregs declaration
+ to #ifndef HONOR_REG_ALLOC_ORDER block.
+
2011-08-21 Richard Henderson <rth@redhat.com>
* rtl.h (INSN_ANNULLED_BRANCH_P): Only allow JUMP_INSN.
diff --git a/gcc/ira-color.c b/gcc/ira-color.c
index eb87b0e..e78012b 100644
--- a/gcc/ira-color.c
+++ b/gcc/ira-color.c
@@ -1567,13 +1567,14 @@ static bool
assign_hard_reg (ira_allocno_t a, bool retry_p)
{
HARD_REG_SET conflicting_regs[2], profitable_hard_regs[2];
- int i, j, hard_regno, best_hard_regno, class_size, saved_nregs;
+ int i, j, hard_regno, best_hard_regno, class_size;
int cost, mem_cost, min_cost, full_cost, min_full_cost, nwords, word;
int *a_costs;
enum reg_class aclass;
enum machine_mode mode;
static int costs[FIRST_PSEUDO_REGISTER], full_costs[FIRST_PSEUDO_REGISTER];
#ifndef HONOR_REG_ALLOC_ORDER
+ int saved_nregs;
enum reg_class rclass;
int add_cost;
#endif