From: Doug Evans <dje@gnu.org>
Date: Wed, 15 Jun 1994 07:42:17 +0000 (+0000)
Subject: genconfig.c (main): Allow targets to override HAVE_conditional_move.
X-Git-Tag: misc/cutover-egcs-0~6461
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4505c2363677092a5d45467ebff98d590d72fc50;p=thirdparty%2Fgcc.git

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 da230f11b283..f1585c6f1691 100644
--- 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 b8eaf11b99c5..f21f0855aec2 100644
--- 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