Here are some soft merge conflict resolutions….
I've checked them in to fix the build.
Ok?
Index: ChangeLog.wide-int
===================================================================
--- ChangeLog.wide-int (revision 205969)
+++ ChangeLog.wide-int (working copy)
@@ -524,6 +524,7 @@
(aff_combination_constant_multiple_p): Likewise.
(get_inner_reference_aff): Likewise.
(aff_comb_cannot_overlap_p): Likewise.
+ (aff_combination_zero_p): Use wide-int interfaces.
* tree.c: Include tree.h.
(init_ttree): Use make_int_cst.
(tree_code_size): Removed code for INTEGER_CST case.
@@ -768,6 +769,8 @@
(scev_probably_wraps_p): Likewise.
* tree-ssa-math-opts.c
(gimple_expand_builtin_pow): Update calls to real_to_integer.
+ * tree-scalar-evolution.c:
+ (simplify_peeled_chrec): Use wide-int interfaces.
* tree-ssanames.c
(set_range_info): Use wide_int_refs rather than double_ints.
Adjust for trailing_wide_ints <3> representation.
@@ -866,6 +869,7 @@
(output_constructor_bitfield): Likewise.
* var-tracking.c
(loc_cmp): Handle CONST_WIDE_INT.
+ * mkconfig.sh: Define BITS_PER_UNIT for GENERATOR_FILEs.
* wide-int.cc: New.
* wide-int.h: New.
* wide-int-print.cc: New.
Index: mkconfig.sh
===================================================================
--- mkconfig.sh (revision 205969)
+++ mkconfig.sh (working copy)
@@ -100,6 +100,9 @@ case $output in
#if defined IN_GCC && !defined GENERATOR_FILE
# include "insn-modes.h"
#endif
+#if defined IN_GCC && defined GENERATOR_FILE
+# define BITS_PER_UNIT 8
+#endif
EOF
;;
esac
Index: tree-affine.h
===================================================================
--- tree-affine.h (revision 205969)
+++ tree-affine.h (working copy)
@@ -91,7 +91,7 @@ aff_combination_zero_p (aff_tree *aff)
if (!aff)
return true;
- if (aff->n == 0 && aff->offset.is_zero ())
+ if (aff->n == 0 && aff->offset == 0)
return true;
return false;
Index: tree-scalar-evolution.c
===================================================================
--- tree-scalar-evolution.c (revision 205969)
+++ tree-scalar-evolution.c (working copy)
@@ -1426,7 +1426,7 @@ simplify_peeled_chrec (struct loop *loop
tree_to_aff_combination_expand (left, type, &aff1, &peeled_chrec_map);
tree_to_aff_combination_expand (step_val, type, &aff2, &peeled_chrec_map);
free_affine_expand_cache (&peeled_chrec_map);
- aff_combination_scale (&aff2, double_int_minus_one);
+ aff_combination_scale (&aff2, -1);
aff_combination_add (&aff1, &aff2);
/* Transform (init, {left, right}_LOOP)_LOOP to {init, right}_LOOP
Index: tree-ssa-loop-niter.c
===================================================================
--- tree-ssa-loop-niter.c (revision 205969)
+++ tree-ssa-loop-niter.c (working copy)
@@ -175,7 +175,7 @@ determine_value_range (struct loop *loop
the VAR range, give up on looking at the PHI
results. This can happen if VR_UNDEFINED is
involved. */
- if (wi::gt_p (minv, maxv))
+ if (wi::gt_p (minv, maxv, sgn))
{
rtype = get_range_info (var, &minv, &maxv);
break;
