Changeset 23a08aa0 for src/InitTweak/InitTweak.cc

Timestamp:

Sep 19, 2022, 8:11:02 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

aa9f215

Parents:

ebf8ca5 (diff), ae1d151 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

fix merge conflict

File:

• src/InitTweak/InitTweak.cc (modified) (2 diffs)

src/InitTweak/InitTweak.cc

@@ -1241 +1241 @@
         static const char * const tlsd_section = ".tdata" ASM_COMMENT;
         void addDataSectionAttribute( ObjectDecl * objDecl ) {
-                const bool is_tls = objDecl->get_storageClasses().is_threadlocal;
+                const bool is_tls = objDecl->get_storageClasses().is_threadlocal_any();
                 const char * section = is_tls ? tlsd_section : data_section;
                 objDecl->attributes.push_back(new Attribute("section", {
@@ -1249 +1249 @@
 
         void addDataSectionAttribute( ast::ObjectDecl * objDecl ) {
-                const bool is_tls = objDecl->storage.is_threadlocal;
+                const bool is_tls = objDecl->storage.is_threadlocal_any();
                 const char * section = is_tls ? tlsd_section : data_section;
                 objDecl->attributes.push_back(new ast::Attribute("section", {