aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2017-01-06 14:56:48 +0100
committerMartin Liska <marxin@gcc.gnu.org>2017-01-06 13:56:48 +0000
commiteb0f878074743d4bcb63e32948ab7c1748c1efb8 (patch)
treeda303b6bcef547a41afb5ddabc6f66c3a62d52ee /gcc
parentb41f45e7a5e6d32350e02a95e005fc0eca3c50f3 (diff)
downloadgcc-eb0f878074743d4bcb63e32948ab7c1748c1efb8.zip
gcc-eb0f878074743d4bcb63e32948ab7c1748c1efb8.tar.gz
gcc-eb0f878074743d4bcb63e32948ab7c1748c1efb8.tar.bz2
Fix lto-bootstrap (PR bootstrap/79003).
2017-01-06 Martin Liska <mliska@suse.cz> PR bootstrap/79003 * lra-constraints.c: Rename invariant to lra_invariant. * predict.c (set_even_probabilities): Initialize e to NULL. 2017-01-06 Martin Liska <mliska@suse.cz> PR bootstrap/79003 * Makefile.in: Add -fno-lto to {C,CPP,LD}FLAGS. From-SVN: r244155
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/lra-constraints.c9
-rw-r--r--gcc/predict.c2
3 files changed, 12 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 069c657..26b4a0b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-01-06 Martin Liska <mliska@suse.cz>
+
+ PR bootstrap/79003
+ * lra-constraints.c: Rename invariant to lra_invariant.
+ * predict.c (set_even_probabilities): Initialize e to NULL.
+
2017-01-05 Martin Sebor <msebor@redhat.com>
PR tree-optimization/78910
diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
index 6199128..5ada67a 100644
--- a/gcc/lra-constraints.c
+++ b/gcc/lra-constraints.c
@@ -4749,7 +4749,7 @@ lra_constraints_finish (void)
/* Structure describes invariants for ineheritance. */
-struct invariant
+struct lra_invariant
{
/* The order number of the invariant. */
int num;
@@ -4759,7 +4759,7 @@ struct invariant
rtx_insn *insn;
};
-typedef struct invariant invariant_t;
+typedef lra_invariant invariant_t;
typedef invariant_t *invariant_ptr_t;
typedef const invariant_t *const_invariant_ptr_t;
@@ -4767,7 +4767,7 @@ typedef const invariant_t *const_invariant_ptr_t;
static vec<invariant_ptr_t> invariants;
/* Allocation pool for the invariants. */
-static object_allocator<struct invariant> *invariants_pool;
+static object_allocator<lra_invariant> *invariants_pool;
/* Hash table for the invariants. */
static htab_t invariant_table;
@@ -4817,7 +4817,8 @@ static void
initiate_invariants (void)
{
invariants.create (100);
- invariants_pool = new object_allocator<struct invariant> ("Inheritance invariants");
+ invariants_pool
+ = new object_allocator<lra_invariant> ("Inheritance invariants");
invariant_table = htab_create (100, invariant_hash, invariant_eq_p, NULL);
}
diff --git a/gcc/predict.c b/gcc/predict.c
index e85573b..f851e14 100644
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -795,7 +795,7 @@ set_even_probabilities (basic_block bb,
hash_set<edge> *unlikely_edges = NULL)
{
unsigned nedges = 0;
- edge e;
+ edge e = NULL;
edge_iterator ei;
FOR_EACH_EDGE (e, ei, bb->succs)