Apply arm.h change for previous commit.

2015-05-15  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>

	* config/arm/arm.h (LOGICAL_OP_NON_SHORT_CIRCUIT): Add appropriate
	casting.

From-SVN: r223213

diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index 85743889d28848c734ace13cd136bc9ebe5dc714..a58a7b14deeff4b040c2e8b1526fbe315a86542b 100644 (file)
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -2060,8 +2060,8 @@ enum arm_auto_incmodes
 #define LOGICAL_OP_NON_SHORT_CIRCUIT                                   \
   ((optimize_size)                                                     \
    ? (TARGET_THUMB ? false : true)                                     \
-   : TARGET_THUMB ? current_tune->logical_op_non_short_circuit_thumb   \
-   : current_tune->logical_op_non_short_circuit_arm)
+   : TARGET_THUMB ? static_cast<bool> (current_tune->logical_op_non_short_circuit_thumb) \
+   : static_cast<bool> (current_tune->logical_op_non_short_circuit_arm))
 
 \f
 /* Position Independent Code.  */