@@ -43,183 +43,178 @@ typedef enum {
4343} __tsan_memory_order;
4444
4545__tsan_atomic8 SANITIZER_CDECL
46- __tsan_atomic8_load (const volatile __tsan_atomic8 *a, __tsan_memory_order mo);
46+ __tsan_atomic8_load (const volatile __tsan_atomic8 *a, int mo);
4747__tsan_atomic16 SANITIZER_CDECL
48- __tsan_atomic16_load (const volatile __tsan_atomic16 *a, __tsan_memory_order mo);
48+ __tsan_atomic16_load (const volatile __tsan_atomic16 *a, int mo);
4949__tsan_atomic32 SANITIZER_CDECL
50- __tsan_atomic32_load (const volatile __tsan_atomic32 *a, __tsan_memory_order mo);
50+ __tsan_atomic32_load (const volatile __tsan_atomic32 *a, int mo);
5151__tsan_atomic64 SANITIZER_CDECL
52- __tsan_atomic64_load (const volatile __tsan_atomic64 *a, __tsan_memory_order mo);
52+ __tsan_atomic64_load (const volatile __tsan_atomic64 *a, int mo);
5353#if __TSAN_HAS_INT128
54- __tsan_atomic128 SANITIZER_CDECL __tsan_atomic128_load (
55- const volatile __tsan_atomic128 *a, __tsan_memory_order mo);
54+ __tsan_atomic128 SANITIZER_CDECL
55+ __tsan_atomic128_load ( const volatile __tsan_atomic128 *a, int mo);
5656#endif
5757
5858void SANITIZER_CDECL __tsan_atomic8_store (volatile __tsan_atomic8 *a,
59- __tsan_atomic8 v,
60- __tsan_memory_order mo);
59+ __tsan_atomic8 v, int mo);
6160void SANITIZER_CDECL __tsan_atomic16_store (volatile __tsan_atomic16 *a,
62- __tsan_atomic16 v,
63- __tsan_memory_order mo);
61+ __tsan_atomic16 v, int mo);
6462void SANITIZER_CDECL __tsan_atomic32_store (volatile __tsan_atomic32 *a,
65- __tsan_atomic32 v,
66- __tsan_memory_order mo);
63+ __tsan_atomic32 v, int mo);
6764void SANITIZER_CDECL __tsan_atomic64_store (volatile __tsan_atomic64 *a,
68- __tsan_atomic64 v,
69- __tsan_memory_order mo);
65+ __tsan_atomic64 v, int mo);
7066#if __TSAN_HAS_INT128
7167void SANITIZER_CDECL __tsan_atomic128_store (volatile __tsan_atomic128 *a,
72- __tsan_atomic128 v,
73- __tsan_memory_order mo);
68+ __tsan_atomic128 v, int mo);
7469#endif
7570
76- __tsan_atomic8 SANITIZER_CDECL __tsan_atomic8_exchange (
77- volatile __tsan_atomic8 *a, __tsan_atomic8 v, __tsan_memory_order mo);
71+ __tsan_atomic8 SANITIZER_CDECL
72+ __tsan_atomic8_exchange ( volatile __tsan_atomic8 *a, __tsan_atomic8 v, int mo);
7873__tsan_atomic16 SANITIZER_CDECL __tsan_atomic16_exchange (
79- volatile __tsan_atomic16 *a, __tsan_atomic16 v, __tsan_memory_order mo);
74+ volatile __tsan_atomic16 *a, __tsan_atomic16 v, int mo);
8075__tsan_atomic32 SANITIZER_CDECL __tsan_atomic32_exchange (
81- volatile __tsan_atomic32 *a, __tsan_atomic32 v, __tsan_memory_order mo);
76+ volatile __tsan_atomic32 *a, __tsan_atomic32 v, int mo);
8277__tsan_atomic64 SANITIZER_CDECL __tsan_atomic64_exchange (
83- volatile __tsan_atomic64 *a, __tsan_atomic64 v, __tsan_memory_order mo);
78+ volatile __tsan_atomic64 *a, __tsan_atomic64 v, int mo);
8479#if __TSAN_HAS_INT128
8580__tsan_atomic128 SANITIZER_CDECL __tsan_atomic128_exchange (
86- volatile __tsan_atomic128 *a, __tsan_atomic128 v, __tsan_memory_order mo);
81+ volatile __tsan_atomic128 *a, __tsan_atomic128 v, int mo);
8782#endif
8883
89- __tsan_atomic8 SANITIZER_CDECL __tsan_atomic8_fetch_add (
90- volatile __tsan_atomic8 *a, __tsan_atomic8 v, __tsan_memory_order mo);
84+ __tsan_atomic8 SANITIZER_CDECL
85+ __tsan_atomic8_fetch_add ( volatile __tsan_atomic8 *a, __tsan_atomic8 v, int mo);
9186__tsan_atomic16 SANITIZER_CDECL __tsan_atomic16_fetch_add (
92- volatile __tsan_atomic16 *a, __tsan_atomic16 v, __tsan_memory_order mo);
87+ volatile __tsan_atomic16 *a, __tsan_atomic16 v, int mo);
9388__tsan_atomic32 SANITIZER_CDECL __tsan_atomic32_fetch_add (
94- volatile __tsan_atomic32 *a, __tsan_atomic32 v, __tsan_memory_order mo);
89+ volatile __tsan_atomic32 *a, __tsan_atomic32 v, int mo);
9590__tsan_atomic64 SANITIZER_CDECL __tsan_atomic64_fetch_add (
96- volatile __tsan_atomic64 *a, __tsan_atomic64 v, __tsan_memory_order mo);
91+ volatile __tsan_atomic64 *a, __tsan_atomic64 v, int mo);
9792#if __TSAN_HAS_INT128
9893__tsan_atomic128 SANITIZER_CDECL __tsan_atomic128_fetch_add (
99- volatile __tsan_atomic128 *a, __tsan_atomic128 v, __tsan_memory_order mo);
94+ volatile __tsan_atomic128 *a, __tsan_atomic128 v, int mo);
10095#endif
10196
102- __tsan_atomic8 SANITIZER_CDECL __tsan_atomic8_fetch_sub (
103- volatile __tsan_atomic8 *a, __tsan_atomic8 v, __tsan_memory_order mo);
97+ __tsan_atomic8 SANITIZER_CDECL
98+ __tsan_atomic8_fetch_sub ( volatile __tsan_atomic8 *a, __tsan_atomic8 v, int mo);
10499__tsan_atomic16 SANITIZER_CDECL __tsan_atomic16_fetch_sub (
105- volatile __tsan_atomic16 *a, __tsan_atomic16 v, __tsan_memory_order mo);
100+ volatile __tsan_atomic16 *a, __tsan_atomic16 v, int mo);
106101__tsan_atomic32 SANITIZER_CDECL __tsan_atomic32_fetch_sub (
107- volatile __tsan_atomic32 *a, __tsan_atomic32 v, __tsan_memory_order mo);
102+ volatile __tsan_atomic32 *a, __tsan_atomic32 v, int mo);
108103__tsan_atomic64 SANITIZER_CDECL __tsan_atomic64_fetch_sub (
109- volatile __tsan_atomic64 *a, __tsan_atomic64 v, __tsan_memory_order mo);
104+ volatile __tsan_atomic64 *a, __tsan_atomic64 v, int mo);
110105#if __TSAN_HAS_INT128
111106__tsan_atomic128 SANITIZER_CDECL __tsan_atomic128_fetch_sub (
112- volatile __tsan_atomic128 *a, __tsan_atomic128 v, __tsan_memory_order mo);
107+ volatile __tsan_atomic128 *a, __tsan_atomic128 v, int mo);
113108#endif
114109
115- __tsan_atomic8 SANITIZER_CDECL __tsan_atomic8_fetch_and (
116- volatile __tsan_atomic8 *a, __tsan_atomic8 v, __tsan_memory_order mo);
110+ __tsan_atomic8 SANITIZER_CDECL
111+ __tsan_atomic8_fetch_and ( volatile __tsan_atomic8 *a, __tsan_atomic8 v, int mo);
117112__tsan_atomic16 SANITIZER_CDECL __tsan_atomic16_fetch_and (
118- volatile __tsan_atomic16 *a, __tsan_atomic16 v, __tsan_memory_order mo);
113+ volatile __tsan_atomic16 *a, __tsan_atomic16 v, int mo);
119114__tsan_atomic32 SANITIZER_CDECL __tsan_atomic32_fetch_and (
120- volatile __tsan_atomic32 *a, __tsan_atomic32 v, __tsan_memory_order mo);
115+ volatile __tsan_atomic32 *a, __tsan_atomic32 v, int mo);
121116__tsan_atomic64 SANITIZER_CDECL __tsan_atomic64_fetch_and (
122- volatile __tsan_atomic64 *a, __tsan_atomic64 v, __tsan_memory_order mo);
117+ volatile __tsan_atomic64 *a, __tsan_atomic64 v, int mo);
123118#if __TSAN_HAS_INT128
124119__tsan_atomic128 SANITIZER_CDECL __tsan_atomic128_fetch_and (
125- volatile __tsan_atomic128 *a, __tsan_atomic128 v, __tsan_memory_order mo);
120+ volatile __tsan_atomic128 *a, __tsan_atomic128 v, int mo);
126121#endif
127122
128- __tsan_atomic8 SANITIZER_CDECL __tsan_atomic8_fetch_or (
129- volatile __tsan_atomic8 *a, __tsan_atomic8 v, __tsan_memory_order mo);
123+ __tsan_atomic8 SANITIZER_CDECL
124+ __tsan_atomic8_fetch_or ( volatile __tsan_atomic8 *a, __tsan_atomic8 v, int mo);
130125__tsan_atomic16 SANITIZER_CDECL __tsan_atomic16_fetch_or (
131- volatile __tsan_atomic16 *a, __tsan_atomic16 v, __tsan_memory_order mo);
126+ volatile __tsan_atomic16 *a, __tsan_atomic16 v, int mo);
132127__tsan_atomic32 SANITIZER_CDECL __tsan_atomic32_fetch_or (
133- volatile __tsan_atomic32 *a, __tsan_atomic32 v, __tsan_memory_order mo);
128+ volatile __tsan_atomic32 *a, __tsan_atomic32 v, int mo);
134129__tsan_atomic64 SANITIZER_CDECL __tsan_atomic64_fetch_or (
135- volatile __tsan_atomic64 *a, __tsan_atomic64 v, __tsan_memory_order mo);
130+ volatile __tsan_atomic64 *a, __tsan_atomic64 v, int mo);
136131#if __TSAN_HAS_INT128
137132__tsan_atomic128 SANITIZER_CDECL __tsan_atomic128_fetch_or (
138- volatile __tsan_atomic128 *a, __tsan_atomic128 v, __tsan_memory_order mo);
133+ volatile __tsan_atomic128 *a, __tsan_atomic128 v, int mo);
139134#endif
140135
141- __tsan_atomic8 SANITIZER_CDECL __tsan_atomic8_fetch_xor (
142- volatile __tsan_atomic8 *a, __tsan_atomic8 v, __tsan_memory_order mo);
136+ __tsan_atomic8 SANITIZER_CDECL
137+ __tsan_atomic8_fetch_xor ( volatile __tsan_atomic8 *a, __tsan_atomic8 v, int mo);
143138__tsan_atomic16 SANITIZER_CDECL __tsan_atomic16_fetch_xor (
144- volatile __tsan_atomic16 *a, __tsan_atomic16 v, __tsan_memory_order mo);
139+ volatile __tsan_atomic16 *a, __tsan_atomic16 v, int mo);
145140__tsan_atomic32 SANITIZER_CDECL __tsan_atomic32_fetch_xor (
146- volatile __tsan_atomic32 *a, __tsan_atomic32 v, __tsan_memory_order mo);
141+ volatile __tsan_atomic32 *a, __tsan_atomic32 v, int mo);
147142__tsan_atomic64 SANITIZER_CDECL __tsan_atomic64_fetch_xor (
148- volatile __tsan_atomic64 *a, __tsan_atomic64 v, __tsan_memory_order mo);
143+ volatile __tsan_atomic64 *a, __tsan_atomic64 v, int mo);
149144#if __TSAN_HAS_INT128
150145__tsan_atomic128 SANITIZER_CDECL __tsan_atomic128_fetch_xor (
151- volatile __tsan_atomic128 *a, __tsan_atomic128 v, __tsan_memory_order mo);
146+ volatile __tsan_atomic128 *a, __tsan_atomic128 v, int mo);
152147#endif
153148
154- __tsan_atomic8 SANITIZER_CDECL __tsan_atomic8_fetch_nand (
155- volatile __tsan_atomic8 *a, __tsan_atomic8 v, __tsan_memory_order mo);
149+ __tsan_atomic8 SANITIZER_CDECL
150+ __tsan_atomic8_fetch_nand ( volatile __tsan_atomic8 *a, __tsan_atomic8 v, int mo);
156151__tsan_atomic16 SANITIZER_CDECL __tsan_atomic16_fetch_nand (
157- volatile __tsan_atomic16 *a, __tsan_atomic16 v, __tsan_memory_order mo);
152+ volatile __tsan_atomic16 *a, __tsan_atomic16 v, int mo);
158153__tsan_atomic32 SANITIZER_CDECL __tsan_atomic32_fetch_nand (
159- volatile __tsan_atomic32 *a, __tsan_atomic32 v, __tsan_memory_order mo);
154+ volatile __tsan_atomic32 *a, __tsan_atomic32 v, int mo);
160155__tsan_atomic64 SANITIZER_CDECL __tsan_atomic64_fetch_nand (
161- volatile __tsan_atomic64 *a, __tsan_atomic64 v, __tsan_memory_order mo);
156+ volatile __tsan_atomic64 *a, __tsan_atomic64 v, int mo);
162157#if __TSAN_HAS_INT128
163158__tsan_atomic128 SANITIZER_CDECL __tsan_atomic128_fetch_nand (
164- volatile __tsan_atomic128 *a, __tsan_atomic128 v, __tsan_memory_order mo);
159+ volatile __tsan_atomic128 *a, __tsan_atomic128 v, int mo);
165160#endif
166161
167162int SANITIZER_CDECL __tsan_atomic8_compare_exchange_weak (
168- volatile __tsan_atomic8 *a, __tsan_atomic8 *c, __tsan_atomic8 v,
169- __tsan_memory_order mo, __tsan_memory_order fail_mo);
163+ volatile __tsan_atomic8 *a, __tsan_atomic8 *c, __tsan_atomic8 v, int mo,
164+ int fail_mo);
170165int SANITIZER_CDECL __tsan_atomic16_compare_exchange_weak (
171- volatile __tsan_atomic16 *a, __tsan_atomic16 *c, __tsan_atomic16 v,
172- __tsan_memory_order mo, __tsan_memory_order fail_mo);
166+ volatile __tsan_atomic16 *a, __tsan_atomic16 *c, __tsan_atomic16 v, int mo,
167+ int fail_mo);
173168int SANITIZER_CDECL __tsan_atomic32_compare_exchange_weak (
174- volatile __tsan_atomic32 *a, __tsan_atomic32 *c, __tsan_atomic32 v,
175- __tsan_memory_order mo, __tsan_memory_order fail_mo);
169+ volatile __tsan_atomic32 *a, __tsan_atomic32 *c, __tsan_atomic32 v, int mo,
170+ int fail_mo);
176171int SANITIZER_CDECL __tsan_atomic64_compare_exchange_weak (
177- volatile __tsan_atomic64 *a, __tsan_atomic64 *c, __tsan_atomic64 v,
178- __tsan_memory_order mo, __tsan_memory_order fail_mo);
172+ volatile __tsan_atomic64 *a, __tsan_atomic64 *c, __tsan_atomic64 v, int mo,
173+ int fail_mo);
179174#if __TSAN_HAS_INT128
180175int SANITIZER_CDECL __tsan_atomic128_compare_exchange_weak (
181176 volatile __tsan_atomic128 *a, __tsan_atomic128 *c, __tsan_atomic128 v,
182- __tsan_memory_order mo, __tsan_memory_order fail_mo);
177+ int mo, int fail_mo);
183178#endif
184179
185180int SANITIZER_CDECL __tsan_atomic8_compare_exchange_strong (
186- volatile __tsan_atomic8 *a, __tsan_atomic8 *c, __tsan_atomic8 v,
187- __tsan_memory_order mo, __tsan_memory_order fail_mo);
181+ volatile __tsan_atomic8 *a, __tsan_atomic8 *c, __tsan_atomic8 v, int mo,
182+ int fail_mo);
188183int SANITIZER_CDECL __tsan_atomic16_compare_exchange_strong (
189- volatile __tsan_atomic16 *a, __tsan_atomic16 *c, __tsan_atomic16 v,
190- __tsan_memory_order mo, __tsan_memory_order fail_mo);
184+ volatile __tsan_atomic16 *a, __tsan_atomic16 *c, __tsan_atomic16 v, int mo,
185+ int fail_mo);
191186int SANITIZER_CDECL __tsan_atomic32_compare_exchange_strong (
192- volatile __tsan_atomic32 *a, __tsan_atomic32 *c, __tsan_atomic32 v,
193- __tsan_memory_order mo, __tsan_memory_order fail_mo);
187+ volatile __tsan_atomic32 *a, __tsan_atomic32 *c, __tsan_atomic32 v, int mo,
188+ int fail_mo);
194189int SANITIZER_CDECL __tsan_atomic64_compare_exchange_strong (
195- volatile __tsan_atomic64 *a, __tsan_atomic64 *c, __tsan_atomic64 v,
196- __tsan_memory_order mo, __tsan_memory_order fail_mo);
190+ volatile __tsan_atomic64 *a, __tsan_atomic64 *c, __tsan_atomic64 v, int mo,
191+ int fail_mo);
197192#if __TSAN_HAS_INT128
198193int SANITIZER_CDECL __tsan_atomic128_compare_exchange_strong (
199194 volatile __tsan_atomic128 *a, __tsan_atomic128 *c, __tsan_atomic128 v,
200- __tsan_memory_order mo, __tsan_memory_order fail_mo);
195+ int mo, int fail_mo);
201196#endif
202197
203198__tsan_atomic8 SANITIZER_CDECL __tsan_atomic8_compare_exchange_val (
204- volatile __tsan_atomic8 *a, __tsan_atomic8 c, __tsan_atomic8 v,
205- __tsan_memory_order mo, __tsan_memory_order fail_mo);
199+ volatile __tsan_atomic8 *a, __tsan_atomic8 c, __tsan_atomic8 v, int mo,
200+ int fail_mo);
206201__tsan_atomic16 SANITIZER_CDECL __tsan_atomic16_compare_exchange_val (
207- volatile __tsan_atomic16 *a, __tsan_atomic16 c, __tsan_atomic16 v,
208- __tsan_memory_order mo, __tsan_memory_order fail_mo);
202+ volatile __tsan_atomic16 *a, __tsan_atomic16 c, __tsan_atomic16 v, int mo,
203+ int fail_mo);
209204__tsan_atomic32 SANITIZER_CDECL __tsan_atomic32_compare_exchange_val (
210- volatile __tsan_atomic32 *a, __tsan_atomic32 c, __tsan_atomic32 v,
211- __tsan_memory_order mo, __tsan_memory_order fail_mo);
205+ volatile __tsan_atomic32 *a, __tsan_atomic32 c, __tsan_atomic32 v, int mo,
206+ int fail_mo);
212207__tsan_atomic64 SANITIZER_CDECL __tsan_atomic64_compare_exchange_val (
213- volatile __tsan_atomic64 *a, __tsan_atomic64 c, __tsan_atomic64 v,
214- __tsan_memory_order mo, __tsan_memory_order fail_mo);
208+ volatile __tsan_atomic64 *a, __tsan_atomic64 c, __tsan_atomic64 v, int mo,
209+ int fail_mo);
215210#if __TSAN_HAS_INT128
216211__tsan_atomic128 SANITIZER_CDECL __tsan_atomic128_compare_exchange_val (
217212 volatile __tsan_atomic128 *a, __tsan_atomic128 c, __tsan_atomic128 v,
218- __tsan_memory_order mo, __tsan_memory_order fail_mo);
213+ int mo, int fail_mo);
219214#endif
220215
221- void SANITIZER_CDECL __tsan_atomic_thread_fence (__tsan_memory_order mo);
222- void SANITIZER_CDECL __tsan_atomic_signal_fence (__tsan_memory_order mo);
216+ void SANITIZER_CDECL __tsan_atomic_thread_fence (int mo);
217+ void SANITIZER_CDECL __tsan_atomic_signal_fence (int mo);
223218
224219#ifdef __cplusplus
225220} // extern "C"
0 commit comments