aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJan Hubicka <hubicka@ucw.cz>2015-03-30 10:51:50 +0200
committerJan Hubicka <hubicka@gcc.gnu.org>2015-03-30 08:51:50 +0000
commitafd1e7c68a62870d3090dda4ee0aab3e32d5e0ba (patch)
tree0971d2d3dfca79680827d8be2c80a5149829e725 /gcc
parent12daa22a2c4e3a9c1eba6740bdc2b67d7b7b181e (diff)
downloadgcc-afd1e7c68a62870d3090dda4ee0aab3e32d5e0ba.zip
gcc-afd1e7c68a62870d3090dda4ee0aab3e32d5e0ba.tar.gz
gcc-afd1e7c68a62870d3090dda4ee0aab3e32d5e0ba.tar.bz2
lto-symtab.c (lto_symtab_merge_decls_2): Silence warning on DECL_ARTIFICAL symbols.
* lto-symtab.c (lto_symtab_merge_decls_2): Silence warning on DECL_ARTIFICAL symbols. From-SVN: r221770
Diffstat (limited to 'gcc')
-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 ())