5.0.0-0.15

This commit is contained in:
Jakub Jelinek 2015-02-17 12:36:38 +01:00
parent 305029d3ec
commit e22880b36d
1 changed files with 3 additions and 2 deletions

View File

@ -45,7 +45,7 @@ Revert:
optimizing and when not doing toplevel reoder. */ optimizing and when not doing toplevel reoder. */
--- gcc/varasm.c (revision 220674) --- gcc/varasm.c (revision 220674)
+++ gcc/varasm.c (revision 220673) +++ gcc/varasm.c (revision 220673)
@@ -6802,96 +6802,97 @@ resolution_local_p (enum ld_plugin_symbo @@ -6802,97 +6802,97 @@ resolution_local_p (enum ld_plugin_symbo
|| resolution == LDPR_RESOLVED_EXEC); || resolution == LDPR_RESOLVED_EXEC);
} }
@ -121,7 +121,8 @@ Revert:
- bool defined_locally = false; - bool defined_locally = false;
- if (symtab_node *node = symtab_node::get (exp)) - if (symtab_node *node = symtab_node::get (exp))
- { - {
- if (node->definition || node->in_other_partition) - if ((node->definition && !DECL_EXTERNAL (node->decl))
- || node->in_other_partition)
- { - {
- defined_locally = true; - defined_locally = true;
- resolved_locally = (weak_dominate && !shlib); - resolved_locally = (weak_dominate && !shlib);