From e3e2a11ad901c665329e13690c3fb779c005889c Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Thu, 27 Feb 2014 06:52:41 +0000 Subject: [PATCH] Move COMPILER_RT_HAS_FUNC check from r202303 to config-ix.cmake llvm-svn: 202353 --- compiler-rt/CMakeLists.txt | 5 ++--- compiler-rt/cmake/config-ix.cmake | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index a31c1c638692..48455819ed6e 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -238,9 +238,8 @@ if(COMPILER_RT_ENABLE_WERROR) endif() # Emulate C99 and C++11's __func__ for MSVC prior to 2013 CTP. -CHECK_SYMBOL_EXISTS(__func__ "" COMPILER_RT_HAS_FUNC) -if(NOT COMPILER_RT_HAS_FUNC) - list(APPEND SANITIZER_COMMON_CFLAGS -D__func__=__FUNCTION__) +if(NOT COMPILER_RT_HAS_FUNC_SYMBOL) + add_definitions(__func__=__FUNCTION__) endif() # Provide some common commmandline flags for Sanitizer runtimes. diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index 154bd09c8c80..3d514ecdd661 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -1,4 +1,5 @@ include(CheckCXXCompilerFlag) +include(CheckSymbolExists) # CodeGen options. check_cxx_compiler_flag(-fPIC COMPILER_RT_HAS_FPIC_FLAG) @@ -34,3 +35,6 @@ check_cxx_compiler_flag("-Werror -Wno-variadic-macros" COMPILER_RT_HAS_WNO_VA check_cxx_compiler_flag(/WX COMPILER_RT_HAS_WX_FLAG) check_cxx_compiler_flag(/wd4722 COMPILER_RT_HAS_WD4722_FLAG) + +# Symbols. +check_symbol_exists(__func__ "" COMPILER_RT_HAS_FUNC_SYMBOL)