aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamana Radhakrishnan <ramana@gcc.gnu.org>2015-05-15 08:47:06 +0000
committerRamana Radhakrishnan <ramana@gcc.gnu.org>2015-05-15 08:47:06 +0000
commit4cbd1e61e64e6bd37041386d86664d2fddc243c7 (patch)
tree71b758f634f7ef18a13492fafdd987c44d954764
parent291e9784671935993a945ea17b3934eee94c2fef (diff)
downloadgcc-4cbd1e61e64e6bd37041386d86664d2fddc243c7.zip
gcc-4cbd1e61e64e6bd37041386d86664d2fddc243c7.tar.gz
gcc-4cbd1e61e64e6bd37041386d86664d2fddc243c7.tar.bz2
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
-rw-r--r--gcc/config/arm/arm.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index 8574388..a58a7b1 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<bool> (current_tune->logical_op_non_short_circuit_thumb) \
+ : static_cast<bool> (current_tune->logical_op_non_short_circuit_arm))
/* Position Independent Code. */