4 files changed, 20 insertions, 46 deletions
diff --git a/compiler-rt/lib/tsan/lit_tests/java.h b/compiler-rt/lib/tsan/lit_tests/java.h
new file mode 100644
index 00000000000..7d61f580286
--- /dev/null
+++ b/compiler-rt/lib/tsan/lit_tests/java.h
@@ -0,0 +1,17 @@
+#include <pthread.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+
+extern "C" {
+typedef unsigned long jptr;  // NOLINT
+void __tsan_java_init(jptr heap_begin, jptr heap_size);
+int  __tsan_java_fini();
+void __tsan_java_alloc(jptr ptr, jptr size);
+void __tsan_java_free(jptr ptr, jptr size);
+void __tsan_java_move(jptr src, jptr dst, jptr size);
+void __tsan_java_mutex_lock(jptr addr);
+void __tsan_java_mutex_unlock(jptr addr);
+void __tsan_java_mutex_read_lock(jptr addr);
+void __tsan_java_mutex_read_unlock(jptr addr);
+}
diff --git a/compiler-rt/lib/tsan/lit_tests/java_lock.cc b/compiler-rt/lib/tsan/lit_tests/java_lock.cc
index 5f8f5bd968b..7ab50d1d9a3 100644
--- a/compiler-rt/lib/tsan/lit_tests/java_lock.cc
+++ b/compiler-rt/lib/tsan/lit_tests/java_lock.cc
@@ -1,19 +1,5 @@
 // RUN: %clangxx_tsan -O1 %s -o %t && %t 2>&1 | FileCheck %s
-#include <pthread.h>
-#include <stdlib.h>
-
-extern "C" {
-typedef unsigned long jptr;  // NOLINT
-void __tsan_java_init(jptr heap_begin, jptr heap_size);
-int  __tsan_java_fini();
-void __tsan_java_alloc(jptr ptr, jptr size);
-void __tsan_java_free(jptr ptr, jptr size);
-void __tsan_java_move(jptr src, jptr dst, jptr size);
-void __tsan_java_mutex_lock(jptr addr);
-void __tsan_java_mutex_unlock(jptr addr);
-void __tsan_java_mutex_read_lock(jptr addr);
-void __tsan_java_mutex_read_unlock(jptr addr);
-}
+#include "java.h"
 
 jptr varaddr;
 jptr lockaddr;
diff --git a/compiler-rt/lib/tsan/lit_tests/java_lock_move.cc b/compiler-rt/lib/tsan/lit_tests/java_lock_move.cc
index 3b30085b142..42c7e77689a 100644
--- a/compiler-rt/lib/tsan/lit_tests/java_lock_move.cc
+++ b/compiler-rt/lib/tsan/lit_tests/java_lock_move.cc
@@ -1,20 +1,5 @@
 // RUN: %clangxx_tsan -O1 %s -o %t && %t 2>&1 | FileCheck %s
-#include <pthread.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-extern "C" {
-typedef unsigned long jptr;  // NOLINT
-void __tsan_java_init(jptr heap_begin, jptr heap_size);
-int  __tsan_java_fini();
-void __tsan_java_alloc(jptr ptr, jptr size);
-void __tsan_java_free(jptr ptr, jptr size);
-void __tsan_java_move(jptr src, jptr dst, jptr size);
-void __tsan_java_mutex_lock(jptr addr);
-void __tsan_java_mutex_unlock(jptr addr);
-void __tsan_java_mutex_read_lock(jptr addr);
-void __tsan_java_mutex_read_unlock(jptr addr);
-}
+#include "java.h"
 
 jptr varaddr;
 jptr lockaddr;
diff --git a/compiler-rt/lib/tsan/lit_tests/java_race.cc b/compiler-rt/lib/tsan/lit_tests/java_race.cc
index 9e842243d2d..722bb6e8d09 100644
--- a/compiler-rt/lib/tsan/lit_tests/java_race.cc
+++ b/compiler-rt/lib/tsan/lit_tests/java_race.cc
@@ -1,19 +1,5 @@
 // RUN: %clangxx_tsan -O1 %s -o %t && %t 2>&1 | FileCheck %s
-#include <pthread.h>
-#include <stdlib.h>
-
-extern "C" {
-typedef unsigned long jptr;  // NOLINT
-void __tsan_java_init(jptr heap_begin, jptr heap_size);
-int  __tsan_java_fini();
-void __tsan_java_alloc(jptr ptr, jptr size);
-void __tsan_java_free(jptr ptr, jptr size);
-void __tsan_java_move(jptr src, jptr dst, jptr size);
-void __tsan_java_mutex_lock(jptr addr);
-void __tsan_java_mutex_unlock(jptr addr);
-void __tsan_java_mutex_read_lock(jptr addr);
-void __tsan_java_mutex_read_unlock(jptr addr);
-}
+#include "java.h"
 
 void *Thread(void *p) {
   *(int*)p = 42;