mirror of
https://git.yoctoproject.org/poky
synced 2026-09-15 15:49:32 +02:00
valgrind: replace a submitted patch with one that was merged
This addresses a ptest failure in particular that the submitted patch caused. (From OE-Core rev: 4e9d46a570f7d7d1981a24f90c5e919b1f73c8b5) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
3d2004884f
commit
7374afee9d
@@ -1,25 +1,31 @@
|
|||||||
From 90fdb0ae0418f7907f09b763343a457bdf6855fa Mon Sep 17 00:00:00 2001
|
From 92fcf75d6d3903e45492b041bf4ad07787d2e58a Mon Sep 17 00:00:00 2001
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
Date: Mon, 27 Jan 2020 17:17:19 -0800
|
Date: Mon, 27 Jan 2020 19:50:04 -0800
|
||||||
Subject: [PATCH] tests: Make pthread_detatch call portable across platforms
|
Subject: [PATCH] drd/tests/pth_detached3: Make pthread_detach() call portable
|
||||||
|
across platforms
|
||||||
|
|
||||||
pthread_t is opaque type therefore we can not apply simple arithmetic to variables of pthread_t type
|
pthread_t is opaque type therefore we can not apply simple arithmetic to
|
||||||
this test needs to pass a invalid pthread_t handle, typcasting to uintptr_t works too and is portable
|
variables of pthread_t type this test needs to pass a invalid pthread_t
|
||||||
across glibc and musl
|
handle, typcasting to uintptr_t works too and is portable across glibc and
|
||||||
|
musl
|
||||||
|
|
||||||
Fixes
|
Fixes
|
||||||
| pth_detached3.c:24:25: error: invalid use of undefined type 'struct __pthread'
|
| pth_detached3.c:24:25: error: invalid use of undefined type 'struct __pthread'
|
||||||
| 24 | pthread_detach(thread + 8);
|
| 24 | pthread_detach(thread + 8);
|
||||||
| | ^
|
| | ^
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://sourceforge.net/p/valgrind/mailman/message/36910506/]
|
[ bvanassche: reformatted patch description and fixed up line numbers ]
|
||||||
|
|
||||||
|
Upstream-Status: Backport [https://sourceware.org/git/?p=valgrind.git;a=commit;h=92fcf75d6d3903e45492b041bf4ad07787d2e58a]
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
---
|
---
|
||||||
drd/tests/pth_detached3.c | 3 ++-
|
drd/tests/pth_detached3.c | 3 ++-
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
drd/tests/pth_detached3.stderr.exp1 | 4 ++--
|
||||||
|
drd/tests/pth_detached3.stderr.exp2 | 4 ++--
|
||||||
|
3 files changed, 6 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c
|
diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c
|
||||||
index c02eef11a..efeb15b72 100644
|
index c02eef1..efeb15b 100644
|
||||||
--- a/drd/tests/pth_detached3.c
|
--- a/drd/tests/pth_detached3.c
|
||||||
+++ b/drd/tests/pth_detached3.c
|
+++ b/drd/tests/pth_detached3.c
|
||||||
@@ -4,6 +4,7 @@
|
@@ -4,6 +4,7 @@
|
||||||
@@ -39,6 +45,43 @@ index c02eef11a..efeb15b72 100644
|
|||||||
|
|
||||||
fprintf(stderr, "Finished.\n");
|
fprintf(stderr, "Finished.\n");
|
||||||
|
|
||||||
|
diff --git a/drd/tests/pth_detached3.stderr.exp1 b/drd/tests/pth_detached3.stderr.exp1
|
||||||
|
index 58412ec..8dd58ba 100644
|
||||||
|
--- a/drd/tests/pth_detached3.stderr.exp1
|
||||||
|
+++ b/drd/tests/pth_detached3.stderr.exp1
|
||||||
|
@@ -1,11 +1,11 @@
|
||||||
|
|
||||||
|
pthread_detach(): invalid thread ID 0x........
|
||||||
|
at 0x........: pthread_detach (drd_pthread_intercepts.c:?)
|
||||||
|
- by 0x........: main (pth_detached3.c:21)
|
||||||
|
+ by 0x........: main (pth_detached3.c:22)
|
||||||
|
|
||||||
|
pthread_detach(): invalid thread ID 0x........
|
||||||
|
at 0x........: pthread_detach (drd_pthread_intercepts.c:?)
|
||||||
|
- by 0x........: main (pth_detached3.c:24)
|
||||||
|
+ by 0x........: main (pth_detached3.c:25)
|
||||||
|
|
||||||
|
Finished.
|
||||||
|
|
||||||
|
diff --git a/drd/tests/pth_detached3.stderr.exp2 b/drd/tests/pth_detached3.stderr.exp2
|
||||||
|
index bdc5cf8..e82dee1 100644
|
||||||
|
--- a/drd/tests/pth_detached3.stderr.exp2
|
||||||
|
+++ b/drd/tests/pth_detached3.stderr.exp2
|
||||||
|
@@ -2,12 +2,12 @@
|
||||||
|
pthread_detach(): invalid thread ID 0x........
|
||||||
|
at 0x........: vgDrd_set_joinable (drd_pthread_intercepts.c:?)
|
||||||
|
by 0x........: pthread_detach (drd_pthread_intercepts.c:?)
|
||||||
|
- by 0x........: main (pth_detached3.c:21)
|
||||||
|
+ by 0x........: main (pth_detached3.c:22)
|
||||||
|
|
||||||
|
pthread_detach(): invalid thread ID 0x........
|
||||||
|
at 0x........: vgDrd_set_joinable (drd_pthread_intercepts.c:?)
|
||||||
|
by 0x........: pthread_detach (drd_pthread_intercepts.c:?)
|
||||||
|
- by 0x........: main (pth_detached3.c:24)
|
||||||
|
+ by 0x........: main (pth_detached3.c:25)
|
||||||
|
|
||||||
|
Finished.
|
||||||
|
|
||||||
--
|
--
|
||||||
2.25.0
|
2.9.3
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user