From: Jan Hubicka <hubicka@ucw.cz>
Date: Thu, 5 Feb 2015 04:45:41 +0000 (+0100)
Subject: re PR ipa/61548 (FAIL: gcc.dg/tls/alias-1.c)
X-Git-Tag: releases/gcc-5.1.0~1144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0cbab4acd8f7af1ece6d94e61d5c754246c5efa;p=thirdparty%2Fgcc.git

re PR ipa/61548 (FAIL: gcc.dg/tls/alias-1.c)

	PR ipa/61548
	* tree-emultls.c (new_emutls_decl): Resolve alias after creating it.

Co-Authored-By: Trevor Saunders <tsaunders@mozilla.com>

From-SVN: r220434
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 29049bd57411..c293971f5379 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+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
diff --git a/gcc/tree-emutls.c b/gcc/tree-emutls.c
index da03b2a0fca5..68b2aae5e702 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;
 }