genconfig.c (main): Allow targets to override HAVE_conditional_move.

	* genconfig.c (main): Allow targets to override HAVE_conditional_move.
	* jump.c (jump_optimize): Use it at run-time.

From-SVN: r7482

diff --git a/gcc/genconfig.c b/gcc/genconfig.c
index da230f11b283f09c79c696829698897da538dbd9..f1585c6f169153216a8f030d4bea00bcff697374 100644 (file)
--- a/gcc/genconfig.c
+++ b/gcc/genconfig.c
@@ -343,7 +343,15 @@ from the machine description file `md'.  */\n\n");
     printf ("#define HAVE_cc0\n");
 
   if (have_cmove_flag)
-    printf ("#define HAVE_conditional_move\n");
+    {
+      /* ??? The #ifndef/#endif is a hack for targets like sparc where
+         conditional moves don't exist for all versions of the
+        architecture.  This won't be needed after conditional move support
+        has been clean up.  */
+      printf ("#ifndef HAVE_conditional_move\n");
+      printf ("#define HAVE_conditional_move 1\n");
+      printf ("#endif\n");
+    }
 
   if (have_lo_sum_flag)
     printf ("#define HAVE_lo_sum\n");

diff --git a/gcc/jump.c b/gcc/jump.c
index b8eaf11b99c533617adac44d36b4b81f0ff072fa..f21f0855aec2f90f506f442459903844b8b46ee3 100644 (file)
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -1038,7 +1038,7 @@ jump_optimize (f, cross_jump, noop_moves, after_regscan)
                      ((BRANCH_COST >= 2
                        && temp2 == const0_rtx)
 #ifdef HAVE_conditional_move
-                      || 1
+                      || HAVE_conditional_move
 #endif
                       || BRANCH_COST >= 3)))
              /* INSN must either branch to the insn after TEMP or the insn
@@ -1068,7 +1068,7 @@ jump_optimize (f, cross_jump, noop_moves, after_regscan)
                              && (reversep = can_reverse_comparison_p (temp4,
                                                                       insn)))))
 #ifdef HAVE_conditional_move
-                 || 1
+                 || HAVE_conditional_move
 #endif
                  || BRANCH_COST >= 3)
 #ifdef HAVE_cc0