|
From: Paul F. <pa...@so...> - 2021-03-17 08:17:58
|
https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=e531f994c6742364aa7ea3160f3a340f8a2a9828 commit e531f994c6742364aa7ea3160f3a340f8a2a9828 Author: Paul Floyd <pj...@wa...> Date: Wed Mar 17 09:12:21 2021 +0100 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: --- dhat/tests/copy.c | 2 +- tests/arm64_features.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 |