summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@cn.fujitsu.com>2020-06-03 18:52:01 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-04 13:27:32 +0100
commit82b89e732c7ef746d32d3c196fcba0867127c3ec (patch)
tree918ff16cc10882eca125232ad5222ef43732b575
parentc15d342e45d11b4e00c9f24d72ad2f197f242a61 (diff)
downloadpoky-82b89e732c7ef746d32d3c196fcba0867127c3ec.tar.gz
valgrind: upgrade 3.15.0 -> 3.16.0
0001-gcc10-arm64-build-needs-__getauxval-for-linking-with.patch 0001-tests-Make-pthread_detatch-call-portable-across-plat.patch 0004-pth_atfork1.c-Define-error-API-for-musl.patch removed since they are included in 3.16.0 refresh 0004-Fix-out-of-tree-builds.patch -License-Update: before: You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. after: You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>. (From OE-Core rev: a627a350cf3db99a63d6be2701957e3de0654370) Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-gcc10-arm64-build-needs-__getauxval-for-linking-with.patch144
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch87
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch85
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0004-pth_atfork1.c-Define-error-API-for-musl.patch37
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.16.0.bb (renamed from meta/recipes-devtools/valgrind/valgrind_3.15.0.bb)9
5 files changed, 44 insertions, 318 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-gcc10-arm64-build-needs-__getauxval-for-linking-with.patch b/meta/recipes-devtools/valgrind/valgrind/0001-gcc10-arm64-build-needs-__getauxval-for-linking-with.patch
deleted file mode 100644
index 9afa7f6a55..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0001-gcc10-arm64-build-needs-__getauxval-for-linking-with.patch
+++ /dev/null
@@ -1,144 +0,0 @@
1From abbc0761fa0349d49b10dc8c0f10af6bc0578c40 Mon Sep 17 00:00:00 2001
2From: Mark Wielaard <mark@klomp.org>
3Date: Tue, 12 May 2020 16:58:36 +0200
4Subject: [PATCH 1/2] gcc10 arm64 build needs __getauxval for linking with
5 libgcc
6
7Provide a new library libgcc-sup-<platform>.a that contains symbols
8needed by libgcc. This needs to be linked after -lgcc to provide
9any symbols missing which would normally be provided by glibc.
10At the moment this only provides __getauxval on arm64 linux.
11
12https://bugs.kde.org/show_bug.cgi?id=421321
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15Upstream-Status: Backport [https://sourceware.org/git/?p=valgrind.git;a=commit;h=abbc0761fa0349d49b10dc8c0f10af6bc0578c40]
16
17---
18 Makefile.tool.am | 3 +-
19 coregrind/Makefile.am | 26 +++++++++++++++++
20 coregrind/m_libgcc_sup.c | 61 ++++++++++++++++++++++++++++++++++++++++
21 3 files changed, 89 insertions(+), 1 deletion(-)
22 create mode 100644 coregrind/m_libgcc_sup.c
23
24diff --git a/Makefile.tool.am b/Makefile.tool.am
25index cc2fa0ee6..2bf90de5d 100644
26--- a/Makefile.tool.am
27+++ b/Makefile.tool.am
28@@ -17,7 +17,8 @@ TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@ = \
29 endif
30
31
32-TOOL_LDADD_COMMON = -lgcc
33+TOOL_LDADD_COMMON = -lgcc \
34+ $(top_builddir)/coregrind/libgcc-sup-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a
35 TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@ = \
36 $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@) $(TOOL_LDADD_COMMON)
37 if VGCONF_HAVE_PLATFORM_SEC
38diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
39index 6a1a925fb..1753fb633 100644
40--- a/coregrind/Makefile.am
41+++ b/coregrind/Makefile.am
42@@ -542,6 +542,32 @@ libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_DEPENDENCIES = \
43 libnolto_coregrind-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a
44 endif
45
46+#----------------------------------------------------------------------------
47+# libgcc-sup-<platform>.a
48+# Special supplemental library for functions normally supplied by glibc
49+# used by libgcc.
50+#----------------------------------------------------------------------------
51+
52+pkglib_LIBRARIES += libgcc-sup-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a
53+if VGCONF_HAVE_PLATFORM_SEC
54+pkglib_LIBRARIES += libgcc-sup-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a
55+endif
56+
57+libgcc_sup_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
58+ m_libgcc_sup.c
59+libgcc_sup_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CPPFLAGS = \
60+ $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
61+libgcc_sup_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CFLAGS = \
62+ $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_PRI_CAPS@)
63+if VGCONF_HAVE_PLATFORM_SEC
64+libgcc_sup_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_SOURCES = \
65+ m_libgcc_sup.c
66+libgcc_sup_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CPPFLAGS = \
67+ $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@)
68+libgcc_sup_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CFLAGS = \
69+ $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_SEC_CAPS@)
70+endif
71+
72 #----------------------------------------------------------------------------
73 # libreplacemalloc_toolpreload-<platform>.a
74 #----------------------------------------------------------------------------
75diff --git a/coregrind/m_libgcc_sup.c b/coregrind/m_libgcc_sup.c
76new file mode 100644
77index 000000000..e29325459
78--- /dev/null
79+++ b/coregrind/m_libgcc_sup.c
80@@ -0,0 +1,61 @@
81+/* -*- mode: C; c-basic-offset: 3; -*- */
82+
83+/*--------------------------------------------------------------------*/
84+/*--- Supplemental functions for libgcc normally provided by glibc ---*/
85+/*--------------------------------------------------------------------*/
86+
87+/*
88+ This file is part of Valgrind, a dynamic binary instrumentation
89+ framework.
90+
91+ Copyright (C) 2020 Mark Wielaard
92+ mark@klomp.org
93+
94+ This program is free software; you can redistribute it and/or
95+ modify it under the terms of the GNU General Public License as
96+ published by the Free Software Foundation; either version 2 of the
97+ License, or (at your option) any later version.
98+
99+ This program is distributed in the hope that it will be useful, but
100+ WITHOUT ANY WARRANTY; without even the implied warranty of
101+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
102+ General Public License for more details.
103+
104+ You should have received a copy of the GNU General Public License
105+ along with this program; if not, see <http://www.gnu.org/licenses/>.
106+
107+ The GNU General Public License is contained in the file COPYING.
108+*/
109+
110+#include "config.h"
111+#include "pub_core_basics.h"
112+#include "pub_core_clientstate.h"
113+
114+/*====================================================================*/
115+/*=== arm64 libgcc support function for init_have_lse_atomics ===*/
116+/*====================================================================*/
117+
118+#if defined(VGP_arm64_linux)
119+struct auxv
120+{
121+ Word a_type;
122+ union {
123+ void *a_ptr;
124+ Word a_val;
125+ } u;
126+};
127+#define AT_NULL 0
128+
129+unsigned long int __getauxval (unsigned long int type);
130+unsigned long int __getauxval (unsigned long int type)
131+{
132+ struct auxv *p;
133+ for (p = (struct auxv *) VG_(client_auxv);
134+ p != NULL && p->a_type != AT_NULL;
135+ p++)
136+ if (p->a_type == type)
137+ return p->u.a_val;
138+
139+ return 0;
140+}
141+#endif
142--
1432.26.2
144
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch b/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch
deleted file mode 100644
index f407d8191b..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0001-tests-Make-pthread_detatch-call-portable-across-plat.patch
+++ /dev/null
@@ -1,87 +0,0 @@
1From 92fcf75d6d3903e45492b041bf4ad07787d2e58a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 27 Jan 2020 19:50:04 -0800
4Subject: [PATCH] drd/tests/pth_detached3: Make pthread_detach() call portable
5 across platforms
6
7pthread_t is opaque type therefore we can not apply simple arithmetic to
8variables of pthread_t type this test needs to pass a invalid pthread_t
9handle, typcasting to uintptr_t works too and is portable across glibc and
10musl
11
12Fixes
13| pth_detached3.c:24:25: error: invalid use of undefined type 'struct __pthread'
14| 24 | pthread_detach(thread + 8);
15| | ^
16
17[ bvanassche: reformatted patch description and fixed up line numbers ]
18
19Upstream-Status: Backport [https://sourceware.org/git/?p=valgrind.git;a=commit;h=92fcf75d6d3903e45492b041bf4ad07787d2e58a]
20Signed-off-by: Khem Raj <raj.khem@gmail.com>
21---
22 drd/tests/pth_detached3.c | 3 ++-
23 drd/tests/pth_detached3.stderr.exp1 | 4 ++--
24 drd/tests/pth_detached3.stderr.exp2 | 4 ++--
25 3 files changed, 6 insertions(+), 5 deletions(-)
26
27diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c
28index c02eef1..efeb15b 100644
29--- a/drd/tests/pth_detached3.c
30+++ b/drd/tests/pth_detached3.c
31@@ -4,6 +4,7 @@
32 #include <errno.h>
33 #include <pthread.h>
34 #include <stdio.h>
35+#include <stdint.h>
36
37 static void* thread_func(void* arg)
38 {
39@@ -21,7 +22,7 @@ int main(int argc, char** argv)
40 pthread_detach(thread);
41
42 /* Invoke pthread_detach() with an invalid thread ID. */
43- pthread_detach(thread + 8);
44+ pthread_detach((pthread_t)((uintptr_t)thread + 8));
45
46 fprintf(stderr, "Finished.\n");
47
48diff --git a/drd/tests/pth_detached3.stderr.exp1 b/drd/tests/pth_detached3.stderr.exp1
49index 58412ec..8dd58ba 100644
50--- a/drd/tests/pth_detached3.stderr.exp1
51+++ b/drd/tests/pth_detached3.stderr.exp1
52@@ -1,11 +1,11 @@
53
54 pthread_detach(): invalid thread ID 0x........
55 at 0x........: pthread_detach (drd_pthread_intercepts.c:?)
56- by 0x........: main (pth_detached3.c:21)
57+ by 0x........: main (pth_detached3.c:22)
58
59 pthread_detach(): invalid thread ID 0x........
60 at 0x........: pthread_detach (drd_pthread_intercepts.c:?)
61- by 0x........: main (pth_detached3.c:24)
62+ by 0x........: main (pth_detached3.c:25)
63
64 Finished.
65
66diff --git a/drd/tests/pth_detached3.stderr.exp2 b/drd/tests/pth_detached3.stderr.exp2
67index bdc5cf8..e82dee1 100644
68--- a/drd/tests/pth_detached3.stderr.exp2
69+++ b/drd/tests/pth_detached3.stderr.exp2
70@@ -2,12 +2,12 @@
71 pthread_detach(): invalid thread ID 0x........
72 at 0x........: vgDrd_set_joinable (drd_pthread_intercepts.c:?)
73 by 0x........: pthread_detach (drd_pthread_intercepts.c:?)
74- by 0x........: main (pth_detached3.c:21)
75+ by 0x........: main (pth_detached3.c:22)
76
77 pthread_detach(): invalid thread ID 0x........
78 at 0x........: vgDrd_set_joinable (drd_pthread_intercepts.c:?)
79 by 0x........: pthread_detach (drd_pthread_intercepts.c:?)
80- by 0x........: main (pth_detached3.c:24)
81+ by 0x........: main (pth_detached3.c:25)
82
83 Finished.
84
85--
862.9.3
87
diff --git a/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch b/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch
index 75bb0aa7cb..4570f63995 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch
@@ -4,7 +4,8 @@ Date: Tue, 16 Oct 2018 21:01:04 -0400
4Subject: [PATCH] Fix out of tree builds. 4Subject: [PATCH] Fix out of tree builds.
5 5
6The paths to these files need to be fully specified in 6The paths to these files need to be fully specified in
7the out of tree build case. glibc-2.X.supp is a generated file so the full path 7the out of tree build case. glibc-2.X.supp is a generated file so the
8full path
8is deliberately not specified in that case. 9is deliberately not specified in that case.
9 10
10RP 2013/03/23 11RP 2013/03/23
@@ -16,81 +17,81 @@ Upstream-Status: Pending
16Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 17Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
17Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> 18Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
18--- 19---
19 configure.ac | 68 ++++++++++++++++++++++++++-------------------------- 20 configure.ac | 66 ++++++++++++++++++++++++++--------------------------
20 1 file changed, 34 insertions(+), 34 deletions(-) 21 1 file changed, 33 insertions(+), 33 deletions(-)
21 22
22diff --git a/configure.ac b/configure.ac 23diff --git a/configure.ac b/configure.ac
23index c18ae5f2a..99667ce57 100644 24index 524230d..54861c5 100755
24--- a/configure.ac 25--- a/configure.ac
25+++ b/configure.ac 26+++ b/configure.ac
26@@ -392,50 +392,50 @@ case "${host_os}" in 27@@ -396,50 +396,50 @@ case "${host_os}" in
27 9.*) 28 9.*)
28 AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard]) 29 AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard])
29 AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version]) 30 AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version])
30- DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}" 31- DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}"
31- DEFAULT_SUPP="darwin9-drd.supp ${DEFAULT_SUPP}" 32- DEFAULT_SUPP="darwin9-drd.supp ${DEFAULT_SUPP}"
32+ DEFAULT_SUPP="$srcdir/darwin9.supp ${DEFAULT_SUPP}" 33+ DEFAULT_SUPP="$srcdir/darwin9.supp ${DEFAULT_SUPP}"
33+ DEFAULT_SUPP="$srcdir/darwin9-drd.supp ${DEFAULT_SUPP}" 34+ DEFAULT_SUPP="$srcdir/darwin9-drd.supp ${DEFAULT_SUPP}"
34 ;; 35 ;;
35 10.*) 36 10.*)
36 AC_MSG_RESULT([Darwin 10.x (${kernel}) / Mac OS X 10.6 Snow Leopard]) 37 AC_MSG_RESULT([Darwin 10.x (${kernel}) / Mac OS X 10.6 Snow Leopard])
37 AC_DEFINE([DARWIN_VERS], DARWIN_10_6, [Darwin / Mac OS X version]) 38 AC_DEFINE([DARWIN_VERS], DARWIN_10_6, [Darwin / Mac OS X version])
38- DEFAULT_SUPP="darwin10.supp ${DEFAULT_SUPP}" 39- DEFAULT_SUPP="darwin10.supp ${DEFAULT_SUPP}"
39- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" 40- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
40+ DEFAULT_SUPP="$srcdir/darwin10.supp ${DEFAULT_SUPP}" 41+ DEFAULT_SUPP="$srcdir/darwin10.supp ${DEFAULT_SUPP}"
41+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" 42+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
42 ;; 43 ;;
43 11.*) 44 11.*)
44 AC_MSG_RESULT([Darwin 11.x (${kernel}) / Mac OS X 10.7 Lion]) 45 AC_MSG_RESULT([Darwin 11.x (${kernel}) / Mac OS X 10.7 Lion])
45 AC_DEFINE([DARWIN_VERS], DARWIN_10_7, [Darwin / Mac OS X version]) 46 AC_DEFINE([DARWIN_VERS], DARWIN_10_7, [Darwin / Mac OS X version])
46- DEFAULT_SUPP="darwin11.supp ${DEFAULT_SUPP}" 47- DEFAULT_SUPP="darwin11.supp ${DEFAULT_SUPP}"
47- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" 48- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
48+ DEFAULT_SUPP="$srcdir/darwin11.supp ${DEFAULT_SUPP}" 49+ DEFAULT_SUPP="$srcdir/darwin11.supp ${DEFAULT_SUPP}"
49+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" 50+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
50 ;; 51 ;;
51 12.*) 52 12.*)
52 AC_MSG_RESULT([Darwin 12.x (${kernel}) / Mac OS X 10.8 Mountain Lion]) 53 AC_MSG_RESULT([Darwin 12.x (${kernel}) / Mac OS X 10.8 Mountain Lion])
53 AC_DEFINE([DARWIN_VERS], DARWIN_10_8, [Darwin / Mac OS X version]) 54 AC_DEFINE([DARWIN_VERS], DARWIN_10_8, [Darwin / Mac OS X version])
54- DEFAULT_SUPP="darwin12.supp ${DEFAULT_SUPP}" 55- DEFAULT_SUPP="darwin12.supp ${DEFAULT_SUPP}"
55- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" 56- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
56+ DEFAULT_SUPP="$srcdir/darwin12.supp ${DEFAULT_SUPP}" 57+ DEFAULT_SUPP="$srcdir/darwin12.supp ${DEFAULT_SUPP}"
57+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" 58+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
58 ;; 59 ;;
59 13.*) 60 13.*)
60 AC_MSG_RESULT([Darwin 13.x (${kernel}) / Mac OS X 10.9 Mavericks]) 61 AC_MSG_RESULT([Darwin 13.x (${kernel}) / Mac OS X 10.9 Mavericks])
61 AC_DEFINE([DARWIN_VERS], DARWIN_10_9, [Darwin / Mac OS X version]) 62 AC_DEFINE([DARWIN_VERS], DARWIN_10_9, [Darwin / Mac OS X version])
62- DEFAULT_SUPP="darwin13.supp ${DEFAULT_SUPP}" 63- DEFAULT_SUPP="darwin13.supp ${DEFAULT_SUPP}"
63- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" 64- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
64+ DEFAULT_SUPP="$srcdir/darwin13.supp ${DEFAULT_SUPP}" 65+ DEFAULT_SUPP="$srcdir/darwin13.supp ${DEFAULT_SUPP}"
65+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" 66+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
66 ;; 67 ;;
67 14.*) 68 14.*)
68 AC_MSG_RESULT([Darwin 14.x (${kernel}) / Mac OS X 10.10 Yosemite]) 69 AC_MSG_RESULT([Darwin 14.x (${kernel}) / Mac OS X 10.10 Yosemite])
69 AC_DEFINE([DARWIN_VERS], DARWIN_10_10, [Darwin / Mac OS X version]) 70 AC_DEFINE([DARWIN_VERS], DARWIN_10_10, [Darwin / Mac OS X version])
70- DEFAULT_SUPP="darwin14.supp ${DEFAULT_SUPP}" 71- DEFAULT_SUPP="darwin14.supp ${DEFAULT_SUPP}"
71- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" 72- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
72+ DEFAULT_SUPP="$srcdir/darwin14.supp ${DEFAULT_SUPP}" 73+ DEFAULT_SUPP="$srcdir/darwin14.supp ${DEFAULT_SUPP}"
73+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" 74+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
74 ;; 75 ;;
75 15.*) 76 15.*)
76 AC_MSG_RESULT([Darwin 15.x (${kernel}) / Mac OS X 10.11 El Capitan]) 77 AC_MSG_RESULT([Darwin 15.x (${kernel}) / Mac OS X 10.11 El Capitan])
77 AC_DEFINE([DARWIN_VERS], DARWIN_10_11, [Darwin / Mac OS X version]) 78 AC_DEFINE([DARWIN_VERS], DARWIN_10_11, [Darwin / Mac OS X version])
78- DEFAULT_SUPP="darwin15.supp ${DEFAULT_SUPP}" 79- DEFAULT_SUPP="darwin15.supp ${DEFAULT_SUPP}"
79- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" 80- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
80+ DEFAULT_SUPP="$srcdir/darwin15.supp ${DEFAULT_SUPP}" 81+ DEFAULT_SUPP="$srcdir/darwin15.supp ${DEFAULT_SUPP}"
81+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" 82+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
82 ;; 83 ;;
83 16.*) 84 16.*)
84 AC_MSG_RESULT([Darwin 16.x (${kernel}) / macOS 10.12 Sierra]) 85 AC_MSG_RESULT([Darwin 16.x (${kernel}) / macOS 10.12 Sierra])
85 AC_DEFINE([DARWIN_VERS], DARWIN_10_12, [Darwin / Mac OS X version]) 86 AC_DEFINE([DARWIN_VERS], DARWIN_10_12, [Darwin / Mac OS X version])
86- DEFAULT_SUPP="darwin16.supp ${DEFAULT_SUPP}" 87- DEFAULT_SUPP="darwin16.supp ${DEFAULT_SUPP}"
87- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" 88- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
88+ DEFAULT_SUPP="$srcdir/darwin16.supp ${DEFAULT_SUPP}" 89+ DEFAULT_SUPP="$srcdir/darwin16.supp ${DEFAULT_SUPP}"
89+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" 90+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
90 ;; 91 ;;
91 17.*) 92 17.*)
92 AC_MSG_RESULT([Darwin 17.x (${kernel}) / macOS 10.13 High Sierra]) 93 AC_MSG_RESULT([Darwin 17.x (${kernel}) / macOS 10.13 High Sierra])
93@@ -460,7 +460,7 @@ case "${host_os}" in 94@@ -464,7 +464,7 @@ case "${host_os}" in
94 DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}" 95 DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}"
95 ;; 96 ;;
96 *) 97 *)
@@ -99,7 +100,7 @@ index c18ae5f2a..99667ce57 100644
99 ;; 100 ;;
100 esac 101 esac
101 ;; 102 ;;
102@@ -468,7 +468,7 @@ case "${host_os}" in 103@@ -472,7 +472,7 @@ case "${host_os}" in
103 solaris2.12*) 104 solaris2.12*)
104 AC_MSG_RESULT([ok (${host_os})]) 105 AC_MSG_RESULT([ok (${host_os})])
105 VGCONF_OS="solaris" 106 VGCONF_OS="solaris"
@@ -108,33 +109,33 @@ index c18ae5f2a..99667ce57 100644
108 ;; 109 ;;
109 110
110 *) 111 *)
111@@ -1051,29 +1051,29 @@ AC_MSG_CHECKING([the glibc version]) 112@@ -1095,29 +1095,29 @@ AC_MSG_CHECKING([the glibc version])
112 case "${GLIBC_VERSION}" in 113 case "${GLIBC_VERSION}" in
113 2.2) 114 2.2)
114 AC_MSG_RESULT(${GLIBC_VERSION} family) 115 AC_MSG_RESULT(${GLIBC_VERSION} family)
115- DEFAULT_SUPP="glibc-2.2.supp ${DEFAULT_SUPP}" 116- DEFAULT_SUPP="glibc-2.2.supp ${DEFAULT_SUPP}"
116- DEFAULT_SUPP="glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}" 117- DEFAULT_SUPP="glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}"
117- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" 118- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
118+ DEFAULT_SUPP="$srcdir/glibc-2.2.supp ${DEFAULT_SUPP}" 119+ DEFAULT_SUPP="$srcdir/glibc-2.2.supp ${DEFAULT_SUPP}"
119+ DEFAULT_SUPP="$srcdir/glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}" 120+ DEFAULT_SUPP="$srcdir/glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}"
120+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" 121+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
121 ;; 122 ;;
122 2.[[3-6]]) 123 2.[[3-6]])
123 AC_MSG_RESULT(${GLIBC_VERSION} family) 124 AC_MSG_RESULT(${GLIBC_VERSION} family)
124- DEFAULT_SUPP="glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}" 125- DEFAULT_SUPP="glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}"
125- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" 126- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
126- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" 127- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
127+ DEFAULT_SUPP="$srcdir/glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}" 128+ DEFAULT_SUPP="$srcdir/glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}"
128+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" 129+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
129+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" 130+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
130 ;; 131 ;;
131 2.[[7-9]]) 132 2.[[7-9]])
132 AC_MSG_RESULT(${GLIBC_VERSION} family) 133 AC_MSG_RESULT(${GLIBC_VERSION} family)
133 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" 134 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
134- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" 135- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
135- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" 136- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
136+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" 137+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
137+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" 138+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
138 ;; 139 ;;
139 2.10|2.11) 140 2.10|2.11)
140 AC_MSG_RESULT(${GLIBC_VERSION} family) 141 AC_MSG_RESULT(${GLIBC_VERSION} family)
@@ -143,23 +144,23 @@ index c18ae5f2a..99667ce57 100644
143 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" 144 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
144- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" 145- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
145- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" 146- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
146+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" 147+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
147+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" 148+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
148 ;; 149 ;;
149 2.*) 150 2.*)
150 AC_MSG_RESULT(${GLIBC_VERSION} family) 151 AC_MSG_RESULT(${GLIBC_VERSION} family)
151@@ -1082,8 +1082,8 @@ case "${GLIBC_VERSION}" in 152@@ -1126,8 +1126,8 @@ case "${GLIBC_VERSION}" in
152 AC_DEFINE([GLIBC_MANDATORY_INDEX_AND_STRLEN_REDIRECT], 1, 153 AC_DEFINE([GLIBC_MANDATORY_INDEX_AND_STRLEN_REDIRECT], 1,
153 [Define to 1 if index() and strlen() have been optimized heavily (x86 glibc >= 2.12)]) 154 [Define to 1 if index() and strlen() have been optimized heavily (x86 glibc >= 2.12)])
154 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" 155 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
155- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" 156- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
156- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" 157- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
157+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" 158+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
158+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" 159+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
159 ;; 160 ;;
160 darwin) 161 darwin)
161 AC_MSG_RESULT(Darwin) 162 AC_MSG_RESULT(Darwin)
162@@ -1093,7 +1093,7 @@ case "${GLIBC_VERSION}" in 163@@ -1137,7 +1137,7 @@ case "${GLIBC_VERSION}" in
163 bionic) 164 bionic)
164 AC_MSG_RESULT(Bionic) 165 AC_MSG_RESULT(Bionic)
165 AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic]) 166 AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic])
@@ -168,7 +169,7 @@ index c18ae5f2a..99667ce57 100644
168 ;; 169 ;;
169 solaris) 170 solaris)
170 AC_MSG_RESULT(Solaris) 171 AC_MSG_RESULT(Solaris)
171@@ -1120,11 +1120,11 @@ if test "$VGCONF_OS" != "solaris"; then 172@@ -1164,8 +1164,8 @@ if test "$VGCONF_OS" != "solaris"; then
172 # attempt to detect whether such libraries are installed on the 173 # attempt to detect whether such libraries are installed on the
173 # build machine (or even if any X facilities are present); just 174 # build machine (or even if any X facilities are present); just
174 # add the suppressions antidisirregardless. 175 # add the suppressions antidisirregardless.
@@ -176,13 +177,9 @@ index c18ae5f2a..99667ce57 100644
176- DEFAULT_SUPP="xfree-3.supp ${DEFAULT_SUPP}" 177- DEFAULT_SUPP="xfree-3.supp ${DEFAULT_SUPP}"
177+ DEFAULT_SUPP="$srcdir/xfree-4.supp ${DEFAULT_SUPP}" 178+ DEFAULT_SUPP="$srcdir/xfree-4.supp ${DEFAULT_SUPP}"
178+ DEFAULT_SUPP="$srcdir/xfree-3.supp ${DEFAULT_SUPP}" 179+ DEFAULT_SUPP="$srcdir/xfree-3.supp ${DEFAULT_SUPP}"
179
180 # Add glibc and X11 suppressions for exp-sgcheck
181- DEFAULT_SUPP="exp-sgcheck.supp ${DEFAULT_SUPP}"
182+ DEFAULT_SUPP="$srcdir/exp-sgcheck.supp ${DEFAULT_SUPP}"
183 fi 180 fi
184 181
185 182
186-- 183--
1872.17.0 1842.17.1
188 185
diff --git a/meta/recipes-devtools/valgrind/valgrind/0004-pth_atfork1.c-Define-error-API-for-musl.patch b/meta/recipes-devtools/valgrind/valgrind/0004-pth_atfork1.c-Define-error-API-for-musl.patch
deleted file mode 100644
index 1cb7062545..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0004-pth_atfork1.c-Define-error-API-for-musl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From fb77fef4f866dac7bcc6d1ae025da60564869f84 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 10 Jun 2017 01:06:11 -0700
4Subject: [PATCH 4/6] pth_atfork1.c: Define error() API for musl
5
6Upstream-Status: Pending
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 none/tests/pth_atfork1.c | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/none/tests/pth_atfork1.c b/none/tests/pth_atfork1.c
14index 34201ef..b7f5f2d 100644
15--- a/none/tests/pth_atfork1.c
16+++ b/none/tests/pth_atfork1.c
17@@ -18,7 +18,7 @@
18 Boston, MA 02111-1307, USA. */
19
20 #include <errno.h>
21-#if !defined(__APPLE__) && !defined(__sun)
22+#if !defined(__APPLE__) && !defined(__sun) && defined(__GLIBC__)
23 # include <error.h>
24 #endif
25 #include <stdlib.h>
26@@ -27,7 +27,7 @@
27 #include <sys/wait.h>
28 #include <stdio.h>
29
30-#if defined(__APPLE__) || defined(__sun)
31+#if defined(__APPLE__) || defined(__sun) || (defined(__linux__) && !defined(__GLIBC__))
32 #include <string.h> /* strerror */
33 static void error (int status, int errnum, char* msg)
34 {
35--
362.13.1
37
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.16.0.bb
index a764d18177..5402f39a5b 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.16.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://valgrind.org/"
3BUGTRACKER = "http://valgrind.org/support/bug_reports.html" 3BUGTRACKER = "http://valgrind.org/support/bug_reports.html"
4LICENSE = "GPLv2 & GPLv2+ & BSD" 4LICENSE = "GPLv2 & GPLv2+ & BSD"
5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
6 file://include/pub_tool_basics.h;beginline=6;endline=29;md5=d4de0407239381463cf01dd276d7c22e \ 6 file://include/pub_tool_basics.h;beginline=6;endline=29;md5=41c410e8d3f305aee7aaa666b2e4f366 \
7 file://include/valgrind.h;beginline=1;endline=56;md5=ad3b317f3286b6b704575d9efe6ca5df \ 7 file://include/valgrind.h;beginline=1;endline=56;md5=ad3b317f3286b6b704575d9efe6ca5df \
8 file://COPYING.DOCS;md5=24ea4c7092233849b4394699333b5c56" 8 file://COPYING.DOCS;md5=24ea4c7092233849b4394699333b5c56"
9 9
@@ -27,7 +27,6 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \
27 file://0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch \ 27 file://0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch \
28 file://0002-context-APIs-are-not-available-on-musl.patch \ 28 file://0002-context-APIs-are-not-available-on-musl.patch \
29 file://0003-correct-include-directive-path-for-config.h.patch \ 29 file://0003-correct-include-directive-path-for-config.h.patch \
30 file://0004-pth_atfork1.c-Define-error-API-for-musl.patch \
31 file://0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch \ 30 file://0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch \
32 file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \ 31 file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \
33 file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \ 32 file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \
@@ -40,12 +39,10 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \
40 file://0001-adjust-path-filter-for-2-memcheck-tests.patch \ 39 file://0001-adjust-path-filter-for-2-memcheck-tests.patch \
41 file://s390x_vec_op_t.patch \ 40 file://s390x_vec_op_t.patch \
42 file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ 41 file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \
43 file://0001-tests-Make-pthread_detatch-call-portable-across-plat.patch \
44 file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \ 42 file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \
45 file://0001-gcc10-arm64-build-needs-__getauxval-for-linking-with.patch \
46 " 43 "
47SRC_URI[md5sum] = "46e5fbdcbc3502a5976a317a0860a975" 44SRC_URI[md5sum] = "495b30af5e5ed62ebb9bb777ee19b27f"
48SRC_URI[sha256sum] = "417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1" 45SRC_URI[sha256sum] = "582d5127ba56dfeaab4c6ced92a742b2921148e28a5d55055aedd8f75f1cf633"
49UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar" 46UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar"
50 47
51COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux' 48COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux'