Changeset 23a08aa0 for tests/.expect/declarationSpecifier.arm64.txt

Timestamp:

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

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, stuck-waitfor-destruct

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:

• tests/.expect/declarationSpecifier.arm64.txt (modified) (1 diff)

tests/.expect/declarationSpecifier.arm64.txt

@@ -735 +735 @@
 }
 static volatile const struct __anonymous15 _X3x36KVS13__anonymous15_1;
+_Thread_local signed int _X3x37i_1;
+__thread signed int _X3x38i_1;
 static inline volatile const signed int _X3f11Fi___1();
 static inline volatile const signed int _X3f12Fi___1();