aboutsummaryrefslogtreecommitdiff
path: root/test/tsan/Darwin
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2017-04-20 21:20:59 +0000
committerDimitry Andric <dim@FreeBSD.org>2017-04-20 21:20:59 +0000
commitf351c8a560ddc5b5df9ee5ba4ccc1cfb9029146d (patch)
treea1af403c7ce4e7447ee7e01c045d260dba9a409b /test/tsan/Darwin
parentab0bf875a5f328a6710f4e48258979ae1bc8da1c (diff)
downloadsrc-f351c8a560ddc5b5df9ee5ba4ccc1cfb9029146d.tar.gz
src-f351c8a560ddc5b5df9ee5ba4ccc1cfb9029146d.zip
Vendor import of compiler-rt trunk r300890:vendor/compiler-rt/compiler-rt-trunk-r300890
Notes
Notes: svn path=/vendor/compiler-rt/dist/; revision=317222 svn path=/vendor/compiler-rt/compiler-rt-trunk-r300890/; revision=317223; tag=vendor/compiler-rt/compiler-rt-trunk-r300890
Diffstat (limited to 'test/tsan/Darwin')
-rw-r--r--test/tsan/Darwin/main_tid.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/tsan/Darwin/main_tid.mm b/test/tsan/Darwin/main_tid.mm
index af658e4b96e5..6dea58e53326 100644
--- a/test/tsan/Darwin/main_tid.mm
+++ b/test/tsan/Darwin/main_tid.mm
@@ -8,7 +8,7 @@
extern "C" {
void __tsan_on_report(void *report);
int __tsan_get_report_thread(void *report, unsigned long idx, int *tid,
- unsigned long *os_id, int *running,
+ uint64_t *os_id, int *running,
const char **name, int *parent_tid, void **trace,
unsigned long trace_size);
}
@@ -17,7 +17,7 @@ void __tsan_on_report(void *report) {
fprintf(stderr, "__tsan_on_report(%p)\n", report);
int tid;
- unsigned long os_id;
+ uint64_t os_id;
int running;
const char *name;
int parent_tid;