From: ktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 21 May 2010 11:25:23 +0000 (+0000)
Subject: 2010-05-21  Kai Tietz  <kai.tietz@onevision.com>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83e170dfd44c597e8432d9cbb798819a4bfbb287;p=thirdparty%2Fgcc.git

2010-05-21  Kai Tietz  <kai.tietz@onevision.com>

        PR/44139
        * varasm.c (emutls_decl): Merge attributes to new decl.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159658 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ac091e5eab9f..276c80ca44ab 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-21  Kai Tietz  <kai.tietz@onevision.com>
+
+	PR/44139
+	* varasm.c (emutls_decl): Merge attributes to new decl.
+
 2010-05-21  Eric Botcazou  <ebotcazou@adacore.com>
 
 	PR middle-end/44101
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 5fb57dcdda76..701847c45db3 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -403,6 +403,8 @@ emutls_decl (tree decl)
 	int foo() { return i; }
 	__thread int i = 1;
      in which I goes from external to locally defined and initialized.  */
+  DECL_DLLIMPORT_P (to) = DECL_DLLIMPORT_P (decl);
+  DECL_ATTRIBUTES (to) = targetm.merge_decl_attributes (decl, to);
 
   TREE_STATIC (to) = TREE_STATIC (decl);
   TREE_USED (to) = TREE_USED (decl);