Index: lib/tsan/rtl/tsan.syms.extra
===================================================================
--- lib/tsan/rtl/tsan.syms.extra
+++ lib/tsan/rtl/tsan.syms.extra
@@ -8,8 +8,8 @@
 __tsan_unaligned*
 __tsan_release
 __tsan_acquire
+__tsan_RunningOnValgrind
 __ubsan_*
 Annotate*
 WTFAnnotate*
-RunningOnValgrind
 ValgrindSlowdown
Index: lib/tsan/rtl/tsan_flags.inc
===================================================================
--- lib/tsan/rtl/tsan_flags.inc
+++ lib/tsan/rtl/tsan_flags.inc
@@ -60,7 +60,7 @@
 TSAN_FLAG(bool, stop_on_start, false,
           "Stops on start until __tsan_resume() is called (for debugging).")
 TSAN_FLAG(bool, running_on_valgrind, false,
-          "Controls whether RunningOnValgrind() returns true or false.")
+          "Controls whether __tsan_RunningOnValgrind() returns true or false.")
 TSAN_FLAG(
     int, history_size, kGoMode ? 1 : 3, // There are a lot of goroutines in Go.
     "Per-thread history size, controls how many previous memory accesses "
Index: lib/tsan/rtl/tsan_interface_ann.cc
===================================================================
--- lib/tsan/rtl/tsan_interface_ann.cc
+++ lib/tsan/rtl/tsan_interface_ann.cc
@@ -439,7 +439,7 @@
   BenignRaceImpl(f, l, mem, sz, desc);
 }
 
-int INTERFACE_ATTRIBUTE RunningOnValgrind() {
+int INTERFACE_ATTRIBUTE __tsan_RunningOnValgrind() {
   return flags()->running_on_valgrind;
 }