From f90b7a5a7913cc7239cce42f6ca328b9a741b387 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <bonzini@gnu.org>
Date: Tue, 12 May 2009 09:43:48 +0000
Subject: Merge cond-optab branch.

From-SVN: r147425
---
 gcc/ifcvt.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'gcc/ifcvt.c')

diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index fc3cbd6..a4324a5 100644
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -62,9 +62,6 @@
 #ifndef HAVE_trap
 #define HAVE_trap 0
 #endif
-#ifndef HAVE_conditional_trap
-#define HAVE_conditional_trap 0
-#endif
 
 #ifndef MAX_CONDITIONAL_EXECUTE
 #define MAX_CONDITIONAL_EXECUTE \
@@ -3043,7 +3040,8 @@ find_if_header (basic_block test_bb, int pass)
       && cond_exec_find_if_block (&ce_info))
     goto success;
 
-  if (HAVE_trap && HAVE_conditional_trap
+  if (HAVE_trap
+      && optab_handler (ctrap_optab, word_mode)->insn_code != CODE_FOR_nothing
       && find_cond_trap (test_bb, then_edge, else_edge))
     goto success;
 
-- 
cgit v1.1