From: Daniel Dugovic <dandydand@gmail.com>
Date: Sat, 8 Aug 2020 20:39:29 +0000 (-0500)
Subject: Use fallback implementation for C++ aligned_alloc
X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=d7a26899a973536ab9d3ce4771d8276d1a4dc55c;ds=sidebyside

Use fallback implementation for C++ aligned_alloc

fixes https://github.com/official-stockfish/Stockfish/issues/2921

closes https://github.com/official-stockfish/Stockfish/pull/2927

No functional change
---

diff --git a/src/Makefile b/src/Makefile
index cab7a7e5..b7585a17 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -354,8 +354,8 @@ endif
 endif
 
 ifeq ($(KERNEL),Darwin)
-	CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.15
-	LDFLAGS += -arch $(arch) -mmacosx-version-min=10.15
+	CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.13
+	LDFLAGS += -arch $(arch) -mmacosx-version-min=10.13
 endif
 
 ### Travis CI script uses COMPILER to overwrite CXX
diff --git a/src/misc.cpp b/src/misc.cpp
index 3d7c75e5..05f79b45 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -321,9 +321,9 @@ void prefetch(void* addr) {
 ///
 
 void* std_aligned_alloc(size_t alignment, size_t size) {
-#if defined(__APPLE__)
+#if (defined(__APPLE__) && defined(_LIBCPP_HAS_C11_FEATURES)) || defined(__ANDROID__) || defined(__OpenBSD__) || (defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC) )
   return aligned_alloc(alignment, size);
-#elif defined(_WIN32)
+#elif (defined(_WIN32) || (defined(__APPLE__) && !defined(_LIBCPP_HAS_C11_FEATURES)))
   return _mm_malloc(size, alignment);
 #else
   return std::aligned_alloc(alignment, size);
@@ -331,9 +331,9 @@ void* std_aligned_alloc(size_t alignment, size_t size) {
 }
 
 void std_aligned_free(void* ptr) {
-#if defined(__APPLE__)
+#if (defined(__APPLE__) && defined(_LIBCPP_HAS_C11_FEATURES)) || defined(__ANDROID__) || defined(__OpenBSD__) || (defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC) )
   free(ptr);
-#elif defined(_WIN32)
+#elif (defined(_WIN32) || (defined(__APPLE__) && !defined(_LIBCPP_HAS_C11_FEATURES)))
   _mm_free(ptr);
 #else
   free(ptr);