[libcxxabi] r344208 - Update libc++abi's detection of aligned allocation after r344207.
Eric Fiselier
eric at efcs.ca
Wed Oct 10 17:18:54 PDT 2018
Author: ericwf
Date: Wed Oct 10 17:18:54 2018
New Revision: 344208
URL: http://llvm.org/viewvc/llvm-project?rev=344208&view=rev
Log:
Update libc++abi's detection of aligned allocation after r344207.
Modified:
libcxxabi/trunk/src/fallback_malloc.cpp
libcxxabi/trunk/src/stdlib_new_delete.cpp
Modified: libcxxabi/trunk/src/fallback_malloc.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/fallback_malloc.cpp?rev=344208&r1=344207&r2=344208&view=diff
==============================================================================
--- libcxxabi/trunk/src/fallback_malloc.cpp (original)
+++ libcxxabi/trunk/src/fallback_malloc.cpp Wed Oct 10 17:18:54 2018
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-// Define _LIBCPP_BUILDING_LIBRARY to ensure _LIBCPP_HAS_NO_ALIGNED_ALLOCATION
+// Define _LIBCPP_BUILDING_LIBRARY to ensure _LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION
// is only defined when libc aligned allocation is not available.
#define _LIBCPP_BUILDING_LIBRARY
#include "fallback_malloc.h"
@@ -209,7 +209,7 @@ void* __aligned_malloc_with_fallback(siz
#if defined(_WIN32)
if (void* dest = _aligned_malloc(size, alignof(__aligned_type)))
return dest;
-#elif defined(_LIBCPP_HAS_NO_ALIGNED_ALLOCATION)
+#elif defined(_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION)
if (void* dest = std::malloc(size))
return dest;
#else
Modified: libcxxabi/trunk/src/stdlib_new_delete.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/stdlib_new_delete.cpp?rev=344208&r1=344207&r2=344208&view=diff
==============================================================================
--- libcxxabi/trunk/src/stdlib_new_delete.cpp (original)
+++ libcxxabi/trunk/src/stdlib_new_delete.cpp Wed Oct 10 17:18:54 2018
@@ -134,7 +134,7 @@ operator delete[] (void* ptr, size_t) _N
::operator delete[](ptr);
}
-#if !defined(_LIBCPP_HAS_NO_ALIGNED_ALLOCATION)
+#if !defined(_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION)
_LIBCXXABI_WEAK
void *
@@ -260,4 +260,4 @@ operator delete[] (void* ptr, size_t, st
::operator delete[](ptr, alignment);
}
-#endif // !_LIBCPP_HAS_NO_ALIGNED_ALLOCATION
+#endif // !_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION
More information about the libcxx-commits
mailing list