aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/lto/ChangeLog5
-rw-r--r--gcc/lto/lto-symtab.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 588b603..bf2b51b 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,5 +1,10 @@
2015-03-26 Jan Hubicka <hubicka@ucw.cz>
+ * lto-symtab.c (lto_symtab_merge_decls_2): Silence warning on
+ DECL_ARTIFICAL symbols.
+
+2015-03-26 Jan Hubicka <hubicka@ucw.cz>
+
PR lto/65536
* lto.c (unify_scc): Revert location cache when unification
suceeded.
diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c
index c00fd87..396d3e2 100644
--- a/gcc/lto/lto-symtab.c
+++ b/gcc/lto/lto-symtab.c
@@ -473,7 +473,8 @@ lto_symtab_merge_decls_2 (symtab_node *first, bool diagnosed_p)
if (TREE_PUBLIC (e->decl))
{
if (!lto_symtab_merge (prevailing, e)
- && !diagnosed_p)
+ && !diagnosed_p
+ && !DECL_ARTIFICIAL (e->decl))
mismatches.safe_push (e->decl);
}
if (mismatches.is_empty ())