diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fc95ef0d7328..f6d68056c3cb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-24  Vladimir Makarov  <vmakarov@redhat.com>
+
+	* genpreds.c (write_enum_constraint_num): Output definition of
+	CONSTRAINT_NUM_DEFINED_P macro.
+	* ira.c (setup_cover_and_important_classes): Use
+	CONSTRAINT_NUM_DEFINED_P instead of CONSTRAINT__LIMIT in #ifdef.
+	
 2009-04-24  DJ Delorie  <dj@redhat.com>
 
 	* config/sh/sh.h (LIBGCC2_DOUBLE_TYPE_SIZE): Test
diff --git a/gcc/genpreds.c b/gcc/genpreds.c
index a1232e9573f0..86c799aa1a6b 100644
--- a/gcc/genpreds.c
+++ b/gcc/genpreds.c
@@ -954,6 +954,7 @@ write_enum_constraint_num (void)
 {
   struct constraint_data *c;
 
+  fputs ("#define CONSTRAINT_NUM_DEFINED_P 1\n", stdout);
   fputs ("enum constraint_num\n"
 	 "{\n"
 	 "  CONSTRAINT__UNKNOWN = 0", stdout);
diff --git a/gcc/ira.c b/gcc/ira.c
index 1b8c84b9c94d..14e9d9e478fa 100644
--- a/gcc/ira.c
+++ b/gcc/ira.c
@@ -754,7 +754,7 @@ setup_cover_and_important_classes (void)
 	{
 	  if (i == NO_REGS)
 	    continue;
-#ifdef CONSTRAINT__LIMIT
+#ifdef CONSTRAINT_NUM_DEFINED_P
 	  for (j = 0; j < CONSTRAINT__LIMIT; j++)
 	    if ((int) regclass_for_constraint ((enum constraint_num) j) == i)
 	      break;