From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Tue, 28 Feb 2023 21:58:14 +0000 (+0100)
Subject: Fix Darwin compilation
X-Git-Tag: VALGRIND_3_21_0~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40c196b0ca12c6fa27774776f8cc7e970c5afebc;p=thirdparty%2Fvalgrind.git

Fix Darwin compilation

Removed memalign wrapper on Darwin, so valloc can't use it any more.
---

diff --git a/coregrind/m_replacemalloc/vg_replace_malloc.c b/coregrind/m_replacemalloc/vg_replace_malloc.c
index cc38d665bf..251b8ac9d3 100644
--- a/coregrind/m_replacemalloc/vg_replace_malloc.c
+++ b/coregrind/m_replacemalloc/vg_replace_malloc.c
@@ -1719,8 +1719,8 @@ extern int *___errno (void) __attribute__((weak));
       if (pszB == 0) \
          pszB = my_getpagesize(); \
       TRIGGER_MEMCHECK_ERROR_IF_UNDEFINED((UWord) zone);	      \
-      return VG_REPLACE_FUNCTION_EZU(10110,VG_Z_LIBC_SONAME,memalign) \
-                ((SizeT)pszB, size); \
+      return (void*)VALGRIND_NON_SIMD_CALL2( info.tl_memalign, \
+         pszB, size ); \
    }
 
 #if defined(VGO_linux)