<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><div style="margin: 0px;" class=""><span style="font-size: 14px;" class="">Alexey,</span></div><div style="margin: 0px;" class=""><span style="font-size: 14px;" class=""><br class=""></span></div><div style="margin: 0px;" class=""><span style="font-size: 14px;" class="">I've applied the following patch on top of yours and tested with cmake ninja build plus "ninja check-ubsan" and "ninja check-asan".</span></div><div style="margin: 0px;" class=""><span style="font-family: Menlo; font-size: 11px;" class=""><br class=""></span></div><div style="margin: 0px;" class=""><span style="font-size: 14px;" class="">Cheers, </span></div><div style="margin: 0px;" class=""><span style="font-size: 14px;" class="">Anna.</span><span style="font-family: Menlo; font-size: 11px;" class=""> </span></div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""><br class=""></div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class="">zaks$ git diff</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""><b class="">diff --git a/CMakeLists.txt b/CMakeLists.txt</b></div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""><b class="">index 3e67883..c6cd87d 100644</b></div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""><b class="">--- a/CMakeLists.txt</b></div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""><b class="">+++ b/CMakeLists.txt</b></div><div style="margin: 0px; font-size: 11px; font-family: Menlo; color: rgb(52, 187, 199);" class="">@@ -304,8 +304,7 @@<span style="font-variant-ligatures: no-common-ligatures; color: #000000" class=""> if(APPLE)</span></div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""> set(DARWIN_iossim_CFLAGS</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""> -mios-simulator-version-min=7.0 -isysroot ${IOSSIM_SDK_DIR})</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""> set(DARWIN_osx_LINKFLAGS -mmacosx-version-min=${SANITIZER_MIN_OSX_VERSION}</div><div style="margin: 0px; font-size: 11px; font-family: Menlo; color: rgb(195, 55, 32);" class="">- -stdlib=libc++</div><div style="margin: 0px; font-size: 11px; font-family: Menlo; color: rgb(195, 55, 32);" class="">- -lc++abi)</div><div style="margin: 0px; font-size: 11px; font-family: Menlo; color: rgb(52, 189, 38);" class="">+ -stdlib=libc++)</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""> set(DARWIN_iossim_LINKFLAGS</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""> -Wl,-ios_simulator_version_min,7.0.0</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""> -mios-simulator-version-min=7.0</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""><b class="">diff --git a/lib/ubsan/CMakeLists.txt b/lib/ubsan/CMakeLists.txt</b></div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""><b class="">index 8c2d30b..a8b3f61 100644</b></div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""><b class="">--- a/lib/ubsan/CMakeLists.txt</b></div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""><b class="">+++ b/lib/ubsan/CMakeLists.txt</b></div><div style="margin: 0px; font-size: 11px; font-family: Menlo; color: rgb(52, 187, 199);" class="">@@ -31,7 +31,8 @@<span style="font-variant-ligatures: no-common-ligatures; color: #000000" class=""> if(APPLE)</span></div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""> add_compiler_rt_darwin_dynamic_runtime(clang_rt.ubsan_${os}_dynamic ${os}</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""> ARCH ${UBSAN_SUPPORTED_ARCH}</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""> SOURCES $<TARGET_OBJECTS:RTUbsan.${os}></div><div style="margin: 0px; font-size: 11px; font-family: Menlo; color: rgb(195, 55, 32);" class="">- $<TARGET_OBJECTS:RTSanitizerCommon.${os}>)</div><div style="margin: 0px; font-size: 11px; font-family: Menlo; color: rgb(52, 189, 38);" class="">+ $<TARGET_OBJECTS:RTSanitizerCommon.${os}></div><div style="margin: 0px; font-size: 11px; font-family: Menlo; color: rgb(52, 189, 38);" class="">+ LINKFLAGS -lc++abi)</div><p style="margin: 0px; font-size: 11px; font-family: Menlo; min-height: 13px;" class=""> <br class="webkit-block-placeholder"></p><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""> add_dependencies(ubsan clang_rt.ubsan_${os}_dynamic)</div><div style="margin: 0px; font-size: 11px; font-family: Menlo;" class=""> endforeach()</div><div class=""><br class=""></div><div><blockquote type="cite" class=""><div class="">On Mar 24, 2015, at 11:36 AM, Alexey Samsonov <<a href="mailto:vonosmas@gmail.com" class="">vonosmas@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><div class="gmail_extra"><div class="gmail_quote">On Tue, Mar 24, 2015 at 11:24 AM, Anna Zaks<span class="Apple-converted-space"> </span><span dir="ltr" class=""><<a href="mailto:ganna@apple.com" target="_blank" class="">ganna@apple.com</a>></span><span class="Apple-converted-space"> </span>wrote:<br class=""><blockquote class="gmail_quote" style="margin: 0px 0px 0px 0.8ex; border-left-width: 1px; border-left-color: rgb(204, 204, 204); border-left-style: solid; padding-left: 1ex;"><div style="word-wrap: break-word;" class=""><br class=""><div class=""><span class=""><blockquote type="cite" class=""><div class="">On Mar 24, 2015, at 10:46 AM, Justin Bogner <<a href="mailto:mail@justinbogner.com" target="_blank" class="">mail@justinbogner.com</a>> wrote:</div><br class=""><div class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; float: none; display: inline !important;" class="">Alexander Potapenko <</span><a href="mailto:glider@google.com" target="_blank" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class="">glider@google.com</a><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; float: none; display: inline !important;" class="">> writes:</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class="">Author: glider<br class="">Date: Tue Mar 24 08:10:55 2015<br class="">New Revision: 233071<br class=""><br class="">URL:<span class=""> </span><a href="http://llvm.org/viewvc/llvm-project?rev=233071&view=rev" target="_blank" class="">http://llvm.org/viewvc/llvm-project?rev=233071&view=rev</a><br class="">Log:<br class="">[ASan] Do not link ASan OSX runtime with -lc++abi (which was added in r233036)<br class="">This should fix the OSX Jenkins build at<br class=""><a href="http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA_check/" target="_blank" class="">http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA_check/</a><br class=""></blockquote><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; float: none; display: inline !important;" class="">This didn't quite work - compiler-rt doesn't even link after this</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; float: none; display: inline !important;" class="">change:</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; float: none; display: inline !important;" class=""> Undefined symbols for architecture x86_64:</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; float: none; display: inline !important;" class=""> "typeinfo for __cxxabiv1::__class_type_info", referenced from:</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; float: none; display: inline !important;" class=""> __ubsan::checkDynamicType(void*, void*, unsigned long) in ubsan_type_hash.cc.o</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; float: none; display: inline !important;" class=""> isDerivedFromAtOffset(__cxxabiv1::__class_type_info const*, __cxxabiv1::__class_type_info const*, long) in ubsan_type_hash.cc.o</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; float: none; display: inline !important;" class=""> findBaseAtOffset(__cxxabiv1::__class_type_info const*, long) in ubsan_type_hash.cc.o</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; float: none; display: inline !important;" class="">See here:</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; float: none; display: inline !important;" class=""> </span><a href="http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA_build/2492/consoleFull#-158682280549ba4694-19c4-4d7e-bec5-911270d8a58c" target="_blank" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class="">http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA_build/2492/consoleFull#-158682280549ba4694-19c4-4d7e-bec5-911270d8a58c</a><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; float: none; display: inline !important;" class="">I've reverted both r233071 and r233036 in r233097 to get things working</span></div></blockquote><blockquote type="cite" class=""><div class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; float: none; display: inline !important;" class="">again.</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""></div></blockquote><div class=""><br class=""></div></span>If we are reverting all this, 233035 needs to be reverted as well.</div></div></blockquote><div class=""><br class=""></div><div class="">Yes.</div><div class=""><br class=""></div><blockquote class="gmail_quote" style="margin: 0px 0px 0px 0.8ex; border-left-width: 1px; border-left-color: rgb(204, 204, 204); border-left-style: solid; padding-left: 1ex;"><div style="word-wrap: break-word;" class=""><div class=""><br class=""></div><div class="">Maybe we should XFAIL the two tests instead?</div></div></blockquote><div class=""><br class=""></div><div class="">No, I just think we should provide -lc++abi only for UBSan. I.e. remove it from DARWIN_osx_LINKFLAGS and instead provide:</div><div class=""><div class=""><br class=""></div><div class=""> add_compiler_rt_darwin_dynamic_runtime(clang_rt.ubsan_${os}_dynamic ${os}</div><div class=""> ARCH ${UBSAN_SUPPORTED_ARCH}</div><div class=""> SOURCES $<TARGET_OBJECTS:RTUbsan.${os}></div><div class=""> $<TARGET_OBJECTS:RTSanitizerCommon.${os}></div><div class=""> LINKFLAGS -lc++abi)</div></div><div class=""><br class=""></div><div class="">Could you check if it works?</div><div class=""> </div><blockquote class="gmail_quote" style="margin: 0px 0px 0px 0.8ex; border-left-width: 1px; border-left-color: rgb(204, 204, 204); border-left-style: solid; padding-left: 1ex;"><div style="word-wrap: break-word;" class=""><div class=""><br class=""></div><div class="">CC-ing Alexey.</div><div class=""><div class="h5"><div class=""><br class=""><blockquote type="cite" class=""><div class=""><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class="">Modified:<br class=""> compiler-rt/trunk/CMakeLists.txt<br class=""><br class="">Modified: compiler-rt/trunk/CMakeLists.txt<br class="">URL:<br class=""><a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=233071&r1=233070&r2=233071&view=diff" target="_blank" class="">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=233071&r1=233070&r2=233071&view=diff</a><br class="">==============================================================================<br class="">--- compiler-rt/trunk/CMakeLists.txt (original)<br class="">+++ compiler-rt/trunk/CMakeLists.txt Tue Mar 24 08:10:55 2015<br class="">@@ -304,8 +304,7 @@ if(APPLE)<br class=""> set(DARWIN_iossim_CFLAGS<br class=""> -mios-simulator-version-min=7.0 -isysroot ${IOSSIM_SDK_DIR})<br class=""> set(DARWIN_osx_LINKFLAGS -mmacosx-version-min=${SANITIZER_MIN_OSX_VERSION}<br class="">- -stdlib=libc++<br class="">- -lc++abi)<br class="">+ -stdlib=libc++)<br class=""> set(DARWIN_iossim_LINKFLAGS<br class=""> -Wl,-ios_simulator_version_min,7.0.0<br class=""> -mios-simulator-version-min=7.0<br class=""><br class=""><br class="">_______________________________________________<br class="">llvm-commits mailing list<br class=""><a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank" class="">llvm-commits@cs.uiuc.edu</a><br class=""><a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank" class="">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br class=""></blockquote><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; float: none; display: inline !important;" class="">_______________________________________________</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; float: none; display: inline !important;" class="">llvm-commits mailing list</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class="">llvm-commits@cs.uiuc.edu</a><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class=""><a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px;" class="">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a></div></blockquote></div><br class=""></div></div></div></blockquote></div><br class=""><br clear="all" class=""><div class=""><br class=""></div>--<span class="Apple-converted-space"> </span><br class=""><div class="gmail_signature"><div dir="ltr" class="">Alexey Samsonov<br class=""><a href="mailto:vonosmas@gmail.com" target="_blank" class="">vonosmas@gmail.com</a></div></div></div></div></div></blockquote></div><br class=""></body></html>