[compiler-rt] r189454 - Generate list of symbols exported from sanitizer runtimes only on 64-bit Unix

[Alexey Samsonov]

Author: samsonov
Date: Wed Aug 28 03:07:04 2013
New Revision: 189454

URL: http://llvm.org/viewvc/llvm-project?rev=189454&view=rev
Log:
Generate list of symbols exported from sanitizer runtimes only on 64-bit Unix

Modified:
    compiler-rt/trunk/lib/asan/CMakeLists.txt
    compiler-rt/trunk/lib/msan/CMakeLists.txt
    compiler-rt/trunk/lib/ubsan/CMakeLists.txt

Modified: compiler-rt/trunk/lib/asan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/CMakeLists.txt?rev=189454&r1=189453&r2=189454&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/asan/CMakeLists.txt Wed Aug 28 03:07:04 2013
@@ -103,9 +103,11 @@ else()
       SOURCES ${ASAN_SOURCES} ${ASAN_SOURCE_LIBS}
       CFLAGS ${ASAN_CFLAGS}
       DEFS ${ASAN_COMMON_DEFINITIONS})
-    add_sanitizer_rt_symbols(clang_rt.asan-${arch} asan.syms.extra)
-    list(APPEND ASAN_RUNTIME_LIBRARIES clang_rt.asan-${arch}
-      clang_rt.asan-${arch}-symbols)
+    list(APPEND ASAN_RUNTIME_LIBRARIES clang_rt.asan-${arch})
+    if (UNIX AND NOT ${arch} STREQUAL "i386")
+      add_sanitizer_rt_symbols(clang_rt.asan-${arch} asan.syms.extra)
+      list(APPEND ASAN_RUNTIME_LIBRARIES clang_rt.asan-${arch}-symbols)
+    endif()
 
     if (WIN32)
       add_compiler_rt_static_runtime(clang_rt.asan_dll_thunk-${arch} ${arch}

Modified: compiler-rt/trunk/lib/msan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/CMakeLists.txt?rev=189454&r1=189453&r2=189454&view=diff
==============================================================================
--- compiler-rt/trunk/lib/msan/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/msan/CMakeLists.txt Wed Aug 28 03:07:04 2013
@@ -26,9 +26,11 @@ if(CAN_TARGET_${arch})
             $<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
             $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
     CFLAGS ${MSAN_RTL_CFLAGS})
-  add_sanitizer_rt_symbols(clang_rt.msan-${arch} msan.syms.extra)
-  list(APPEND MSAN_RUNTIME_LIBRARIES clang_rt.msan-${arch}
-    clang_rt.msan-${arch}-symbols)
+  list(APPEND MSAN_RUNTIME_LIBRARIES clang_rt.msan-${arch})
+  if(UNIX)
+    add_sanitizer_rt_symbols(clang_rt.msan-${arch} msan.syms.extra)
+    list(APPEND MSAN_RUNTIME_LIBRARIES clang_rt.msan-${arch}-symbols)
+  endif()
 endif()
 
 add_compiler_rt_resource_file(msan_blacklist msan_blacklist.txt)

Modified: compiler-rt/trunk/lib/ubsan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan/CMakeLists.txt?rev=189454&r1=189453&r2=189454&view=diff
==============================================================================
--- compiler-rt/trunk/lib/ubsan/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/ubsan/CMakeLists.txt Wed Aug 28 03:07:04 2013
@@ -35,18 +35,21 @@ else()
     add_compiler_rt_static_runtime(clang_rt.ubsan-${arch} ${arch}
       SOURCES ${UBSAN_SOURCES}
       CFLAGS ${UBSAN_CFLAGS})
-    add_sanitizer_rt_symbols(clang_rt.ubsan-${arch} ubsan.syms.extra)
     # 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})
-    add_sanitizer_rt_symbols(clang_rt.ubsan_cxx-${arch} ubsan.syms.extra)
     list(APPEND UBSAN_RUNTIME_LIBRARIES
-           clang_rt.san-${arch}
-           clang_rt.ubsan-${arch}
-           clang_rt.ubsan-${arch}-symbols
-           clang_rt.ubsan_cxx-${arch}
-           clang_rt.ubsan_cxx-${arch}-symbols)
+      clang_rt.san-${arch}
+      clang_rt.ubsan-${arch}
+      clang_rt.ubsan_cxx-${arch})
+    if (UNIX AND NOT ${arch} STREQUAL "i386")
+      add_sanitizer_rt_symbols(clang_rt.ubsan-${arch} ubsan.syms.extra)
+      add_sanitizer_rt_symbols(clang_rt.ubsan_cxx-${arch} ubsan.syms.extra)
+      list(APPEND UBSAN_RUNTIME_LIBRARIES
+        clang_rt.ubsan-${arch}-symbols
+        clang_rt.ubsan_cxx-${arch}-symbols)
+    endif()
   endforeach()
 endif()