diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 015bf019b68f59a4fd5b0975dc3696997563fd8f..5f1d679a9a9e0206b7b71c1d1a18d533a67a808e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -13,6 +13,11 @@
 	* config/i386/i386.c (ix86_print_operand_address): Only handle
 	zero-extended DImode addresses.
 
+2012-03-04  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/i386/i386.c (ix86_print_operand) <case '+'>: Declare
+	taken and cputaken as bool.
+
 2012-03-04  Uros Bizjak  <ubizjak@gmail.com>
 
 	* config/i386/constraints.md (Ya): New internal constraint.
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 1a2067eb4baece01efbd63870f028fce0d4350ad..973bbeb68db04ef559087ae78d967feaf7e6f478 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -14136,7 +14136,8 @@ ix86_print_operand (FILE *file, rtx x, int code)
 	    rtx x;
 
 	    if (!optimize
-	        || optimize_function_for_size_p (cfun) || !TARGET_BRANCH_PREDICTION_HINTS)
+	        || optimize_function_for_size_p (cfun)
+		|| !TARGET_BRANCH_PREDICTION_HINTS)
 	      return;
 
 	    x = find_reg_note (current_output_insn, REG_BR_PROB, 0);
@@ -14147,8 +14148,9 @@ ix86_print_operand (FILE *file, rtx x, int code)
 		if (pred_val < REG_BR_PROB_BASE * 45 / 100
 		    || pred_val > REG_BR_PROB_BASE * 55 / 100)
 		  {
-		    int taken = pred_val > REG_BR_PROB_BASE / 2;
-		    int cputaken = final_forward_branch_p (current_output_insn) == 0;
+		    bool taken = pred_val > REG_BR_PROB_BASE / 2;
+		    bool cputaken
+		      = final_forward_branch_p (current_output_insn) == 0;
 
 		    /* Emit hints only in the case default branch prediction
 		       heuristics would fail.  */