diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c3f0e051e709..a24745363812 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-04  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* genconfig.c (main): Generate CC0_P.
+	* rtl.h (CC0_P): Remove.
+
 2003-02-04  Richard Henderson  <rth@redhat.com>
 
 	* libgcc2.h, libgcc2.c (__ffsSI2): New.
diff --git a/gcc/genconfig.c b/gcc/genconfig.c
index ca74757364e5..bb0dea9f92da 100644
--- a/gcc/genconfig.c
+++ b/gcc/genconfig.c
@@ -342,7 +342,14 @@ main (argc, argv)
   printf ("#endif\n");
 
   if (have_cc0_flag)
-    printf ("#define HAVE_cc0 1\n");
+    {
+      printf ("#define HAVE_cc0 1\n");
+      printf ("#define CC0_P(X) ((X) == cc0_rtx)\n");
+    }
+  else
+    {
+      printf ("#define CC0_P(X) 0\n");
+    }
 
   if (have_cmove_flag)
     printf ("#define HAVE_conditional_move 1\n");
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 7531d8a1cfa1..7758a92f724c 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -273,13 +273,6 @@ struct rtvec_def GTY(()) {
 /* Predicate yielding nonzero iff X is a barrier insn.  */
 #define BARRIER_P(X) (GET_CODE (X) == BARRIER)
 
-/* Predicate yielding nonzero iff X is cc0.  */
-#ifdef HAVE_cc0
-#define CC0_P(X) ((X) == cc0_rtx)
-#else
-#define CC0_P(X) 0
-#endif
-
 /* Predicate yielding nonzero iff X is a data for a jump table.  */
 #define JUMP_TABLE_DATA_P(INSN) \
   (JUMP_P (INSN) && (GET_CODE (PATTERN (INSN)) == ADDR_VEC || \