diff mbox

[ARM] fix arm bootstrap

Message ID 55559525.5000603@linaro.org
State New
Headers show

Commit Message

Kugan Vivekanandarajah May 15, 2015, 6:41 a.m. UTC
Hi Richard,

r223090 seem to miss a parenthesis and seem to be causing:

                 from ../../widen/gcc/fold-const.c:46:
../../widen/gcc/fold-const.c: In function 'tree_node*
fold_range_test(location_t, tree_code, tree, tree, tree)':
../../widen/gcc/config/arm/arm.h:2068:4: error: enumeral and
non-enumeral type in conditional expression [-Werror=extra]
    ? (TARGET_THUMB ? false : true)     \
    ^
../../widen/gcc/fold-const.c:5234:12: note: in expansion of macro
'LOGICAL_OP_NON_SHORT_CIRCUIT'
   else if (LOGICAL_OP_NON_SHORT_CIRCUIT
            ^
../../widen/gcc/fold-const.c: In function 'tree_node*
fold_truth_andor(location_t, tree_code, tree, tree, tree, tree, tree)':
../../widen/gcc/config/arm/arm.h:2068:4: error: enumeral and
non-enumeral type in conditional expression [-Werror=extra]
    ? (TARGET_THUMB ? false : true)     \
    ^
../../widen/gcc/fold-const.c:8431:7: note: in expansion of macro
'LOGICAL_OP_NON_SHORT_CIRCUIT'
   if (LOGICAL_OP_NON_SHORT_CIRCUIT


Regression testing for arm-none-linux-gnueab is ongoing.
Is this OK for trunk if no regression?

Thanks,
Kugan

gcc/ChangeLog:

2015-05-15  Kugan Vivekanandarajah  <kuganv@linaro.org>

	* config/arm/arm.h (enum arm_auto_incmodes): Add parenthesis.

Comments

Kugan Vivekanandarajah May 15, 2015, 6:46 a.m. UTC | #1
Sorry, this is not the right fix. Looking at it.

Thanks,
Kugan

On 15/05/15 16:41, Kugan wrote:
> Hi Richard,
> 
> r223090 seem to miss a parenthesis and seem to be causing:
> 
>                  from ../../widen/gcc/fold-const.c:46:
> ../../widen/gcc/fold-const.c: In function 'tree_node*
> fold_range_test(location_t, tree_code, tree, tree, tree)':
> ../../widen/gcc/config/arm/arm.h:2068:4: error: enumeral and
> non-enumeral type in conditional expression [-Werror=extra]
>     ? (TARGET_THUMB ? false : true)     \
>     ^
> ../../widen/gcc/fold-const.c:5234:12: note: in expansion of macro
> 'LOGICAL_OP_NON_SHORT_CIRCUIT'
>    else if (LOGICAL_OP_NON_SHORT_CIRCUIT
>             ^
> ../../widen/gcc/fold-const.c: In function 'tree_node*
> fold_truth_andor(location_t, tree_code, tree, tree, tree, tree, tree)':
> ../../widen/gcc/config/arm/arm.h:2068:4: error: enumeral and
> non-enumeral type in conditional expression [-Werror=extra]
>     ? (TARGET_THUMB ? false : true)     \
>     ^
> ../../widen/gcc/fold-const.c:8431:7: note: in expansion of macro
> 'LOGICAL_OP_NON_SHORT_CIRCUIT'
>    if (LOGICAL_OP_NON_SHORT_CIRCUIT
> 
> 
> Regression testing for arm-none-linux-gnueab is ongoing.
> Is this OK for trunk if no regression?
> 
> Thanks,
> Kugan
> 
> gcc/ChangeLog:
> 
> 2015-05-15  Kugan Vivekanandarajah  <kuganv@linaro.org>
> 
> 	* config/arm/arm.h (enum arm_auto_incmodes): Add parenthesis.
>
diff mbox

Patch

diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index 8574388..6968a3d 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 ? current_tune->logical_op_non_short_circuit_thumb	\
+      : current_tune->logical_op_non_short_circuit_arm))
 
 
 /* Position Independent Code.  */