|
From: Paul F. <pa...@so...> - 2023-04-01 18:57:10
|
https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=abf513febd1f98aad37201fe91468bf94ebae7f8 commit abf513febd1f98aad37201fe91468bf94ebae7f8 Author: Paul Floyd <pj...@wa...> Date: Sat Apr 1 20:55:22 2023 +0200 Darwin regtest: fix building on older OS versions aligned_alloc was added to macOS 10.15 and 10.13 is the latest that we support. Diff: --- memcheck/tests/memalign_args.c | 2 ++ memcheck/tests/memalign_args.stderr.exp | 4 ++-- memcheck/tests/memalign_args.stderr.exp-glibc | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/memcheck/tests/memalign_args.c b/memcheck/tests/memalign_args.c index 0946a6ce98..9c774d61ee 100644 --- a/memcheck/tests/memalign_args.c +++ b/memcheck/tests/memalign_args.c @@ -23,8 +23,10 @@ int main(void) res = posix_memalign((void **)&mem,align,size); free(mem); +#if !defined(VGO_darwin) p = aligned_alloc(align, size); free(p); +#endif p = valloc(size); free(p); diff --git a/memcheck/tests/memalign_args.stderr.exp b/memcheck/tests/memalign_args.stderr.exp index 4d426d3696..5482798875 100644 --- a/memcheck/tests/memalign_args.stderr.exp +++ b/memcheck/tests/memalign_args.stderr.exp @@ -8,8 +8,8 @@ Conditional jump or move depends on uninitialised value(s) Conditional jump or move depends on uninitialised value(s) at 0x........: aligned_alloc (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:26) + by 0x........: main (memalign_args.c:27) Conditional jump or move depends on uninitialised value(s) at 0x........: valloc (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:29) + by 0x........: main (memalign_args.c:31) diff --git a/memcheck/tests/memalign_args.stderr.exp-glibc b/memcheck/tests/memalign_args.stderr.exp-glibc index 8106196391..30cc1dc923 100644 --- a/memcheck/tests/memalign_args.stderr.exp-glibc +++ b/memcheck/tests/memalign_args.stderr.exp-glibc @@ -8,8 +8,8 @@ Conditional jump or move depends on uninitialised value(s) Conditional jump or move depends on uninitialised value(s) at 0x........: memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:26) + by 0x........: main (memalign_args.c:27) Conditional jump or move depends on uninitialised value(s) at 0x........: valloc (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:29) + by 0x........: main (memalign_args.c:31) |