[compiler-rt] r278800 - Revert "[compiler-rt] Allow c++ abi to be explictly disabled in cmake configuration"

[Justin Bogner via llvm-commits]

Francis Ricci via llvm-commits <llvm-commits at lists.llvm.org> writes:
> Author: fjricci
> Date: Tue Aug 16 08:58:56 2016
> New Revision: 278800
>
> URL: http://llvm.org/viewvc/llvm-project?rev=278800&view=rev
> Log:
> Revert "[compiler-rt] Allow c++ abi to be explictly disabled in cmake
> configuration"
>
> This reverts commit cd5fa595648378f38cdad8b07e18433639c28a9c.

In the future, please refer to the svn revision in reverts (ie, this
reverts r278772) and briefly mention why the revert is happening in the
commit message (ie, bot failures, mistaken commit, etc). This makes it
easier to follow when looking at the history later.

> Modified:
>     compiler-rt/trunk/CMakeLists.txt
>     compiler-rt/trunk/lib/ubsan/ubsan_type_hash_itanium.cc
>
> Modified: compiler-rt/trunk/CMakeLists.txt
> URL:
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=278800&r1=278799&r2=278800&view=diff
> ==============================================================================
> --- compiler-rt/trunk/CMakeLists.txt (original)
> +++ compiler-rt/trunk/CMakeLists.txt Tue Aug 16 08:58:56 2016
> @@ -85,19 +85,6 @@ option(COMPILER_RT_EXTERNALIZE_DEBUGINFO
>  # COMPILER_RT_DEBUG_PYBOOL is used by lit.common.configured.in.
>  pythonize_bool(COMPILER_RT_DEBUG)
>  
> -if(APPLE AND SANITIZER_MIN_OSX_VERSION VERSION_LESS "10.9")
> -  # Mac OS X prior to 10.9 had problems with exporting symbols from
> -  # libc++/libc++abi.
> -  set(use_cxxabi_default OFF)
> -elseif(MSVC)
> -  set(use_cxxabi_default OFF)
> -else()
> -  set(use_cxxabi_default ON)
> -endif()
> -
> -option(SANITIZER_CAN_USE_CXXABI "Sanitizers can use cxxabi" ${use_cxxabi_default})
> -pythonize_bool(SANITIZER_CAN_USE_CXXABI)
> -
>  #================================
>  # Setup Compiler Flags
>  #================================
> @@ -217,6 +204,17 @@ append_list_if(COMPILER_RT_HAS_WD4800_FL
>  # Warnings to turn off for all libraries, not just sanitizers.
>  append_string_if(COMPILER_RT_HAS_WUNUSED_PARAMETER_FLAG -Wno-unused-parameter CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
>  
> +if(APPLE AND SANITIZER_MIN_OSX_VERSION VERSION_LESS "10.9")
> +  # Mac OS X prior to 10.9 had problems with exporting symbols from
> +  # libc++/libc++abi.
> +  set(SANITIZER_CAN_USE_CXXABI FALSE)
> +elseif(MSVC)
> +  set(SANITIZER_CAN_USE_CXXABI FALSE)
> +else()
> +  set(SANITIZER_CAN_USE_CXXABI TRUE)
> +endif()
> +pythonize_bool(SANITIZER_CAN_USE_CXXABI)
> +
>  add_subdirectory(include)
>  
>  set(COMPILER_RT_LIBCXX_PATH ${LLVM_MAIN_SRC_DIR}/projects/libcxx)
>
> Modified: compiler-rt/trunk/lib/ubsan/ubsan_type_hash_itanium.cc
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan/ubsan_type_hash_itanium.cc?rev=278800&r1=278799&r2=278800&view=diff
> ==============================================================================
> --- compiler-rt/trunk/lib/ubsan/ubsan_type_hash_itanium.cc (original)
> +++ compiler-rt/trunk/lib/ubsan/ubsan_type_hash_itanium.cc Tue Aug 16 08:58:56 2016
> @@ -13,7 +13,7 @@
>  
>  #include "sanitizer_common/sanitizer_platform.h"
>  #include "ubsan_platform.h"
> -#if CAN_SANITIZE_UB && UBSAN_CAN_USE_CXXABI
> +#if CAN_SANITIZE_UB && !SANITIZER_WINDOWS
>  #include "ubsan_type_hash.h"
>  
>  #include "sanitizer_common/sanitizer_common.h"
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits