From d67e58f23a8232ee17dba3cd8c5b4c1378ddbc59 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Tue, 1 Dec 2020 17:43:33 -0500 Subject: [libc++abi] Don't try calling __libcpp_aligned_free when aligned allocation is disabled See https://reviews.llvm.org/rGa78aaa1ad512#962077 for details. --- libcxxabi/src/fallback_malloc.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libcxxabi/src/fallback_malloc.cpp b/libcxxabi/src/fallback_malloc.cpp index 78720187affc..f3d7937793ce 100644 --- a/libcxxabi/src/fallback_malloc.cpp +++ b/libcxxabi/src/fallback_malloc.cpp @@ -234,7 +234,11 @@ void __aligned_free_with_fallback(void* ptr) { if (is_fallback_ptr(ptr)) fallback_free(ptr); else { +#if defined(_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION) + ::free(ptr); +#else std::__libcpp_aligned_free(ptr); +#endif } } -- cgit v1.2.1