From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Wed, 17 Mar 2021 08:12:21 +0000 (+0100)
Subject: Two fixes for Darwin 'make check'
X-Git-Tag: VALGRIND_3_17_0~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e531f994c6742364aa7ea3160f3a340f8a2a9828;p=thirdparty%2Fvalgrind.git

Two fixes for Darwin 'make check'

mempcpy is not available on Darwin, so make it conditional like Solaris.

also sys/auxv.h does not exist so make including it conditional.
---

diff --git a/dhat/tests/copy.c b/dhat/tests/copy.c
index dd94ec19f8..25bb221ecf 100644
--- a/dhat/tests/copy.c
+++ b/dhat/tests/copy.c
@@ -43,7 +43,7 @@ void f(char* a, char* b, wchar_t* wa, wchar_t* wb) {
    memcpy (a, b, 1000); // Redirects to memmove
    memcpy (a, b, 1000); // Redirects to memmove
    memmove(a, b, 1000);
-#if defined(VGO_solaris)
+#if defined(VGO_solaris) || defined(VGO_darwin)
    memcpy(a, b, 1000);
 #else
    mempcpy(a, b, 1000);
diff --git a/tests/arm64_features.c b/tests/arm64_features.c
index 01b12f784a..916a4e24dd 100644
--- a/tests/arm64_features.c
+++ b/tests/arm64_features.c
@@ -1,7 +1,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#if !defined(__APPLE__)
 #include <sys/auxv.h>
+#endif
 
 // This file determines arm64 features a processor supports.
 // Arm processors do not have a x86-like cpuinfo instruction. Instead the