From 9c7c70ee6f669232b6578a53092aaa3e5b0cff7a Mon Sep 17 00:00:00 2001 From: Nick Clifton <nickc@redhat.com> Date: Wed, 14 Jan 2009 11:28:01 +0000 Subject: [PATCH] ira-conflicts.c: Include addresses.h for the definition of base_reg_class. * ira-conflicts.c: Include addresses.h for the definition of base_reg_class. (ira_build_conflicts): Use base_reg_class instead of BASE_REG_CLASS. * Makefile.in: Add a dependency of ira-conflicts.o on addresses.h. From-SVN: r143365 --- gcc/ChangeLog | 9 +++++++++ gcc/ira-conflicts.c | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0eba871aafec..d6a6ab98e2c6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2009-01-14 Nick Clifton <nickc@redhat.com> + + * ira-conflicts.c: Include addresses.h for the definition of + base_reg_class. + (ira_build_conflicts): Use base_reg_class instead of + BASE_REG_CLASS. + * Makefile.in: Add a dependency of ira-conflicts.o on + addresses.h. + 2009-01-13 Vladimir Makarov <vmakarov@redhat.com> PR target/38811 diff --git a/gcc/ira-conflicts.c b/gcc/ira-conflicts.c index 244d3bc9b3ef..cce2abfd6f62 100644 --- a/gcc/ira-conflicts.c +++ b/gcc/ira-conflicts.c @@ -37,6 +37,7 @@ along with GCC; see the file COPYING3. If not see #include "df.h" #include "sparseset.h" #include "ira-int.h" +#include "addresses.h" /* This file contains code responsible for allocno conflict creation, allocno copy creation and allocno info accumulation on upper level @@ -788,12 +789,12 @@ ira_build_conflicts (void) ira_free (conflicts); } } - if (! CLASS_LIKELY_SPILLED_P (BASE_REG_CLASS)) + if (! CLASS_LIKELY_SPILLED_P (base_reg_class (VOIDmode, ADDRESS, SCRATCH))) CLEAR_HARD_REG_SET (temp_hard_reg_set); else { COPY_HARD_REG_SET (temp_hard_reg_set, - reg_class_contents[BASE_REG_CLASS]); + reg_class_contents[base_reg_class (VOIDmode, ADDRESS, SCRATCH)]); AND_COMPL_HARD_REG_SET (temp_hard_reg_set, ira_no_alloc_regs); AND_HARD_REG_SET (temp_hard_reg_set, call_used_reg_set); } -- GitLab