aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorKai Tietz <kai.tietz@onevision.com>2010-05-21 11:25:23 +0000
committerKai Tietz <ktietz@gcc.gnu.org>2010-05-21 13:25:23 +0200
commite193556973554307f323306faefe9b4aaaea6f8d (patch)
tree0ff8c4a2f3c77eb7860df7c997cbf6599edde20a /gcc
parent46314d3e81d9f46274e20bac701671c5f3c5493e (diff)
downloadgcc-e193556973554307f323306faefe9b4aaaea6f8d.zip
gcc-e193556973554307f323306faefe9b4aaaea6f8d.tar.gz
gcc-e193556973554307f323306faefe9b4aaaea6f8d.tar.bz2
varasm.c (emutls_decl): Merge attributes to new decl.
2010-05-21 Kai Tietz <kai.tietz@onevision.com> PR/44139 * varasm.c (emutls_decl): Merge attributes to new decl. From-SVN: r159658
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/varasm.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ac091e5..276c80c 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 5fb57dc..701847c 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);