valgrind: Fix ptest builds on musl

(From OE-Core rev: 20e7d638322cf03f512d4f13c698f25211097f86)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2020-01-27 19:58:50 -08:00
committed by Richard Purdie
parent 85a0d61025
commit 2fcd0cebe5
2 changed files with 45 additions and 0 deletions

View File

@@ -0,0 +1,44 @@
From 90fdb0ae0418f7907f09b763343a457bdf6855fa Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 27 Jan 2020 17:17:19 -0800
Subject: [PATCH] tests: Make pthread_detatch call portable across platforms
pthread_t is opaque type therefore we can not apply simple arithmetic to variables of pthread_t type
this test needs to pass a invalid pthread_t handle, typcasting to uintptr_t works too and is portable
across glibc and musl
Fixes
| pth_detached3.c:24:25: error: invalid use of undefined type 'struct __pthread'
| 24 | pthread_detach(thread + 8);
| | ^
Upstream-Status: Submitted [https://sourceforge.net/p/valgrind/mailman/message/36910506/]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
drd/tests/pth_detached3.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c
index c02eef11a..efeb15b72 100644
--- a/drd/tests/pth_detached3.c
+++ b/drd/tests/pth_detached3.c
@@ -4,6 +4,7 @@
#include <errno.h>
#include <pthread.h>
#include <stdio.h>
+#include <stdint.h>
static void* thread_func(void* arg)
{
@@ -21,7 +22,7 @@ int main(int argc, char** argv)
pthread_detach(thread);
/* Invoke pthread_detach() with an invalid thread ID. */
- pthread_detach(thread + 8);
+ pthread_detach((pthread_t)((uintptr_t)thread + 8));
fprintf(stderr, "Finished.\n");
--
2.25.0

View File

@@ -40,6 +40,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \
file://0001-adjust-path-filter-for-2-memcheck-tests.patch \
file://s390x_vec_op_t.patch \
file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \
file://0001-tests-Make-pthread_detatch-call-portable-across-plat.patch \
"
SRC_URI[md5sum] = "46e5fbdcbc3502a5976a317a0860a975"
SRC_URI[sha256sum] = "417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1"