8 files changed, 14 insertions, 5 deletions
diff --git a/compiler-rt/lib/asan/CMakeLists.txt b/compiler-rt/lib/asan/CMakeLists.txt
index bddae9fe319..030c7b3ec3f 100644
--- a/compiler-rt/lib/asan/CMakeLists.txt
+++ b/compiler-rt/lib/asan/CMakeLists.txt
@@ -86,7 +86,8 @@ else()
               $<TARGET_OBJECTS:RTInterception.${arch}>
               $<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
       CFLAGS ${ASAN_CFLAGS}
-      DEFS ${ASAN_COMMON_DEFINITIONS})
+      DEFS ${ASAN_COMMON_DEFINITIONS}
+      SYMS asan.syms)
     list(APPEND ASAN_RUNTIME_LIBRARIES clang_rt.asan-${arch})
   endforeach()
 endif()
diff --git a/compiler-rt/lib/asan/asan.syms b/compiler-rt/lib/asan/asan.syms
new file mode 100644
index 00000000000..33c8fcb0fc1
--- /dev/null
+++ b/compiler-rt/lib/asan/asan.syms
@@ -0,0 +1 @@
+{ __asan_*; };
diff --git a/compiler-rt/lib/msan/CMakeLists.txt b/compiler-rt/lib/msan/CMakeLists.txt
index 6f10942ce19..5eedbea743c 100644
--- a/compiler-rt/lib/msan/CMakeLists.txt
+++ b/compiler-rt/lib/msan/CMakeLists.txt
@@ -24,7 +24,8 @@ if(CAN_TARGET_${arch})
     SOURCES ${MSAN_RTL_SOURCES}
             $<TARGET_OBJECTS:RTInterception.${arch}>
             $<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
-    CFLAGS ${MSAN_RTL_CFLAGS})
+    CFLAGS ${MSAN_RTL_CFLAGS}
+    SYMS msan.syms)
   list(APPEND MSAN_RUNTIME_LIBRARIES clang_rt.msan-${arch})
 endif()
 
diff --git a/compiler-rt/lib/msan/msan.syms b/compiler-rt/lib/msan/msan.syms
new file mode 100644
index 00000000000..91499b4d120
--- /dev/null
+++ b/compiler-rt/lib/msan/msan.syms
@@ -0,0 +1 @@
+{ __msan_*; };
diff --git a/compiler-rt/lib/tsan/rtl/CMakeLists.txt b/compiler-rt/lib/tsan/rtl/CMakeLists.txt
index f2a8533b845..8d89e6e7ba3 100644
--- a/compiler-rt/lib/tsan/rtl/CMakeLists.txt
+++ b/compiler-rt/lib/tsan/rtl/CMakeLists.txt
@@ -44,6 +44,7 @@ if(CAN_TARGET_x86_64 AND UNIX AND NOT APPLE)
             $<TARGET_OBJECTS:RTInterception.${arch}>
             $<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
     CFLAGS ${TSAN_CFLAGS}
-    DEFS ${TSAN_COMMON_DEFINITIONS})
+    DEFS ${TSAN_COMMON_DEFINITIONS}
+    SYMS tsan.syms)
   list(APPEND TSAN_RUNTIME_LIBRARIES clang_rt.tsan-${arch})
 endif()
diff --git a/compiler-rt/lib/tsan/rtl/tsan.syms b/compiler-rt/lib/tsan/rtl/tsan.syms
new file mode 100644
index 00000000000..bedbe13169f
--- /dev/null
+++ b/compiler-rt/lib/tsan/rtl/tsan.syms
@@ -0,0 +1 @@
+{ __tsan_*; };
diff --git a/compiler-rt/lib/ubsan/CMakeLists.txt b/compiler-rt/lib/ubsan/CMakeLists.txt
index 3dd8613be70..c8470bc6d35 100644
--- a/compiler-rt/lib/ubsan/CMakeLists.txt
+++ b/compiler-rt/lib/ubsan/CMakeLists.txt
@@ -34,11 +34,13 @@ else()
     # Main UBSan runtime.
     add_compiler_rt_static_runtime(clang_rt.ubsan-${arch} ${arch}
       SOURCES ${UBSAN_SOURCES}
-      CFLAGS ${UBSAN_CFLAGS})
+      CFLAGS ${UBSAN_CFLAGS}
+      SYMS ubsan.syms)
     # C++-specific parts of UBSan runtime. Requires a C++ ABI library.
     add_compiler_rt_static_runtime(clang_rt.ubsan_cxx-${arch} ${arch}
       SOURCES ${UBSAN_CXX_SOURCES}
-      CFLAGS ${UBSAN_CFLAGS})
+      CFLAGS ${UBSAN_CFLAGS}
+      SYMS ubsan.syms)
     list(APPEND UBSAN_RUNTIME_LIBRARIES
            clang_rt.san-${arch}
            clang_rt.ubsan-${arch}
diff --git a/compiler-rt/lib/ubsan/ubsan.syms b/compiler-rt/lib/ubsan/ubsan.syms
new file mode 100644
index 00000000000..e74de33f012
--- /dev/null
+++ b/compiler-rt/lib/ubsan/ubsan.syms
@@ -0,0 +1 @@
+{ __ubsan_*; };