From eb0f878074743d4bcb63e32948ab7c1748c1efb8 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Fri, 6 Jan 2017 14:56:48 +0100 Subject: [PATCH] Fix lto-bootstrap (PR bootstrap/79003). 2017-01-06 Martin Liska 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 PR bootstrap/79003 * Makefile.in: Add -fno-lto to {C,CPP,LD}FLAGS. From-SVN: r244155 --- gcc/ChangeLog | 6 ++++++ gcc/lra-constraints.c | 9 +++++---- gcc/predict.c | 2 +- libdecnumber/ChangeLog | 5 +++++ libdecnumber/Makefile.in | 6 +++--- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 069c6577315..26b4a0b7fb1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-01-06 Martin Liska + + 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 PR tree-optimization/78910 diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c index 61991280373..5ada67a36ba 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 invariants; /* Allocation pool for the invariants. */ -static object_allocator *invariants_pool; +static object_allocator *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 ("Inheritance invariants"); + invariants_pool + = new object_allocator ("Inheritance invariants"); invariant_table = htab_create (100, invariant_hash, invariant_eq_p, NULL); } diff --git a/gcc/predict.c b/gcc/predict.c index e85573bc51d..f851e14b4ed 100644 --- a/gcc/predict.c +++ b/gcc/predict.c @@ -795,7 +795,7 @@ set_even_probabilities (basic_block bb, hash_set *unlikely_edges = NULL) { unsigned nedges = 0; - edge e; + edge e = NULL; edge_iterator ei; FOR_EACH_EDGE (e, ei, bb->succs) diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog index c781b4e8423..0326fa371ce 100644 --- a/libdecnumber/ChangeLog +++ b/libdecnumber/ChangeLog @@ -1,3 +1,8 @@ +2017-01-06 Martin Liska + + PR bootstrap/79003 + * Makefile.in: Add -fno-lto to {C,CPP,LD}FLAGS. + 2017-01-01 Jakub Jelinek Update copyright years. diff --git a/libdecnumber/Makefile.in b/libdecnumber/Makefile.in index 02c327a59c4..2cfc5f48720 100644 --- a/libdecnumber/Makefile.in +++ b/libdecnumber/Makefile.in @@ -31,13 +31,13 @@ ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ CC = @CC@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ -fno-lto WARN_CFLAGS = @WARN_CFLAGS@ @WARN_PEDANTIC@ @WERROR@ CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ +CPPFLAGS = @CPPFLAGS@ -fno-lto INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ -fno-lto LIBICONV = @LIBICONV@ PACKAGE = @PACKAGE@ PICFLAG = @PICFLAG@ -- 2.30.2