diff options
Diffstat (limited to 'gcc/c')
| -rw-r--r-- | gcc/c/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c/c-decl.c | 4 | ||||
| -rw-r--r-- | gcc/c/c-parser.c | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index 86372fa..cc3e5fe 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,8 @@ +2014-06-15 Jan Hubicka <hubicka@ucw.cz> + + * c-parser.c (c_parser_omp_threadprivate): Likewise. + * c-decl.c (merge_decls): Likewise. + 2014-06-09 Marek Polacek <polacek@redhat.com> PR c/36446 diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c index 4acb4f9..3456030 100644 --- a/gcc/c/c-decl.c +++ b/gcc/c/c-decl.c @@ -2294,7 +2294,7 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype) /* Merge the threadprivate attribute. */ if (TREE_CODE (olddecl) == VAR_DECL && C_DECL_THREADPRIVATE_P (olddecl)) { - DECL_TLS_MODEL (newdecl) = DECL_TLS_MODEL (olddecl); + set_decl_tls_model (newdecl, DECL_TLS_MODEL (olddecl)); C_DECL_THREADPRIVATE_P (newdecl) = 1; } @@ -6345,7 +6345,7 @@ grokdeclarator (const struct c_declarator *declarator, } if (threadp) - DECL_TLS_MODEL (decl) = decl_default_tls_model (decl); + set_decl_tls_model (decl, decl_default_tls_model (decl)); } if ((storage_class == csc_extern diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c index abd636c..5fecb48 100644 --- a/gcc/c/c-parser.c +++ b/gcc/c/c-parser.c @@ -13557,7 +13557,7 @@ c_parser_omp_threadprivate (c_parser *parser) { if (! DECL_THREAD_LOCAL_P (v)) { - DECL_TLS_MODEL (v) = decl_default_tls_model (v); + set_decl_tls_model (v, decl_default_tls_model (v)); /* If rtl has been already set for this var, call make_decl_rtl once again, so that encode_section_info has a chance to look at the new decl flags. */ |