True. Sorry about that. I'll avoid these types of messages<span></span> in the future.<div><br></div><div> Filipe<br><br>On Saturday, 5 March 2016, David Blaikie <<a href="mailto:dblaikie@gmail.com">dblaikie@gmail.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><p dir="ltr">In the future it might be best to make the commit message self explanatory so that the content just the patch can be understood at a glance, rather than only in reference/by reading the post commit review comments in the mailing list (also handy to mention those for extra context, but they're a bit awkward as the only context)</p>
<div class="gmail_quote">On Mar 5, 2016 2:05 AM, "Filipe Cabecinhas via llvm-commits" <<a href="javascript:_e(%7B%7D,'cvml','llvm-commits@lists.llvm.org');" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: filcab<br>
Date: Sat Mar 5 04:01:04 2016<br>
New Revision: 262770<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=262770&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=262770&view=rev</a><br>
Log:<br>
[cmake] Address Samsonov's post-commit review of r262723<br>
<br>
Reviewers: samsonov<br>
<br>
Subscribers: llvm-commits<br>
<br>
Differential Revision: <a href="http://reviews.llvm.org/D17896" rel="noreferrer" target="_blank">http://reviews.llvm.org/D17896</a><br>
<br>
Modified:<br>
compiler-rt/trunk/cmake/Modules/CompilerRTUtils.cmake<br>
compiler-rt/trunk/cmake/config-ix.cmake<br>
compiler-rt/trunk/lib/asan/CMakeLists.txt<br>
compiler-rt/trunk/lib/dfsan/CMakeLists.txt<br>
compiler-rt/trunk/lib/interception/CMakeLists.txt<br>
compiler-rt/trunk/lib/lsan/CMakeLists.txt<br>
compiler-rt/trunk/lib/msan/CMakeLists.txt<br>
compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt<br>
compiler-rt/trunk/lib/tsan/CMakeLists.txt<br>
compiler-rt/trunk/lib/tsan/dd/CMakeLists.txt<br>
compiler-rt/trunk/lib/ubsan/CMakeLists.txt<br>
<br>
Modified: compiler-rt/trunk/cmake/Modules/CompilerRTUtils.cmake<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/Modules/CompilerRTUtils.cmake?rev=262770&r1=262769&r2=262770&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/Modules/CompilerRTUtils.cmake?rev=262770&r1=262769&r2=262770&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/cmake/Modules/CompilerRTUtils.cmake (original)<br>
+++ compiler-rt/trunk/cmake/Modules/CompilerRTUtils.cmake Sat Mar 5 04:01:04 2016<br>
@@ -45,9 +45,14 @@ macro(append_string_if condition value)<br>
endif()<br>
endmacro()<br>
<br>
-macro(append_no_rtti_flag list)<br>
- append_list_if(COMPILER_RT_HAS_FNO_RTTI_FLAG -fno-rtti ${list})<br>
- append_list_if(COMPILER_RT_HAS_GR_FLAG /GR- ${list})<br>
+macro(append_rtti_flag polarity list)<br>
+ if(polarity)<br>
+ append_list_if(COMPILER_RT_HAS_FRTTI_FLAG -frtti ${list})<br>
+ append_list_if(COMPILER_RT_HAS_GR_FLAG /GR ${list})<br>
+ else()<br>
+ append_list_if(COMPILER_RT_HAS_FNO_RTTI_FLAG -fno-rtti ${list})<br>
+ append_list_if(COMPILER_RT_HAS_GR_FLAG /GR- ${list})<br>
+ endif()<br>
endmacro()<br>
<br>
macro(append_have_file_definition filename varname list)<br>
<br>
Modified: compiler-rt/trunk/cmake/config-ix.cmake<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=262770&r1=262769&r2=262770&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=262770&r1=262769&r2=262770&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/cmake/config-ix.cmake (original)<br>
+++ compiler-rt/trunk/cmake/config-ix.cmake Sat Mar 5 04:01:04 2016<br>
@@ -21,6 +21,7 @@ check_cxx_compiler_flag(-funwind-tables<br>
check_cxx_compiler_flag(-fno-stack-protector COMPILER_RT_HAS_FNO_STACK_PROTECTOR_FLAG)<br>
check_cxx_compiler_flag(-fno-sanitize=safe-stack COMPILER_RT_HAS_FNO_SANITIZE_SAFE_STACK_FLAG)<br>
check_cxx_compiler_flag(-fvisibility=hidden COMPILER_RT_HAS_FVISIBILITY_HIDDEN_FLAG)<br>
+check_cxx_compiler_flag(-frtti COMPILER_RT_HAS_FRTTI_FLAG)<br>
check_cxx_compiler_flag(-fno-rtti COMPILER_RT_HAS_FNO_RTTI_FLAG)<br>
check_cxx_compiler_flag(-ffreestanding COMPILER_RT_HAS_FFREESTANDING_FLAG)<br>
check_cxx_compiler_flag("-Werror -fno-function-sections" COMPILER_RT_HAS_FNO_FUNCTION_SECTIONS_FLAG)<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=262770&r1=262769&r2=262770&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/CMakeLists.txt?rev=262770&r1=262769&r2=262770&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/asan/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/asan/CMakeLists.txt Sat Mar 5 04:01:04 2016<br>
@@ -32,7 +32,7 @@ set(ASAN_PREINIT_SOURCES<br>
include_directories(..)<br>
<br>
set(ASAN_CFLAGS ${SANITIZER_COMMON_CFLAGS})<br>
-append_no_rtti_flag(ASAN_CFLAGS)<br>
+append_rtti_flag(OFF ASAN_CFLAGS)<br>
<br>
set(ASAN_COMMON_DEFINITIONS<br>
ASAN_HAS_EXCEPTIONS=1)<br>
<br>
Modified: compiler-rt/trunk/lib/dfsan/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/dfsan/CMakeLists.txt?rev=262770&r1=262769&r2=262770&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/dfsan/CMakeLists.txt?rev=262770&r1=262769&r2=262770&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/dfsan/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/dfsan/CMakeLists.txt Sat Mar 5 04:01:04 2016<br>
@@ -6,7 +6,7 @@ set(DFSAN_RTL_SOURCES<br>
dfsan_custom.cc<br>
dfsan_interceptors.cc)<br>
set(DFSAN_COMMON_CFLAGS ${SANITIZER_COMMON_CFLAGS})<br>
-append_no_rtti_flag(DFSAN_COMMON_CFLAGS)<br>
+append_rtti_flag(OFF DFSAN_COMMON_CFLAGS)<br>
# Prevent clang from generating libc calls.<br>
append_list_if(COMPILER_RT_HAS_FFREESTANDING_FLAG -ffreestanding DFSAN_COMMON_CFLAGS)<br>
<br>
<br>
Modified: compiler-rt/trunk/lib/interception/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/interception/CMakeLists.txt?rev=262770&r1=262769&r2=262770&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/interception/CMakeLists.txt?rev=262770&r1=262769&r2=262770&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/interception/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/interception/CMakeLists.txt Sat Mar 5 04:01:04 2016<br>
@@ -10,7 +10,7 @@ set(INTERCEPTION_SOURCES<br>
include_directories(..)<br>
<br>
set(INTERCEPTION_CFLAGS ${SANITIZER_COMMON_CFLAGS})<br>
-append_no_rtti_flag(INTERCEPTION_CFLAGS)<br>
+append_rtti_flag(OFF INTERCEPTION_CFLAGS)<br>
<br>
add_compiler_rt_object_libraries(RTInterception<br>
OS ${SANITIZER_COMMON_SUPPORTED_OS}<br>
<br>
Modified: compiler-rt/trunk/lib/lsan/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lsan/CMakeLists.txt?rev=262770&r1=262769&r2=262770&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/lsan/CMakeLists.txt?rev=262770&r1=262769&r2=262770&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/lsan/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/lsan/CMakeLists.txt Sat Mar 5 04:01:04 2016<br>
@@ -1,7 +1,7 @@<br>
include_directories(..)<br>
<br>
set(LSAN_CFLAGS ${SANITIZER_COMMON_CFLAGS})<br>
-append_no_rtti_flag(LSAN_CFLAGS)<br>
+append_rtti_flag(OFF LSAN_CFLAGS)<br>
<br>
set(LSAN_COMMON_SOURCES<br>
lsan_common.cc<br>
<br>
Modified: compiler-rt/trunk/lib/msan/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/CMakeLists.txt?rev=262770&r1=262769&r2=262770&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/CMakeLists.txt?rev=262770&r1=262769&r2=262770&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/msan/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/msan/CMakeLists.txt Sat Mar 5 04:01:04 2016<br>
@@ -17,7 +17,7 @@ set(MSAN_RTL_CXX_SOURCES<br>
<br>
<br>
set(MSAN_RTL_CFLAGS ${SANITIZER_COMMON_CFLAGS})<br>
-append_no_rtti_flag(MSAN_RTL_CFLAGS)<br>
+append_rtti_flag(OFF MSAN_RTL_CFLAGS)<br>
append_list_if(COMPILER_RT_HAS_FPIE_FLAG -fPIE MSAN_RTL_CFLAGS)<br>
# Prevent clang from generating libc calls.<br>
append_list_if(COMPILER_RT_HAS_FFREESTANDING_FLAG -ffreestanding MSAN_RTL_CFLAGS)<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=262770&r1=262769&r2=262770&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt?rev=262770&r1=262769&r2=262770&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt Sat Mar 5 04:01:04 2016<br>
@@ -122,7 +122,7 @@ append_have_file_definition(rpc/xdr.h HA<br>
append_have_file_definition(tirpc/rpc/xdr.h HAVE_TIRPC_RPC_XDR_H SANITIZER_COMMON_DEFINITIONS)<br>
<br>
set(SANITIZER_CFLAGS ${SANITIZER_COMMON_CFLAGS})<br>
-append_no_rtti_flag(SANITIZER_CFLAGS)<br>
+append_rtti_flag(OFF SANITIZER_CFLAGS)<br>
<br>
append_list_if(SANITIZER_LIMIT_FRAME_SIZE -Wframe-larger-than=570<br>
SANITIZER_CFLAGS)<br>
<br>
Modified: compiler-rt/trunk/lib/tsan/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/CMakeLists.txt?rev=262770&r1=262769&r2=262770&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/CMakeLists.txt?rev=262770&r1=262769&r2=262770&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/tsan/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/tsan/CMakeLists.txt Sat Mar 5 04:01:04 2016<br>
@@ -6,7 +6,7 @@ set(TSAN_CFLAGS ${SANITIZER_COMMON_CFLAG<br>
# SANITIZER_COMMON_CFLAGS contains -fPIC, but it's performance-critical for<br>
# TSan runtime to be built with -fPIE to reduce the number of register spills.<br>
append_list_if(COMPILER_RT_HAS_FPIE_FLAG -fPIE TSAN_CFLAGS)<br>
-append_no_rtti_flag(TSAN_CFLAGS)<br>
+append_rtti_flag(OFF TSAN_CFLAGS)<br>
<br>
if(COMPILER_RT_TSAN_DEBUG_OUTPUT)<br>
# Add extra debug information to TSan runtime. This configuration is rarely<br>
<br>
Modified: compiler-rt/trunk/lib/tsan/dd/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/dd/CMakeLists.txt?rev=262770&r1=262769&r2=262770&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/dd/CMakeLists.txt?rev=262770&r1=262769&r2=262770&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/tsan/dd/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/tsan/dd/CMakeLists.txt Sat Mar 5 04:01:04 2016<br>
@@ -3,7 +3,7 @@<br>
include_directories(../..)<br>
<br>
set(DD_CFLAGS ${SANITIZER_COMMON_CFLAGS})<br>
-append_no_rtti_flag(DD_CFLAGS)<br>
+append_rtti_flag(OFF DD_CFLAGS)<br>
<br>
set(DD_SOURCES<br>
dd_rtl.cc<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=262770&r1=262769&r2=262770&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan/CMakeLists.txt?rev=262770&r1=262769&r2=262770&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/ubsan/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/ubsan/CMakeLists.txt Sat Mar 5 04:01:04 2016<br>
@@ -22,18 +22,16 @@ set(UBSAN_CXX_SOURCES<br>
include_directories(..)<br>
<br>
set(UBSAN_CFLAGS ${SANITIZER_COMMON_CFLAGS})<br>
-append_no_rtti_flag(UBSAN_CFLAGS)<br>
+append_rtti_flag(OFF UBSAN_CFLAGS)<br>
append_list_if(SANITIZER_CAN_USE_CXXABI -DUBSAN_CAN_USE_CXXABI UBSAN_CFLAGS)<br>
<br>
set(UBSAN_STANDALONE_CFLAGS ${SANITIZER_COMMON_CFLAGS})<br>
-append_no_rtti_flag(UBSAN_STANDALONE_CFLAGS)<br>
+append_rtti_flag(OFF UBSAN_STANDALONE_CFLAGS)<br>
append_list_if(SANITIZER_CAN_USE_CXXABI -DUBSAN_CAN_USE_CXXABI UBSAN_STANDALONE_CFLAGS)<br>
<br>
set(UBSAN_CXXFLAGS ${SANITIZER_COMMON_CFLAGS})<br>
+append_rtti_flag(ON UBSAN_STANDALONE_CXXFLAGS)<br>
append_list_if(SANITIZER_CAN_USE_CXXABI -DUBSAN_CAN_USE_CXXABI UBSAN_CXXFLAGS)<br>
-# Make sure we end with -frtti on type_hash<br>
-set_property(SOURCE ubsan_type_hash_itanium.cc APPEND_STRING PROPERTY<br>
- COMPILE_FLAGS " -frtti")<br>
<br>
add_custom_target(ubsan)<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="javascript:_e(%7B%7D,'cvml','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>
</blockquote></div>