OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR lto/61012 (lto1: errors during merging of translation units (error: variable ‘link’ redeclared as function))

Browse Source 
PR lto/61012
	* lto-symtab.c (lto_symtab_merge_decls_1): Do not ICE on undefined externals
	mixed with variables.

From-SVN: r210740
This commit is contained in:
Jan Hubicka 2014-05-22 07:38:04 +02:00 committed by Jan Hubicka
parent 4269f19c09
commit b95591361e
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/lto/ChangeLog
View File

@ -1,3 +1,9 @@
2014-05-17 Jan Hubicka <hubicka@ucw.cz>
PR lto/61012
* lto-symtab.c (lto_symtab_merge_decls_1): Do not ICE on undefined externals
mixed with variables.
2014-05-17 Trevor Saunders <tsaunders@mozilla.com>
* lto-tree.h: Don't use variable_size gty attribute.

7
gcc/lto/lto-symtab.c
View File

@ -447,7 +447,12 @@ lto_symtab_merge_decls_1 (symtab_node *first)
cgraph or a varpool node. */
if (!prevailing)
{
prevailing = first;
for (prevailing = first;
prevailing; prevailing = prevailing->next_sharing_asm_name)
if (lto_symtab_symbol_p (prevailing))
break;
if (!prevailing)
return;
/* For variables chose with a priority variant with vnode
attached (i.e. from unit where external declaration of
variable is actually used).