diff options
| author | Jan Hubicka <hubicka@ucw.cz> | 2014-06-16 03:15:09 +0200 |
|---|---|---|
| committer | Jan Hubicka <hubicka@gcc.gnu.org> | 2014-06-16 01:15:09 +0000 |
| commit | 590db899b111a413351de99ef477d4b15910af87 (patch) | |
| tree | e14d1ba9a29bc3805015cb4673705588ecb11b20 /gcc | |
| parent | 2d3e37f8d74fa8cb1992f317365e3b94b7bb695a (diff) | |
| download | gcc-590db899b111a413351de99ef477d4b15910af87.zip gcc-590db899b111a413351de99ef477d4b15910af87.tar.gz gcc-590db899b111a413351de99ef477d4b15910af87.tar.bz2 | |
* decl.c (grokvardecl): Fix pasto in previous patch.
From-SVN: r211693
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8ab0048..9784a59 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2014-06-15 Jan Hubicka <hubicka@ucw.cz> + * decl.c (grokvardecl): Fix pasto in previous patch. + +2014-06-15 Jan Hubicka <hubicka@ucw.cz> + * decl.c (duplicate_decls): Use set_decl_tls_model. (grokdeclarator): Likewise. * semantics.c (finish_id_expression): Check TLS only for diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 1c8d497..a76980f 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -8016,7 +8016,7 @@ grokvardecl (tree type, if (decl_spec_seq_has_spec_p (declspecs, ds_thread)) { - if (DECL_EXTERNAL (decl) || TREE_PUBLIC (decl)) + if (DECL_EXTERNAL (decl) || TREE_STATIC (decl)) set_decl_tls_model (decl, decl_default_tls_model (decl)); if (declspecs->gnu_thread_keyword_p) DECL_GNU_TLS_P (decl) = true; |