From 4cbd1e61e64e6bd37041386d86664d2fddc243c7 Mon Sep 17 00:00:00 2001 From: Ramana Radhakrishnan Date: Fri, 15 May 2015 08:47:06 +0000 Subject: [PATCH] Apply arm.h change for previous commit. 2015-05-15 Ramana Radhakrishnan * config/arm/arm.h (LOGICAL_OP_NON_SHORT_CIRCUIT): Add appropriate casting. From-SVN: r223213 --- gcc/config/arm/arm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h index 85743889d28..a58a7b14dee 100644 --- 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 (current_tune->logical_op_non_short_circuit_thumb) \ + : static_cast (current_tune->logical_op_non_short_circuit_arm)) /* Position Independent Code. */ -- 2.30.2