diff options
| author | hubicka <hubicka@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-06-16 01:15:09 +0000 |
|---|---|---|
| committer | hubicka <hubicka@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-06-16 01:15:09 +0000 |
| commit | 1153fb2a77df8434cefcb090a0e8df7236bf82d6 (patch) | |
| tree | e14d1ba9a29bc3805015cb4673705588ecb11b20 | |
| parent | 582445ce1f4592bfa2b1fd74fb9fb6ea64b219ba (diff) | |
| download | gcc-1153fb2a77df8434cefcb090a0e8df7236bf82d6.tar.gz | |
* decl.c (grokvardecl): Fix pasto in previous patch.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@211693 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 8ab004896fc..9784a59a340 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 1c8d4978848..a76980f928a 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; |