<div dir="ltr">+Chris<div><br></div><div>Sorry if you'll get a bunch of merge conflicts after this change. On a positive side, this should further simplify further unification of Apple- and non-Apple- cases.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Aug 27, 2015 at 3:23 PM, Alexey Samsonov via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: samsonov<br>
Date: Thu Aug 27 17:23:27 2015<br>
New Revision: 246227<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=246227&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=246227&view=rev</a><br>
Log:<br>
[CMake] Unify build rules for sanitizer_common for Apple and non-Apple platforms.<br>
<br>
Additionally, link safestack runtime on OS X with nolibc version of<br>
sanitizer_common runtime, as we do on Linux.<br>
<br>
Modified:<br>
    compiler-rt/trunk/lib/asan/CMakeLists.txt<br>
    compiler-rt/trunk/lib/asan/tests/CMakeLists.txt<br>
    compiler-rt/trunk/lib/safestack/CMakeLists.txt<br>
    compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt<br>
    compiler-rt/trunk/lib/sanitizer_common/tests/CMakeLists.txt<br>
    compiler-rt/trunk/lib/ubsan/CMakeLists.txt<br>
<br>
Modified: compiler-rt/trunk/lib/asan/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/CMakeLists.txt?rev=246227&r1=246226&r2=246227&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/CMakeLists.txt?rev=246227&r1=246226&r2=246227&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/asan/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/asan/CMakeLists.txt Thu Aug 27 17:23:27 2015<br>
@@ -113,6 +113,7 @@ if(APPLE)<br>
     OBJECT_LIBS RTAsan_dynamic<br>
                 RTInterception<br>
                 RTSanitizerCommon<br>
+                RTSanitizerCommonLibc<br>
                 RTLSanCommon<br>
                 RTUbsan<br>
     CFLAGS ${ASAN_DYNAMIC_CFLAGS}<br>
<br>
Modified: compiler-rt/trunk/lib/asan/tests/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/CMakeLists.txt?rev=246227&r1=246226&r2=246227&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/CMakeLists.txt?rev=246227&r1=246226&r2=246227&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/asan/tests/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/asan/tests/CMakeLists.txt Thu Aug 27 17:23:27 2015<br>
@@ -220,6 +220,7 @@ macro(add_asan_tests_for_arch_and_kind a<br>
       $<TARGET_OBJECTS:RTAsan_dynamic.osx><br>
       $<TARGET_OBJECTS:RTInterception.osx><br>
       $<TARGET_OBJECTS:RTSanitizerCommon.osx><br>
+      $<TARGET_OBJECTS:RTSanitizerCommonLibc.osx><br>
       $<TARGET_OBJECTS:RTLSanCommon.osx><br>
       $<TARGET_OBJECTS:RTUbsan.osx>)<br>
   else()<br>
<br>
Modified: compiler-rt/trunk/lib/safestack/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/safestack/CMakeLists.txt?rev=246227&r1=246226&r2=246227&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/safestack/CMakeLists.txt?rev=246227&r1=246226&r2=246227&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/safestack/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/safestack/CMakeLists.txt Thu Aug 27 17:23:27 2015<br>
@@ -15,6 +15,7 @@ if(APPLE)<br>
     SOURCES ${SAFESTACK_SOURCES}<br>
             $<TARGET_OBJECTS:RTInterception.osx><br>
             $<TARGET_OBJECTS:RTSanitizerCommon.osx><br>
+            $<TARGET_OBJECTS:RTSanitizerCommonNoLibc.osx><br>
     CFLAGS ${SAFESTACK_CFLAGS}<br>
     PARENT_TARGET safestack)<br>
 else()<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt?rev=246227&r1=246226&r2=246227&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt?rev=246227&r1=246226&r2=246227&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt Thu Aug 27 17:23:27 2015<br>
@@ -130,31 +130,28 @@ append_list_if(COMPILER_RT_HAS_WGLOBAL_C<br>
                SANITIZER_CFLAGS)<br>
<br>
 if(APPLE)<br>
-  # Build universal binary on APPLE.<br>
-<br>
-  add_compiler_rt_object_libraries(RTSanitizerCommon<br>
-    OS ${SANITIZER_COMMON_SUPPORTED_OS}<br>
-    ARCHS ${SANITIZER_COMMON_SUPPORTED_ARCH}<br>
-    SOURCES ${SANITIZER_SOURCES} ${SANITIZER_LIBCDEP_SOURCES}<br>
-    CFLAGS ${SANITIZER_CFLAGS}<br>
-    DEFS ${SANITIZER_COMMON_DEFINITIONS})<br>
-else()<br>
-  # Otherwise, build separate libraries for each target.<br>
-<br>
-  add_compiler_rt_object_libraries(RTSanitizerCommon<br>
-    ARCHS ${SANITIZER_COMMON_SUPPORTED_ARCH}<br>
-    SOURCES ${SANITIZER_SOURCES} CFLAGS ${SANITIZER_CFLAGS}<br>
-    DEFS ${SANITIZER_COMMON_DEFINITIONS})<br>
-  add_compiler_rt_object_libraries(RTSanitizerCommonNoLibc<br>
-    ARCHS ${SANITIZER_COMMON_SUPPORTED_ARCH}<br>
-    SOURCES ${SANITIZER_NOLIBC_SOURCES} CFLAGS ${SANITIZER_CFLAGS}<br>
-    DEFS ${SANITIZER_COMMON_DEFINITIONS})<br>
-  add_compiler_rt_object_libraries(RTSanitizerCommonLibc<br>
-    ARCHS ${SANITIZER_COMMON_SUPPORTED_ARCH}<br>
-    SOURCES ${SANITIZER_LIBCDEP_SOURCES} CFLAGS ${SANITIZER_CFLAGS}<br>
-    DEFS ${SANITIZER_COMMON_DEFINITIONS})<br>
+  set(OS_OPTION OS ${SANITIZER_COMMON_SUPPORTED_OS})<br>
 endif()<br>
<br>
+add_compiler_rt_object_libraries(RTSanitizerCommon<br>
+  ${OS_OPTION}<br>
+  ARCHS ${SANITIZER_COMMON_SUPPORTED_ARCH}<br>
+  SOURCES ${SANITIZER_SOURCES}<br>
+  CFLAGS ${SANITIZER_CFLAGS}<br>
+  DEFS ${SANITIZER_COMMON_DEFINITIONS})<br>
+add_compiler_rt_object_libraries(RTSanitizerCommonNoLibc<br>
+  ${OS_OPTION}<br>
+  ARCHS ${SANITIZER_COMMON_SUPPORTED_ARCH}<br>
+  SOURCES ${SANITIZER_NOLIBC_SOURCES}<br>
+  CFLAGS ${SANITIZER_CFLAGS}<br>
+  DEFS ${SANITIZER_COMMON_DEFINITIONS})<br>
+add_compiler_rt_object_libraries(RTSanitizerCommonLibc<br>
+  ${OS_OPTION}<br>
+  ARCHS ${SANITIZER_COMMON_SUPPORTED_ARCH}<br>
+  SOURCES ${SANITIZER_LIBCDEP_SOURCES}<br>
+  CFLAGS ${SANITIZER_CFLAGS}<br>
+  DEFS ${SANITIZER_COMMON_DEFINITIONS})<br>
+<br>
 # Unit tests for common sanitizer runtime.<br>
 if(COMPILER_RT_INCLUDE_TESTS)<br>
   add_subdirectory(tests)<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/tests/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/tests/CMakeLists.txt?rev=246227&r1=246226&r2=246227&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/tests/CMakeLists.txt?rev=246227&r1=246226&r2=246227&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/tests/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/tests/CMakeLists.txt Thu Aug 27 17:23:27 2015<br>
@@ -171,7 +171,8 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS AND NOT<br>
   # be sure that produced binaries would work.<br>
   if(APPLE)<br>
     add_sanitizer_common_lib("RTSanitizerCommon.test.osx"<br>
-                             $<TARGET_OBJECTS:RTSanitizerCommon.osx>)<br>
+                             $<TARGET_OBJECTS:RTSanitizerCommon.osx><br>
+                             $<TARGET_OBJECTS:RTSanitizerCommonLibc.osx>)<br>
   else()<br>
     if(CAN_TARGET_x86_64)<br>
       add_sanitizer_common_lib("RTSanitizerCommon.test.nolibc.x86_64"<br>
<br>
Modified: compiler-rt/trunk/lib/ubsan/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan/CMakeLists.txt?rev=246227&r1=246226&r2=246227&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan/CMakeLists.txt?rev=246227&r1=246226&r2=246227&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/ubsan/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/ubsan/CMakeLists.txt Thu Aug 27 17:23:27 2015<br>
@@ -57,6 +57,7 @@ if(APPLE)<br>
       OBJECT_LIBS RTUbsan<br>
                   RTUbsan_standalone<br>
                   RTSanitizerCommon<br>
+                  RTSanitizerCommonLibc<br>
       PARENT_TARGET ubsan)<br>
   endif()<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr">Alexey Samsonov<br><a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a></div></div>
</div>