aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/tree-emutls.c11
2 files changed, 14 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 29049bd..c293971 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,10 @@
2015-02-04 Jan Hubicka <hubicka@ucw.cz>
+ Trevor Saunders <tsaunders@mozilla.com>
+
+ PR ipa/61548
+ * tree-emultls.c (new_emutls_decl): Resolve alias after creating it.
+
+2015-02-04 Jan Hubicka <hubicka@ucw.cz>
PR ipa/61548
* ipa.c (symbol_table::remove_unreachable_nodes): Fix ordering issue
diff --git a/gcc/tree-emutls.c b/gcc/tree-emutls.c
index da03b2a..68b2aae 100644
--- a/gcc/tree-emutls.c
+++ b/gcc/tree-emutls.c
@@ -366,9 +366,14 @@ new_emutls_decl (tree decl, tree alias_of)
else if (!alias_of)
varpool_node::add (to);
else
- varpool_node::create_alias (to,
- varpool_node::get_for_asmname
- (DECL_ASSEMBLER_NAME (DECL_VALUE_EXPR (alias_of)))->decl);
+ {
+ varpool_node *n;
+ varpool_node *t = varpool_node::get_for_asmname
+ (DECL_ASSEMBLER_NAME (DECL_VALUE_EXPR (alias_of)));
+
+ n = varpool_node::create_alias (to, t->decl);
+ n->resolve_alias (t);
+ }
return to;
}