1 files changed, 24 insertions, 22 deletions

diff --git a/lib/tsan/go/test.c b/lib/tsan/go/test.c
index 2414a1e9925f7..902dfc915582b 100644
--- a/lib/tsan/go/test.c
+++ b/lib/tsan/go/test.c
@@ -13,20 +13,20 @@
 
 #include <stdio.h>
 
-void __tsan_init();
+void __tsan_init(void **thr);
 void __tsan_fini();
 void __tsan_map_shadow(void *addr, unsigned long size);
-void __tsan_go_start(int pgoid, int chgoid, void *pc);
-void __tsan_go_end(int goid);
-void __tsan_read(int goid, void *addr, void *pc);
-void __tsan_write(int goid, void *addr, void *pc);
-void __tsan_func_enter(int goid, void *pc);
-void __tsan_func_exit(int goid);
-void __tsan_malloc(int goid, void *p, unsigned long sz, void *pc);
+void __tsan_go_start(void *thr, void **chthr, void *pc);
+void __tsan_go_end(void *thr);
+void __tsan_read(void *thr, void *addr, void *pc);
+void __tsan_write(void *thr, void *addr, void *pc);
+void __tsan_func_enter(void *thr, void *pc);
+void __tsan_func_exit(void *thr);
+void __tsan_malloc(void *thr, void *p, unsigned long sz, void *pc);
 void __tsan_free(void *p);
-void __tsan_acquire(int goid, void *addr);
-void __tsan_release(int goid, void *addr);
-void __tsan_release_merge(int goid, void *addr);
+void __tsan_acquire(void *thr, void *addr);
+void __tsan_release(void *thr, void *addr);
+void __tsan_release_merge(void *thr, void *addr);
 
 int __tsan_symbolize(void *pc, char **img, char **rtn, char **file, int *l) {
   return 0;
@@ -35,19 +35,21 @@ int __tsan_symbolize(void *pc, char **img, char **rtn, char **file, int *l) {
 char buf[10];
 
 int main(void) {
-  __tsan_init();
+  void *thr0 = 0;
+  __tsan_init(&thr0);
   __tsan_map_shadow(buf, sizeof(buf) + 4096);
-  __tsan_func_enter(0, &main);
-  __tsan_malloc(0, buf, 10, 0);
-  __tsan_release(0, buf);
-  __tsan_release_merge(0, buf);
-  __tsan_go_start(0, 1, 0);
-  __tsan_write(1, buf, 0);
-  __tsan_acquire(1, buf);
-  __tsan_go_end(1);
-  __tsan_read(0, buf, 0);
+  __tsan_func_enter(thr0, &main);
+  __tsan_malloc(thr0, buf, 10, 0);
+  __tsan_release(thr0, buf);
+  __tsan_release_merge(thr0, buf);
+  void *thr1 = 0;
+  __tsan_go_start(thr0, &thr1, 0);
+  __tsan_write(thr1, buf, 0);
+  __tsan_acquire(thr1, buf);
+  __tsan_go_end(thr1);
+  __tsan_read(thr0, buf, 0);
   __tsan_free(buf);
-  __tsan_func_exit(0);
+  __tsan_func_exit(thr0);
   __tsan_fini();
   return 0;
 }