diff --git a/compiler-rt/test/tsan/ignorelist2.cpp b/compiler-rt/test/tsan/ignorelist2.cpp
--- a/compiler-rt/test/tsan/ignorelist2.cpp
+++ b/compiler-rt/test/tsan/ignorelist2.cpp
@@ -18,13 +18,13 @@
   return NULL;
 }
 
-void TouchGlobal() __attribute__((noinline)) {
+__attribute__((noinline)) void TouchGlobal() {
   // CHECK: Previous write of size 4
   // CHECK: #0 TouchGlobal{{.*}}ignorelist2.cpp:[[@LINE+1]]
   Global--;
 }
 
-void CallTouchGlobal() __attribute__((noinline)) {
+__attribute__((noinline)) void CallTouchGlobal() {
   // CHECK: #1 CallTouchGlobal{{.*}}ignorelist2.cpp:[[@LINE+1]]
   TouchGlobal();
 }
diff --git a/compiler-rt/test/tsan/longjmp3.cpp b/compiler-rt/test/tsan/longjmp3.cpp
--- a/compiler-rt/test/tsan/longjmp3.cpp
+++ b/compiler-rt/test/tsan/longjmp3.cpp
@@ -17,14 +17,14 @@
   x++;
 }
 
-void badguy() __attribute__((noinline)) {
+__attribute__((noinline)) void badguy() {
   pthread_mutex_t mtx;
   pthread_mutex_init(&mtx, 0);
   pthread_mutex_lock(&mtx);
   pthread_mutex_destroy(&mtx);
 }
 
-void mymain() __attribute__((noinline)) {
+__attribute__((noinline)) void mymain() {
   jmp_buf env;
   if (setjmp(env) == 42) {
     badguy();
diff --git a/compiler-rt/test/tsan/longjmp4.cpp b/compiler-rt/test/tsan/longjmp4.cpp
--- a/compiler-rt/test/tsan/longjmp4.cpp
+++ b/compiler-rt/test/tsan/longjmp4.cpp
@@ -20,14 +20,14 @@
   x++;
 }
 
-void badguy() __attribute__((noinline)) {
+__attribute__((noinline)) void badguy() {
   pthread_mutex_t mtx;
   pthread_mutex_init(&mtx, 0);
   pthread_mutex_lock(&mtx);
   pthread_mutex_destroy(&mtx);
 }
 
-void mymain() __attribute__((noinline)) {
+__attribute__((noinline)) void mymain() {
   jmp_buf env;
   if (setjmp(env) == 42) {
     badguy();
diff --git a/compiler-rt/test/tsan/race_on_heap.cpp b/compiler-rt/test/tsan/race_on_heap.cpp
--- a/compiler-rt/test/tsan/race_on_heap.cpp
+++ b/compiler-rt/test/tsan/race_on_heap.cpp
@@ -14,7 +14,7 @@
   return 0;
 }
 
-void *alloc() __attribute__((noinline)) {
+__attribute__((noinline)) void *alloc() {
   return malloc(99);
 }
 
diff --git a/compiler-rt/test/tsan/race_top_suppression.cpp b/compiler-rt/test/tsan/race_top_suppression.cpp
--- a/compiler-rt/test/tsan/race_top_suppression.cpp
+++ b/compiler-rt/test/tsan/race_top_suppression.cpp
@@ -6,7 +6,7 @@
 
 int Global;
 
-void TopFunction(int *p) __attribute__((noinline)) {
+__attribute__((noinline)) void TopFunction(int *p) {
   *p = 1;
 }