<div dir="ltr">r331450 should hopefully fix this.<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, May 1, 2018 at 8:55 AM, Nico Weber <span dir="ltr"><<a href="mailto:thakis@chromium.org" target="_blank">thakis@chromium.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="auto">tzik, can you take a look what's up on those bots?</div><div class="HOEnZb"><div class="h5"><br><div class="gmail_quote"><div dir="ltr">On Tue, May 1, 2018, 5:48 AM Maxim Kuvyrkov <<a href="mailto:maxim.kuvyrkov@linaro.org" target="_blank">maxim.kuvyrkov@linaro.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Nico,<br>
<br>
This broke armv7 and aarch64 bots:<br>
- <a href="http://lab.llvm.org:8011/builders/libcxx-libcxxabi-libunwind-armv7-linux/builds/87" rel="noreferrer noreferrer" target="_blank">http://lab.llvm.org:8011/<wbr>builders/libcxx-libcxxabi-<wbr>libunwind-armv7-linux/builds/<wbr>87</a><br>
- <a href="http://lab.llvm.org:8011/builders/libcxx-libcxxabi-libunwind-aarch64-linux/builds/1304" rel="noreferrer noreferrer" target="_blank">http://lab.llvm.org:8011/<wbr>builders/libcxx-libcxxabi-<wbr>libunwind-aarch64-linux/<wbr>builds/1304</a><br>
<br>
Would you please investigate?<br>
<br>
--<br>
Maxim Kuvyrkov<br>
<a href="http://www.linaro.org" rel="noreferrer noreferrer" target="_blank">www.linaro.org</a><br>
<br>
<br>
<br>
> On Apr 30, 2018, at 2:10 AM, Nico Weber via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org" rel="noreferrer" target="_blank">cfe-commits@lists.llvm.org</a>> wrote:<br>
> <br>
> This should have said "Patch from Taiju Tsuiki <<a href="mailto:tzik@chromium.org" rel="noreferrer" target="_blank">tzik@chromium.org</a>>", apologies.<br>
> <br>
> On Sun, Apr 29, 2018 at 7:05 PM, Nico Weber via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org" rel="noreferrer" target="_blank">cfe-commits@lists.llvm.org</a>> wrote:<br>
> Author: nico<br>
> Date: Sun Apr 29 16:05:11 2018<br>
> New Revision: 331150<br>
> <br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=331150&view=rev" rel="noreferrer noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=331150&view=rev</a><br>
> Log:<br>
> Move _LIBCPP_ENABLE_CXX17_REMOVED_<wbr>UNEXPECTED_FUNCTIONS macro to build system<br>
> <br>
> _LIBCPP_ENABLE_CXX17_REMOVED_<wbr>UNEXPECTED_FUNCTIONS is currently used to<br>
> bring back std::unexpected, which is removed in C++17, but still needed<br>
> for libc++abi for backward compatibility.<br>
> <br>
> This macro used to define in cxa_exception.cpp only, but actually<br>
> needed for all sources that touches exceptions.<br>
> So, a build-system-level macro is better fit to define this macro.<br>
> <br>
> <a href="https://reviews.llvm.org/D46056" rel="noreferrer noreferrer" target="_blank">https://reviews.llvm.org/<wbr>D46056</a><br>
> Patch from Taiju Tsuiku <<a href="mailto:tzik@chromium.org" rel="noreferrer" target="_blank">tzik@chromium.org</a>>!<br>
> <br>
> Modified:<br>
>     libcxxabi/trunk/CMakeLists.<wbr>txt<br>
>     libcxxabi/trunk/src/cxa_<wbr>exception.cpp<br>
>     libcxxabi/trunk/test/test_<wbr>exception_storage.pass.cpp<br>
> <br>
> Modified: libcxxabi/trunk/CMakeLists.txt<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/CMakeLists.txt?rev=331150&r1=331149&r2=331150&view=diff" rel="noreferrer noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/libcxxabi/trunk/<wbr>CMakeLists.txt?rev=331150&r1=<wbr>331149&r2=331150&view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- libcxxabi/trunk/CMakeLists.txt (original)<br>
> +++ libcxxabi/trunk/CMakeLists.txt Sun Apr 29 16:05:11 2018<br>
> @@ -387,6 +387,10 @@ endif()<br>
>  # Prevent libc++abi from having library dependencies on libc++<br>
>  add_definitions(-D_LIBCPP_<wbr>DISABLE_EXTERN_TEMPLATE)<br>
> <br>
> +# Bring back `std::unexpected`, which is removed in C++17, to support<br>
> +# pre-C++17.<br>
> +add_definitions(-D_LIBCPP_<wbr>ENABLE_CXX17_REMOVED_<wbr>UNEXPECTED_FUNCTIONS)<br>
> +<br>
>  if (MSVC)<br>
>    add_definitions(-D_CRT_SECURE_<wbr>NO_WARNINGS)<br>
>  endif()<br>
> <br>
> Modified: libcxxabi/trunk/src/cxa_<wbr>exception.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/cxa_exception.cpp?rev=331150&r1=331149&r2=331150&view=diff" rel="noreferrer noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/libcxxabi/trunk/src/<wbr>cxa_exception.cpp?rev=331150&<wbr>r1=331149&r2=331150&view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- libcxxabi/trunk/src/cxa_<wbr>exception.cpp (original)<br>
> +++ libcxxabi/trunk/src/cxa_<wbr>exception.cpp Sun Apr 29 16:05:11 2018<br>
> @@ -11,8 +11,6 @@<br>
>  //  <br>
>  //===-------------------------<wbr>------------------------------<wbr>---------------===//<br>
> <br>
> -#define _LIBCPP_ENABLE_CXX17_REMOVED_<wbr>UNEXPECTED_FUNCTIONS<br>
> -<br>
>  #include "cxxabi.h"<br>
> <br>
>  #include <exception>        // for std::terminate<br>
> <br>
> Modified: libcxxabi/trunk/test/test_<wbr>exception_storage.pass.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/test/test_exception_storage.pass.cpp?rev=331150&r1=331149&r2=331150&view=diff" rel="noreferrer noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/libcxxabi/trunk/test/<wbr>test_exception_storage.pass.<wbr>cpp?rev=331150&r1=331149&r2=<wbr>331150&view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- libcxxabi/trunk/test/test_<wbr>exception_storage.pass.cpp (original)<br>
> +++ libcxxabi/trunk/test/test_<wbr>exception_storage.pass.cpp Sun Apr 29 16:05:11 2018<br>
> @@ -7,11 +7,6 @@<br>
>  //<br>
>  //===-------------------------<wbr>------------------------------<wbr>---------------===//<br>
> <br>
> -// FIXME: cxa_exception.hpp directly references `std::unexpected` and friends.<br>
> -// This breaks this test when compiled in C++17. For now fix this by manually<br>
> -// re-enabling the STL functions.<br>
> -#define _LIBCPP_ENABLE_CXX17_REMOVED_<wbr>UNEXPECTED_FUNCTIONS<br>
> -<br>
>  #include <cstdlib><br>
>  #include <algorithm><br>
>  #include <iostream><br>
> <br>
> <br>
> ______________________________<wbr>_________________<br>
> cfe-commits mailing list<br>
> <a href="mailto:cfe-commits@lists.llvm.org" rel="noreferrer" target="_blank">cfe-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
> <br>
> ______________________________<wbr>_________________<br>
> cfe-commits mailing list<br>
> <a href="mailto:cfe-commits@lists.llvm.org" rel="noreferrer" target="_blank">cfe-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
<br>
</blockquote></div></div></div></blockquote></div><br></div>