1 files changed, 57 insertions, 15 deletions
diff --git a/lib/sanitizer_common/CMakeLists.txt b/lib/sanitizer_common/CMakeLists.txt
index d797a56dabd9..ee0e1237c1a9 100644
--- a/lib/sanitizer_common/CMakeLists.txt
+++ b/lib/sanitizer_common/CMakeLists.txt
@@ -10,26 +10,68 @@ set(SANITIZER_SOURCES
   sanitizer_mac.cc
   sanitizer_posix.cc
   sanitizer_printf.cc
+  sanitizer_stackdepot.cc
+  sanitizer_stacktrace.cc
   sanitizer_symbolizer.cc
+  sanitizer_symbolizer_itanium.cc
+  sanitizer_symbolizer_linux.cc
+  sanitizer_symbolizer_mac.cc
+  sanitizer_symbolizer_win.cc
   sanitizer_win.cc
   )
 
-set(SANITIZER_CFLAGS "-fPIC -fno-exceptions -funwind-tables -fvisibility=hidden")
+# Explicitly list all sanitizer_common headers. Not all of these are
+# included in sanitizer_common source files, but we need to depend on
+# headers when building our custom unit tests.
+set(SANITIZER_HEADERS
+  sanitizer_allocator.h
+  sanitizer_atomic_clang.h
+  sanitizer_atomic_msvc.h
+  sanitizer_atomic.h
+  sanitizer_common.h
+  sanitizer_common_interceptors.inc
+  sanitizer_common_interceptors_scanf.inc
+  sanitizer_flags.h
+  sanitizer_internal_defs.h
+  sanitizer_lfstack.h
+  sanitizer_libc.h
+  sanitizer_list.h
+  sanitizer_mutex.h
+  sanitizer_placement_new.h
+  sanitizer_platform_interceptors.h
+  sanitizer_procmaps.h
+  sanitizer_quarantine.h
+  sanitizer_report_decorator.h
+  sanitizer_stackdepot.h
+  sanitizer_stacktrace.h
+  sanitizer_symbolizer.h
+  )
 
-set(SANITIZER_COMMON_DEFINITIONS
-	SANITIZER_HAS_EXCEPTIONS=1)
+set(SANITIZER_CFLAGS ${SANITIZER_COMMON_CFLAGS})
 
-if(CAN_TARGET_X86_64)
-  add_library(RTSanitizerCommon.x86_64 OBJECT ${SANITIZER_SOURCES})
-  set_property(TARGET RTSanitizerCommon.x86_64 PROPERTY COMPILE_FLAGS
-		"${SANITIZER_CFLAGS} ${TARGET_X86_64_CFLAGS}")
-  set_property(TARGET RTSanitizerCommon.x86_64 APPEND PROPERTY COMPILE_DEFINITIONS
-		${SANITIZER_COMMON_DEFINITIONS})
+set(SANITIZER_RUNTIME_LIBRARIES)
+if(APPLE)
+  # Build universal binary on APPLE.
+  add_library(RTSanitizerCommon.osx OBJECT ${SANITIZER_SOURCES})
+  set_target_compile_flags(RTSanitizerCommon.osx ${SANITIZER_CFLAGS})
+  set_target_properties(RTSanitizerCommon.osx PROPERTIES
+    OSX_ARCHITECTURES "${SANITIZER_COMMON_SUPPORTED_ARCH}")
+  list(APPEND SANITIZER_RUNTIME_LIBRARIES RTSanitizerCommon.osx)
+elseif(ANDROID)
+  add_library(RTSanitizerCommon.arm.android OBJECT ${SANITIZER_SOURCES})
+  set_target_compile_flags(RTSanitizerCommon.arm.android
+    ${SANITIZER_CFLAGS})
+  list(APPEND SANITIZER_RUNTIME_LIBRARIES RTSanitizerCommon.arm.android)
+else()
+  # Otherwise, build separate libraries for each target.
+  foreach(arch ${SANITIZER_COMMON_SUPPORTED_ARCH})
+    add_compiler_rt_object_library(RTSanitizerCommon ${arch}
+      SOURCES ${SANITIZER_SOURCES} CFLAGS ${SANITIZER_CFLAGS})
+    list(APPEND SANITIZER_RUNTIME_LIBRARIES RTSanitizerCommon.${arch})
+  endforeach()
 endif()
-if(CAN_TARGET_I386)
-  add_library(RTSanitizerCommon.i386 OBJECT ${SANITIZER_SOURCES})
-  set_property(TARGET RTSanitizerCommon.i386 PROPERTY COMPILE_FLAGS
-		"${SANITIZER_CFLAGS} ${TARGET_I386_CFLAGS}")
-  set_property(TARGET RTSanitizerCommon.i386 APPEND PROPERTY COMPILE_DEFINITIONS
-		${SANITIZER_COMMON_DEFINITIONS})
+
+# Unit tests for common sanitizer runtime.
+if(LLVM_INCLUDE_TESTS)
+  add_subdirectory(tests)
 endif()