Will do, didn't think to include that information.<br><br>This particular patch will be re-committed as-is next week anyway, once the buildbot incremental builds are reset.<br><div class="gmail_quote"><div dir="ltr">On Tue, Aug 16, 2016 at 2:23 PM Justin Bogner <<a href="mailto:mail@justinbogner.com">mail@justinbogner.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Francis Ricci via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>> writes:<br>
> Author: fjricci<br>
> Date: Tue Aug 16 08:58:56 2016<br>
> New Revision: 278800<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=278800&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=278800&view=rev</a><br>
> Log:<br>
> Revert "[compiler-rt] Allow c++ abi to be explictly disabled in cmake<br>
> configuration"<br>
><br>
> This reverts commit cd5fa595648378f38cdad8b07e18433639c28a9c.<br>
<br>
In the future, please refer to the svn revision in reverts (ie, this<br>
reverts r278772) and briefly mention why the revert is happening in the<br>
commit message (ie, bot failures, mistaken commit, etc). This makes it<br>
easier to follow when looking at the history later.<br>
<br>
> Modified:<br>
>     compiler-rt/trunk/CMakeLists.txt<br>
>     compiler-rt/trunk/lib/ubsan/ubsan_type_hash_itanium.cc<br>
><br>
> Modified: compiler-rt/trunk/CMakeLists.txt<br>
> URL:<br>
> <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=278800&r1=278799&r2=278800&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=278800&r1=278799&r2=278800&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/CMakeLists.txt (original)<br>
> +++ compiler-rt/trunk/CMakeLists.txt Tue Aug 16 08:58:56 2016<br>
> @@ -85,19 +85,6 @@ option(COMPILER_RT_EXTERNALIZE_DEBUGINFO<br>
>  # COMPILER_RT_DEBUG_PYBOOL is used by <a href="http://lit.common.configured.in" rel="noreferrer" target="_blank">lit.common.configured.in</a>.<br>
>  pythonize_bool(COMPILER_RT_DEBUG)<br>
><br>
> -if(APPLE AND SANITIZER_MIN_OSX_VERSION VERSION_LESS "10.9")<br>
> -  # Mac OS X prior to 10.9 had problems with exporting symbols from<br>
> -  # libc++/libc++abi.<br>
> -  set(use_cxxabi_default OFF)<br>
> -elseif(MSVC)<br>
> -  set(use_cxxabi_default OFF)<br>
> -else()<br>
> -  set(use_cxxabi_default ON)<br>
> -endif()<br>
> -<br>
> -option(SANITIZER_CAN_USE_CXXABI "Sanitizers can use cxxabi" ${use_cxxabi_default})<br>
> -pythonize_bool(SANITIZER_CAN_USE_CXXABI)<br>
> -<br>
>  #================================<br>
>  # Setup Compiler Flags<br>
>  #================================<br>
> @@ -217,6 +204,17 @@ append_list_if(COMPILER_RT_HAS_WD4800_FL<br>
>  # Warnings to turn off for all libraries, not just sanitizers.<br>
>  append_string_if(COMPILER_RT_HAS_WUNUSED_PARAMETER_FLAG -Wno-unused-parameter CMAKE_C_FLAGS CMAKE_CXX_FLAGS)<br>
><br>
> +if(APPLE AND SANITIZER_MIN_OSX_VERSION VERSION_LESS "10.9")<br>
> +  # Mac OS X prior to 10.9 had problems with exporting symbols from<br>
> +  # libc++/libc++abi.<br>
> +  set(SANITIZER_CAN_USE_CXXABI FALSE)<br>
> +elseif(MSVC)<br>
> +  set(SANITIZER_CAN_USE_CXXABI FALSE)<br>
> +else()<br>
> +  set(SANITIZER_CAN_USE_CXXABI TRUE)<br>
> +endif()<br>
> +pythonize_bool(SANITIZER_CAN_USE_CXXABI)<br>
> +<br>
>  add_subdirectory(include)<br>
><br>
>  set(COMPILER_RT_LIBCXX_PATH ${LLVM_MAIN_SRC_DIR}/projects/libcxx)<br>
><br>
> Modified: compiler-rt/trunk/lib/ubsan/ubsan_type_hash_itanium.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan/ubsan_type_hash_itanium.cc?rev=278800&r1=278799&r2=278800&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan/ubsan_type_hash_itanium.cc?rev=278800&r1=278799&r2=278800&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/lib/ubsan/ubsan_type_hash_itanium.cc (original)<br>
> +++ compiler-rt/trunk/lib/ubsan/ubsan_type_hash_itanium.cc Tue Aug 16 08:58:56 2016<br>
> @@ -13,7 +13,7 @@<br>
><br>
>  #include "sanitizer_common/sanitizer_platform.h"<br>
>  #include "ubsan_platform.h"<br>
> -#if CAN_SANITIZE_UB && UBSAN_CAN_USE_CXXABI<br>
> +#if CAN_SANITIZE_UB && !SANITIZER_WINDOWS<br>
>  #include "ubsan_type_hash.h"<br>
><br>
>  #include "sanitizer_common/sanitizer_common.h"<br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@lists.llvm.org" target="_blank">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>