Index: gcc/gcc/gimplify.c
===================================================================
--- gcc.orig/gcc/gimplify.c	2011-05-13 13:15:01.000000000 +0200
+++ gcc/gcc/gimplify.c	2011-05-18 14:03:31.730740200 +0200
@@ -7210,7 +7210,21 @@ gimplify_expr (tree *expr_p, gimple_seq
 		break;
 	      }
 	  }
-	  
+
+	switch (TREE_CODE (*expr_p))
+	  {
+	  case TRUTH_AND_EXPR:
+	    TREE_SET_CODE (*expr_p, BIT_AND_EXPR);
+	    break;
+	  case TRUTH_OR_EXPR:
+	    TREE_SET_CODE (*expr_p, BIT_IOR_EXPR);
+	    break;
+	  case TRUTH_XOR_EXPR:
+	    TREE_SET_CODE (*expr_p, BIT_XOR_EXPR);
+	    break;
+	  default:
+	    break;
+	  }
 	  /* Classified as tcc_expression.  */
 	  goto expr_2;
 
Index: gcc/gcc/tree-cfg.c
===================================================================
--- gcc.orig/gcc/tree-cfg.c	2011-05-18 14:01:18.000000000 +0200
+++ gcc/gcc/tree-cfg.c	2011-05-18 14:05:06.512276000 +0200
@@ -3555,29 +3555,11 @@ do_pointer_plus_expr_check:
 
     case TRUTH_ANDIF_EXPR:
     case TRUTH_ORIF_EXPR:
-      gcc_unreachable ();
-
     case TRUTH_AND_EXPR:
     case TRUTH_OR_EXPR:
     case TRUTH_XOR_EXPR:
-      {
-	/* We require two-valued operand types.  */
-	if (!(TREE_CODE (rhs1_type) == BOOLEAN_TYPE
-	      || (INTEGRAL_TYPE_P (rhs1_type)
-		  && TYPE_PRECISION (rhs1_type) == 1))
-	    || !(TREE_CODE (rhs2_type) == BOOLEAN_TYPE
-		 || (INTEGRAL_TYPE_P (rhs2_type)
-		     && TYPE_PRECISION (rhs2_type) == 1)))
-	  {
-	    error ("type mismatch in binary truth expression");
-	    debug_generic_expr (lhs_type);
-	    debug_generic_expr (rhs1_type);
-	    debug_generic_expr (rhs2_type);
-	    return true;
-	  }
 
-	break;
-      }
+      gcc_unreachable ();
 
     case LT_EXPR:
     case LE_EXPR: