From: Trevor Saunders tbsaunde+...@tbsaunde.org
gcc/ChangeLog:
2015-05-20 Trevor Saunders tbsaunde+...@tbsaunde.org
* *.c, *.h: DOn't check HAVE_conditional_move with the preprocessor.
---
gcc/ChangeLog | 4
gcc/combine.c | 5 ++---
gcc/expmed.c | 13 +
gcc/expr.c| 10 ++
gcc/optabs.c | 30 --
gcc/optabs.h | 2 --
gcc/toplev.c | 11 ++-
7 files changed, 31 insertions(+), 44 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d115f6e..c20d608 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
2015-05-20 Trevor Saunders tbsaunde+...@tbsaunde.org
+ * *.c, *.h: DOn't check HAVE_conditional_move with the preprocessor.
+
+2015-05-20 Trevor Saunders tbsaunde+...@tbsaunde.org
+
* genconfig.c (main): Always define HAVE_conditional_move.
2015-05-20 Trevor Saunders tbsaunde+...@tbsaunde.org
diff --git a/gcc/combine.c b/gcc/combine.c
index 45177c8..9615c79 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -6816,9 +6816,8 @@ simplify_set (rtx x)
(GET_CODE (XEXP (src, 0)) == EQ || GET_CODE (XEXP (src, 0)) == NE)
XEXP (XEXP (src, 0), 1) == const0_rtx
GET_MODE (src) == GET_MODE (XEXP (XEXP (src, 0), 0))
-#if HAVE_conditional_move
- ! can_conditionally_move_p (GET_MODE (src))
-#endif
+ (!HAVE_conditional_move
+ || ! can_conditionally_move_p (GET_MODE (src)))
(num_sign_bit_copies (XEXP (XEXP (src, 0), 0),
GET_MODE (XEXP (XEXP (src, 0), 0)))
== GET_MODE_PRECISION (GET_MODE (XEXP (XEXP (src, 0), 0
diff --git a/gcc/expmed.c b/gcc/expmed.c
index 589a7a3..fa13f8c 100644
--- a/gcc/expmed.c
+++ b/gcc/expmed.c
@@ -3797,9 +3797,8 @@ expand_sdiv_pow2 (machine_mode mode, rtx op0,
HOST_WIDE_INT d)
return expand_shift (RSHIFT_EXPR, mode, temp, logd, NULL_RTX, 0);
}
-#if HAVE_conditional_move
- if (BRANCH_COST (optimize_insn_for_speed_p (), false)
- = 2)
+ if (HAVE_conditional_move
+ BRANCH_COST (optimize_insn_for_speed_p (), false) = 2)
{
rtx temp2;
@@ -3821,7 +3820,6 @@ expand_sdiv_pow2 (machine_mode mode, rtx op0,
HOST_WIDE_INT d)
}
end_sequence ();
}
-#endif
if (BRANCH_COST (optimize_insn_for_speed_p (),
false) = 2)
@@ -,7 +5553,9 @@ emit_store_flag (rtx target, enum rtx_code code, rtx op0,
rtx op1,
target_mode);
}
-#if HAVE_conditional_move
+ if (!HAVE_conditional_move)
+ return 0;
+
/* Try using a setcc instruction for ORDERED/UNORDERED, followed by a
conditional move. */
tem = emit_store_flag_1 (subtarget, first_code, op0, op1, mode, 0,
@@ -5573,9 +5573,6 @@ emit_store_flag (rtx target, enum rtx_code code, rtx op0,
rtx op1,
if (tem == 0)
delete_insns_since (last);
return tem;
-#else
- return 0;
-#endif
}
/* The remaining tricks only apply to integer comparisons. */
diff --git a/gcc/expr.c b/gcc/expr.c
index efbf9fb..3605e99 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -2423,7 +2423,6 @@ get_def_for_expr (tree name, enum tree_code code)
return def_stmt;
}
-#if HAVE_conditional_move
/* Return the defining gimple statement for SSA_NAME NAME if it is an
assigment and the class of the expresion on the RHS is CLASS. Return
NULL otherwise. */
@@ -2443,7 +2442,6 @@ get_def_for_expr_class (tree name, enum tree_code_class
tclass)
return def_stmt;
}
-#endif
/* Determine whether the LEN bytes generated by CONSTFUN can be
@@ -7517,7 +7515,6 @@ highest_pow2_factor_for_target (const_tree target,
const_tree exp)
return MAX (factor, talign);
}
-#if HAVE_conditional_move
/* Convert the tree comparison code TCODE to the rtl one where the
signedness is UNSIGNEDP. */
@@ -7575,7 +7572,6 @@ convert_tree_comp_to_rtx (enum tree_code tcode, int
unsignedp)
}
return code;
}
-#endif
/* Subroutine of expand_expr. Expand the two operands of a binary
expression EXP0 and EXP1 placing the results in OP0 and OP1.
@@ -8021,7 +8017,6 @@ expand_cond_expr_using_cmove (tree treeop0
ATTRIBUTE_UNUSED,
tree treeop1 ATTRIBUTE_UNUSED,
tree treeop2 ATTRIBUTE_UNUSED)
{
-#if HAVE_conditional_move
rtx insn;
rtx op00, op01, op1, op2;
enum rtx_code comparison_code;
@@ -8105,7 +8100,6 @@ expand_cond_expr_using_cmove (tree treeop0
ATTRIBUTE_UNUSED,
/* Otherwise discard the sequence and fall back to code with
branches. */
end_sequence ();
-#endif
return NULL_RTX;
}
@@ -8892,7 +8886,7 @@ expand_expr_real_2 (sepops ops, rtx target, machine_mode
tmode,
if (code == MIN_EXPR)
comparison_code = LT;
}
-#if HAVE_conditional_move
+
/* Use a conditional move if possible. */
if (can_conditionally_move_p (mode))
{
@@ -8920,7 +8914,7 @@
