* jump.c (jump_optimize, follow_jumps, mark_jump_label): Disable some

[pf3gnuchains/gcc-fork.git] / gcc / genconfig.c

diff --git a/gcc/genconfig.c b/gcc/genconfig.c
index 820e1d8..404534e 100644 (file)
--- a/gcc/genconfig.c
+++ b/gcc/genconfig.c
@@ -17,11 +17,12 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <stdio.h>
-#include "config.h"
+#include "hconfig.h"
 #include "rtl.h"
 #include "obstack.h"
 
@@ -126,7 +127,15 @@ walk_insn_part (part, recog_p, non_pc_set_src)
       return;
 
     case IF_THEN_ELSE:
-      if (recog_p && non_pc_set_src)
+      /* Only consider this machine as having a conditional move if the
+        two arms of the IF_THEN_ELSE are both MATCH_OPERAND.  Otherwise,
+        we have some specific IF_THEN_ELSE construct (like the doz
+        instruction on the RS/6000) that can't be used in the general
+        context we want it for.  */
+
+      if (recog_p && non_pc_set_src
+         && GET_CODE (XEXP (part, 1)) == MATCH_OPERAND
+         && GET_CODE (XEXP (part, 2)) == MATCH_OPERAND)
        have_cmove_flag = 1;
       break;