diff options
12 files changed, 324 insertions, 593 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch b/meta/recipes-devtools/valgrind/valgrind/0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch new file mode 100644 index 0000000000..a78e1953ff --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch | |||
| @@ -0,0 +1,51 @@ | |||
| 1 | From 9762fd23e1f1db66d4b977c694a17d3bca3fe99a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Fri, 8 Jan 2016 16:36:29 +0200 | ||
| 4 | Subject: [PATCH] Remove tests that fail to build on some PPC32 configurations | ||
| 5 | |||
| 6 | Failures are documented here: | ||
| 7 | http://errors.yoctoproject.org/Errors/Search/?items=10&query=862d702fbb99e484631315aa44b9e46f8fc567da&filter=valgrind&type=recipe | ||
| 8 | |||
| 9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 10 | Upstream-Status: Pending | ||
| 11 | --- | ||
| 12 | memcheck/tests/ppc32/Makefile.am | 2 +- | ||
| 13 | none/tests/ppc32/Makefile.am | 4 ++-- | ||
| 14 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/memcheck/tests/ppc32/Makefile.am b/memcheck/tests/ppc32/Makefile.am | ||
| 17 | index 26b95a2..8f05743 100644 | ||
| 18 | --- a/memcheck/tests/ppc32/Makefile.am | ||
| 19 | +++ b/memcheck/tests/ppc32/Makefile.am | ||
| 20 | @@ -10,7 +10,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ | ||
| 21 | power_ISA2_07.stderr.exp power_ISA2_07.vgtest | ||
| 22 | |||
| 23 | check_PROGRAMS = \ | ||
| 24 | - power_ISA2_05 power_ISA2_07 | ||
| 25 | + power_ISA2_07 | ||
| 26 | |||
| 27 | power_ISA2_05_CFLAGS = $(AM_CFLAGS) $(WERROR) -Winline -Wall -Wshadow -g \ | ||
| 28 | -I$(top_srcdir)/include @FLAG_M32@ | ||
| 29 | diff --git a/none/tests/ppc32/Makefile.am b/none/tests/ppc32/Makefile.am | ||
| 30 | index 196239e..0fe3425 100644 | ||
| 31 | --- a/none/tests/ppc32/Makefile.am | ||
| 32 | +++ b/none/tests/ppc32/Makefile.am | ||
| 33 | @@ -50,13 +50,13 @@ EXTRA_DIST = \ | ||
| 34 | |||
| 35 | check_PROGRAMS = \ | ||
| 36 | allexec \ | ||
| 37 | - lsw jm-insns round \ | ||
| 38 | + lsw \ | ||
| 39 | test_isa_2_06_part1 test_isa_2_06_part2 test_isa_2_06_part3 \ | ||
| 40 | test_dfp1 test_dfp2 test_dfp3 test_dfp4 test_dfp5 \ | ||
| 41 | test_isa_2_07_part1 test_isa_2_07_part2 \ | ||
| 42 | test_tm test_touch_tm ldst_multiple data-cache-instructions \ | ||
| 43 | test_fx test_gx \ | ||
| 44 | - testVMX twi tw xlc_dbl_u32 power5+_round power6_bcmp \ | ||
| 45 | + twi tw xlc_dbl_u32 power6_bcmp \ | ||
| 46 | bug129390-ppc32 bug139050-ppc32 \ | ||
| 47 | ldstrev mftocrf mcrfs | ||
| 48 | |||
| 49 | -- | ||
| 50 | 2.6.4 | ||
| 51 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-Enable-rt_sigpending-syscall-on-ppc64-linux.patch b/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-Enable-rt_sigpending-syscall-on-ppc64-linux.patch deleted file mode 100644 index 56bb5f55fe..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-Enable-rt_sigpending-syscall-on-ppc64-linux.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From 1a8006f56342dae9f7100a3c33d80873676e0404 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Li Zhou <li.zhou@windriver.com> | ||
| 3 | Date: Mon, 24 Aug 2015 03:55:18 -0400 | ||
| 4 | Subject: [PATCH] valgrind: Enable rt_sigpending syscall on ppc64 linux | ||
| 5 | |||
| 6 | New Revision: 15133 | ||
| 7 | Enable rt_sigpending syscall on ppc64 linux. | ||
| 8 | Patch from Thomas Huth <thuth@redhat.com> | ||
| 9 | |||
| 10 | Get the patch from valgrind upstream: | ||
| 11 | http://valgrind.10908.n7.nabble.com/Valgrind-r15133-in-trunk-NEWS-coregrind-m-syswrap-syswrap-ppc64-linux-c-td54589.html | ||
| 12 | |||
| 13 | Upstream-Status: backport | ||
| 14 | |||
| 15 | Signed-off-by: Li Zhou <li.zhou@windriver.com> | ||
| 16 | --- | ||
| 17 | coregrind/m_syswrap/syswrap-ppc64-linux.c | 2 +- | ||
| 18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 19 | |||
| 20 | diff --git a/coregrind/m_syswrap/syswrap-ppc64-linux.c b/coregrind/m_syswrap/syswrap-ppc64-linux.c | ||
| 21 | index 5946ee1..8aaa1d7 100644 | ||
| 22 | --- a/coregrind/m_syswrap/syswrap-ppc64-linux.c | ||
| 23 | +++ b/coregrind/m_syswrap/syswrap-ppc64-linux.c | ||
| 24 | @@ -887,7 +887,7 @@ static SyscallTableEntry syscall_table[] = { | ||
| 25 | LINXY(__NR_rt_sigaction, sys_rt_sigaction), // 173 | ||
| 26 | LINXY(__NR_rt_sigprocmask, sys_rt_sigprocmask), // 174 | ||
| 27 | |||
| 28 | -// _____(__NR_rt_sigpending, sys_rt_sigpending), // 175 | ||
| 29 | + LINXY(__NR_rt_sigpending, sys_rt_sigpending), // 175 | ||
| 30 | LINXY(__NR_rt_sigtimedwait, sys_rt_sigtimedwait), // 176 | ||
| 31 | LINXY(__NR_rt_sigqueueinfo, sys_rt_sigqueueinfo), // 177 | ||
| 32 | LINX_(__NR_rt_sigsuspend, sys_rt_sigsuspend), // 178 | ||
| 33 | -- | ||
| 34 | 1.9.1 | ||
| 35 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0002-remove-rpath.patch b/meta/recipes-devtools/valgrind/valgrind/0002-remove-rpath.patch new file mode 100644 index 0000000000..e9112da0cb --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0002-remove-rpath.patch | |||
| @@ -0,0 +1,35 @@ | |||
| 1 | From f96cf1f4eaa72860ab8b5e18ad10fdc704d78c5f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Tue, 15 Dec 2015 15:01:34 +0200 | ||
| 4 | Subject: [PATCH 2/5] remove rpath | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [embedded config] | ||
| 7 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
| 8 | --- | ||
| 9 | none/tests/Makefile.am | 3 +-- | ||
| 10 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am | ||
| 13 | index 54f2a7e..25b0f49 100644 | ||
| 14 | --- a/none/tests/Makefile.am | ||
| 15 | +++ b/none/tests/Makefile.am | ||
| 16 | @@ -326,7 +326,6 @@ threadederrno_CFLAGS += --std=c99 | ||
| 17 | endif | ||
| 18 | tls_SOURCES = tls.c tls2.c | ||
| 19 | tls_DEPENDENCIES = tls.so tls2.so | ||
| 20 | -tls_LDFLAGS = -Wl,-rpath,$(abs_top_builddir)/none/tests | ||
| 21 | tls_LDADD = tls.so tls2.so -lpthread | ||
| 22 | tls_so_SOURCES = tls_so.c | ||
| 23 | tls_so_DEPENDENCIES = tls2.so | ||
| 24 | @@ -334,7 +333,7 @@ if VGCONF_OS_IS_DARWIN | ||
| 25 | tls_so_LDFLAGS = -dynamic -dynamiclib -all_load -fpic | ||
| 26 | tls_so_LDADD = `pwd`/tls2.so | ||
| 27 | else | ||
| 28 | - tls_so_LDFLAGS = -Wl,-rpath,$(abs_top_builddir)/none/tests -shared -fPIC | ||
| 29 | + tls_so_LDFLAGS = -shared -fPIC | ||
| 30 | tls_so_LDADD = tls2.so | ||
| 31 | endif | ||
| 32 | tls_so_CFLAGS = $(AM_CFLAGS) -fPIC | ||
| 33 | -- | ||
| 34 | 2.6.2 | ||
| 35 | |||
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 new file mode 100644 index 0000000000..ed313d6444 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch | |||
| @@ -0,0 +1,175 @@ | |||
| 1 | From 38ae233b6893a4eec7f9ed6d8ad02392bca8eaed Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Tue, 15 Dec 2015 15:31:50 +0200 | ||
| 4 | Subject: [PATCH 1/2] Fix out of tree builds. | ||
| 5 | |||
| 6 | The paths to these files need to be fully specified in | ||
| 7 | the out of tree build case. glibc-2.X.supp is a generated file so the full path | ||
| 8 | is deliberately not specified in that case. | ||
| 9 | |||
| 10 | RP 2013/03/23 | ||
| 11 | |||
| 12 | Upstream-Status: Pending | ||
| 13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 14 | |||
| 15 | --- | ||
| 16 | configure.ac | 64 ++++++++++++++++++++++++++++++------------------------------ | ||
| 17 | 1 file changed, 32 insertions(+), 32 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/configure.ac b/configure.ac | ||
| 20 | index 8ab7f9b..9366dc7 100644 | ||
| 21 | --- a/configure.ac | ||
| 22 | +++ b/configure.ac | ||
| 23 | @@ -377,44 +377,44 @@ case "${host_os}" in | ||
| 24 | 9.*) | ||
| 25 | AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard]) | ||
| 26 | AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version]) | ||
| 27 | - DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}" | ||
| 28 | - DEFAULT_SUPP="darwin9-drd.supp ${DEFAULT_SUPP}" | ||
| 29 | + DEFAULT_SUPP="$srcdir/darwin9.supp ${DEFAULT_SUPP}" | ||
| 30 | + DEFAULT_SUPP="$srcdir/darwin9-drd.supp ${DEFAULT_SUPP}" | ||
| 31 | ;; | ||
| 32 | 10.*) | ||
| 33 | AC_MSG_RESULT([Darwin 10.x (${kernel}) / Mac OS X 10.6 Snow Leopard]) | ||
| 34 | AC_DEFINE([DARWIN_VERS], DARWIN_10_6, [Darwin / Mac OS X version]) | ||
| 35 | - DEFAULT_SUPP="darwin10.supp ${DEFAULT_SUPP}" | ||
| 36 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | ||
| 37 | + DEFAULT_SUPP="$srcdir/darwin10.supp ${DEFAULT_SUPP}" | ||
| 38 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | ||
| 39 | ;; | ||
| 40 | 11.*) | ||
| 41 | AC_MSG_RESULT([Darwin 11.x (${kernel}) / Mac OS X 10.7 Lion]) | ||
| 42 | AC_DEFINE([DARWIN_VERS], DARWIN_10_7, [Darwin / Mac OS X version]) | ||
| 43 | - DEFAULT_SUPP="darwin11.supp ${DEFAULT_SUPP}" | ||
| 44 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | ||
| 45 | + DEFAULT_SUPP="$srcdir/darwin11.supp ${DEFAULT_SUPP}" | ||
| 46 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | ||
| 47 | ;; | ||
| 48 | 12.*) | ||
| 49 | AC_MSG_RESULT([Darwin 12.x (${kernel}) / Mac OS X 10.8 Mountain Lion]) | ||
| 50 | AC_DEFINE([DARWIN_VERS], DARWIN_10_8, [Darwin / Mac OS X version]) | ||
| 51 | - DEFAULT_SUPP="darwin12.supp ${DEFAULT_SUPP}" | ||
| 52 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | ||
| 53 | + DEFAULT_SUPP="$srcdir/darwin12.supp ${DEFAULT_SUPP}" | ||
| 54 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | ||
| 55 | ;; | ||
| 56 | 13.*) | ||
| 57 | AC_MSG_RESULT([Darwin 13.x (${kernel}) / Mac OS X 10.9 Mavericks]) | ||
| 58 | AC_DEFINE([DARWIN_VERS], DARWIN_10_9, [Darwin / Mac OS X version]) | ||
| 59 | - DEFAULT_SUPP="darwin13.supp ${DEFAULT_SUPP}" | ||
| 60 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | ||
| 61 | + DEFAULT_SUPP="$srcdir/darwin13.supp ${DEFAULT_SUPP}" | ||
| 62 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | ||
| 63 | ;; | ||
| 64 | 14.*) | ||
| 65 | AC_MSG_RESULT([Darwin 14.x (${kernel}) / Mac OS X 10.10 Yosemite]) | ||
| 66 | AC_DEFINE([DARWIN_VERS], DARWIN_10_10, [Darwin / Mac OS X version]) | ||
| 67 | - DEFAULT_SUPP="darwin14.supp ${DEFAULT_SUPP}" | ||
| 68 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | ||
| 69 | + DEFAULT_SUPP="$srcdir/darwin14.supp ${DEFAULT_SUPP}" | ||
| 70 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | ||
| 71 | ;; | ||
| 72 | 15.*) | ||
| 73 | AC_MSG_RESULT([Darwin 15.x (${kernel}) / Mac OS X 10.11 El Capitan]) | ||
| 74 | AC_DEFINE([DARWIN_VERS], DARWIN_10_11, [Darwin / Mac OS X version]) | ||
| 75 | - DEFAULT_SUPP="darwin15.supp ${DEFAULT_SUPP}" | ||
| 76 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | ||
| 77 | + DEFAULT_SUPP="$srcdir/darwin15.supp ${DEFAULT_SUPP}" | ||
| 78 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | ||
| 79 | ;; | ||
| 80 | *) | ||
| 81 | AC_MSG_RESULT([unsupported (${kernel})]) | ||
| 82 | @@ -426,13 +426,13 @@ case "${host_os}" in | ||
| 83 | solaris2.11*) | ||
| 84 | AC_MSG_RESULT([ok (${host_os})]) | ||
| 85 | VGCONF_OS="solaris" | ||
| 86 | - DEFAULT_SUPP="solaris11.supp ${DEFAULT_SUPP}" | ||
| 87 | + DEFAULT_SUPP="$srcdir/solaris11.supp ${DEFAULT_SUPP}" | ||
| 88 | ;; | ||
| 89 | |||
| 90 | solaris2.12*) | ||
| 91 | AC_MSG_RESULT([ok (${host_os})]) | ||
| 92 | VGCONF_OS="solaris" | ||
| 93 | - DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}" | ||
| 94 | + DEFAULT_SUPP="$srcdir/solaris12.supp ${DEFAULT_SUPP}" | ||
| 95 | ;; | ||
| 96 | |||
| 97 | *) | ||
| 98 | @@ -1015,29 +1015,29 @@ AC_MSG_CHECKING([the glibc version]) | ||
| 99 | case "${GLIBC_VERSION}" in | ||
| 100 | 2.2) | ||
| 101 | AC_MSG_RESULT(${GLIBC_VERSION} family) | ||
| 102 | - DEFAULT_SUPP="glibc-2.2.supp ${DEFAULT_SUPP}" | ||
| 103 | - DEFAULT_SUPP="glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}" | ||
| 104 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 105 | + DEFAULT_SUPP="$srcdir/glibc-2.2.supp ${DEFAULT_SUPP}" | ||
| 106 | + DEFAULT_SUPP="$srcdir/glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}" | ||
| 107 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 108 | ;; | ||
| 109 | 2.[[3-6]]) | ||
| 110 | AC_MSG_RESULT(${GLIBC_VERSION} family) | ||
| 111 | - DEFAULT_SUPP="glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}" | ||
| 112 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 113 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 114 | + DEFAULT_SUPP="$srcdir/glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}" | ||
| 115 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 116 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 117 | ;; | ||
| 118 | 2.[[7-9]]) | ||
| 119 | AC_MSG_RESULT(${GLIBC_VERSION} family) | ||
| 120 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
| 121 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 122 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 123 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 124 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 125 | ;; | ||
| 126 | 2.10|2.11) | ||
| 127 | AC_MSG_RESULT(${GLIBC_VERSION} family) | ||
| 128 | AC_DEFINE([GLIBC_MANDATORY_STRLEN_REDIRECT], 1, | ||
| 129 | [Define to 1 if strlen() has been optimized heavily (amd64 glibc >= 2.10)]) | ||
| 130 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
| 131 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 132 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 133 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 134 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 135 | ;; | ||
| 136 | 2.*) | ||
| 137 | AC_MSG_RESULT(${GLIBC_VERSION} family) | ||
| 138 | @@ -1046,8 +1046,8 @@ case "${GLIBC_VERSION}" in | ||
| 139 | AC_DEFINE([GLIBC_MANDATORY_INDEX_AND_STRLEN_REDIRECT], 1, | ||
| 140 | [Define to 1 if index() and strlen() have been optimized heavily (x86 glibc >= 2.12)]) | ||
| 141 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
| 142 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 143 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 144 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 145 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 146 | ;; | ||
| 147 | darwin) | ||
| 148 | AC_MSG_RESULT(Darwin) | ||
| 149 | @@ -1057,7 +1057,7 @@ case "${GLIBC_VERSION}" in | ||
| 150 | bionic) | ||
| 151 | AC_MSG_RESULT(Bionic) | ||
| 152 | AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic]) | ||
| 153 | - DEFAULT_SUPP="bionic.supp ${DEFAULT_SUPP}" | ||
| 154 | + DEFAULT_SUPP="$srcdir/bionic.supp ${DEFAULT_SUPP}" | ||
| 155 | ;; | ||
| 156 | solaris) | ||
| 157 | AC_MSG_RESULT(Solaris) | ||
| 158 | @@ -1079,11 +1079,11 @@ if test "$VGCONF_OS" != "solaris"; then | ||
| 159 | # attempt to detect whether such libraries are installed on the | ||
| 160 | # build machine (or even if any X facilities are present); just | ||
| 161 | # add the suppressions antidisirregardless. | ||
| 162 | - DEFAULT_SUPP="xfree-4.supp ${DEFAULT_SUPP}" | ||
| 163 | - DEFAULT_SUPP="xfree-3.supp ${DEFAULT_SUPP}" | ||
| 164 | + DEFAULT_SUPP="$srcdir/xfree-4.supp ${DEFAULT_SUPP}" | ||
| 165 | + DEFAULT_SUPP="$srcdir/xfree-3.supp ${DEFAULT_SUPP}" | ||
| 166 | |||
| 167 | # Add glibc and X11 suppressions for exp-sgcheck | ||
| 168 | - DEFAULT_SUPP="exp-sgcheck.supp ${DEFAULT_SUPP}" | ||
| 169 | + DEFAULT_SUPP="$srcdir/exp-sgcheck.supp ${DEFAULT_SUPP}" | ||
| 170 | fi | ||
| 171 | |||
| 172 | |||
| 173 | -- | ||
| 174 | 2.6.2 | ||
| 175 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/add-ptest.patch b/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch index 225f84305f..f5ac989fbf 100644 --- a/meta/recipes-devtools/valgrind/valgrind/add-ptest.patch +++ b/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch | |||
| @@ -1,4 +1,7 @@ | |||
| 1 | Modify vg_test wrapper to support PTEST formats | 1 | From f49f27f1bc67d07440b0ac9a7d767a8ea1589bfe Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Tue, 15 Dec 2015 15:50:44 +0200 | ||
| 4 | Subject: [PATCH 5/5] Modify vg_test wrapper to support PTEST formats | ||
| 2 | 5 | ||
| 3 | Change the valgrind regression test script vg_regtest to | 6 | Change the valgrind regression test script vg_regtest to |
| 4 | support the yocto ptest stdout reporting format. The commit adds | 7 | support the yocto ptest stdout reporting format. The commit adds |
| @@ -15,51 +18,50 @@ Upstream-Status: Pending | |||
| 15 | 18 | ||
| 16 | Signed-off-by: Dave Lerner <dave.lerner@windriver.com> | 19 | Signed-off-by: Dave Lerner <dave.lerner@windriver.com> |
| 17 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> | 20 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> |
| 21 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 22 | --- | ||
| 23 | tests/vg_regtest.in | 75 +++++++++++++++++++++++++++++++++++++++-------------- | ||
| 24 | 1 file changed, 55 insertions(+), 20 deletions(-) | ||
| 18 | 25 | ||
| 19 | diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in | 26 | diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in |
| 20 | index 224385f..3e0383b 100755 | 27 | index a441f42..cb05b52 100755 |
| 21 | --- a/tests/vg_regtest.in | 28 | --- a/tests/vg_regtest.in |
| 22 | +++ b/tests/vg_regtest.in | 29 | +++ b/tests/vg_regtest.in |
| 23 | @@ -39,11 +39,11 @@ | 30 | @@ -47,6 +47,7 @@ |
| 24 | # --valgrind.) | 31 | # --loop-till-fail: loops on the test(s) till one fail, then exit |
| 25 | # --keep-unfiltered: keep a copy of the unfiltered output/error output | 32 | # This is useful to obtain detailed trace or --keep-unfiltered |
| 26 | # of each test by adding an extension .unfiltered.out | 33 | # output of a non deterministic test failure |
| 27 | -# | ||
| 28 | # --outer-valgrind: run this valgrind under the given outer valgrind. | ||
| 29 | # This valgrind must be configured with --enable-inner. | ||
| 30 | # --outer-tool: tool to use by the outer valgrind (default memcheck). | ||
| 31 | # --outer-args: use this as outer tool args. | ||
| 32 | +# --yocto-ptest: output in yocto ptest format | 34 | +# --yocto-ptest: output in yocto ptest format |
| 33 | # | 35 | # |
| 34 | # The easiest way is to run all tests in valgrind/ with (assuming you installed | 36 | # The easiest way is to run all tests in valgrind/ with (assuming you installed |
| 35 | # in $PREFIX): | 37 | # in $PREFIX): |
| 36 | @@ -126,7 +126,7 @@ use strict; | 38 | @@ -139,7 +140,7 @@ my $usage="\n" |
| 37 | my $usage="\n" | ||
| 38 | . "Usage:\n" | 39 | . "Usage:\n" |
| 39 | . " vg_regtest [--all, --valgrind, --valgrind-lib, --keep-unfiltered\n" | 40 | . " vg_regtest [--all, --valgrind, --valgrind-lib, --keep-unfiltered\n" |
| 40 | - . " --outer-valgrind, --outer-tool, --outer-args]\n" | 41 | . " --outer-valgrind, --outer-tool, --outer-args\n" |
| 41 | + . " --outer-valgrind, --outer-tool, --outer-args, --yocto-ptest]\n" | 42 | - . " --loop-till-fail]\n" |
| 43 | + . " --loop-till-fail, --yocto-ptest]\n" | ||
| 42 | . " Use EXTRA_REGTEST_OPTS to supply extra args for all tests\n" | 44 | . " Use EXTRA_REGTEST_OPTS to supply extra args for all tests\n" |
| 43 | . "\n"; | 45 | . "\n"; |
| 44 | 46 | ||
| 45 | @@ -170,6 +170,7 @@ my $outer_args; | 47 | @@ -186,6 +187,7 @@ my $outer_args; |
| 46 | |||
| 47 | my $valgrind_lib = "$tests_dir/.in_place"; | 48 | my $valgrind_lib = "$tests_dir/.in_place"; |
| 48 | my $keepunfiltered = 0; | 49 | my $keepunfiltered = 0; |
| 50 | my $looptillfail = 0; | ||
| 49 | +my $yoctoptest = 0; | 51 | +my $yoctoptest = 0; |
| 50 | 52 | ||
| 51 | # default filter is the one named "filter_stderr" in the test's directory | 53 | # default filter is the one named "filter_stderr" in the test's directory |
| 52 | my $default_stderr_filter = "filter_stderr"; | 54 | my $default_stderr_filter = "filter_stderr"; |
| 53 | @@ -226,6 +227,8 @@ sub process_command_line() | 55 | @@ -244,6 +246,8 @@ sub process_command_line() |
| 54 | $valgrind_lib = $1; | ||
| 55 | } elsif ($arg =~ /^--keep-unfiltered$/) { | ||
| 56 | $keepunfiltered = 1; | 56 | $keepunfiltered = 1; |
| 57 | } elsif ($arg =~ /^--loop-till-fail$/) { | ||
| 58 | $looptillfail = 1; | ||
| 57 | + } elsif ($arg =~ /^--yocto-ptest$/) { | 59 | + } elsif ($arg =~ /^--yocto-ptest$/) { |
| 58 | + $yoctoptest = 1; | 60 | + $yoctoptest = 1; |
| 59 | } else { | 61 | } else { |
| 60 | die $usage; | 62 | die $usage; |
| 61 | } | 63 | } |
| 62 | @@ -340,13 +343,28 @@ sub read_vgtest_file($) | 64 | @@ -365,13 +369,28 @@ sub read_vgtest_file($) |
| 63 | #---------------------------------------------------------------------------- | 65 | #---------------------------------------------------------------------------- |
| 64 | # Since most of the program time is spent in system() calls, need this to | 66 | # Since most of the program time is spent in system() calls, need this to |
| 65 | # propagate a Ctrl-C enabling us to quit. | 67 | # propagate a Ctrl-C enabling us to quit. |
| @@ -93,12 +95,12 @@ index 224385f..3e0383b 100755 | |||
| 93 | # if $keepunfiltered, copies $1 to $1.unfiltered.out | 95 | # if $keepunfiltered, copies $1 to $1.unfiltered.out |
| 94 | # renames $0 tp $1 | 96 | # renames $0 tp $1 |
| 95 | sub filtered_rename($$) | 97 | sub filtered_rename($$) |
| 96 | @@ -394,19 +412,21 @@ sub do_diffs($$$$) | 98 | @@ -419,23 +438,25 @@ sub do_diffs($$$$) |
| 97 | # A match; remove .out and any previously created .diff files. | 99 | # A match; remove .out and any previously created .diff files. |
| 98 | unlink("$name.$mid.out"); | 100 | unlink("$name.$mid.out"); |
| 99 | unlink(<$name.$mid.diff*>); | 101 | unlink(<$name.$mid.diff*>); |
| 100 | - return; | 102 | - return; |
| 101 | + return 0; | 103 | + return 1; |
| 102 | } | 104 | } |
| 103 | } | 105 | } |
| 104 | } | 106 | } |
| @@ -107,7 +109,11 @@ index 224385f..3e0383b 100755 | |||
| 107 | + print "*** $name failed ($mid) ***\n" if ($yoctoptest == 0) ; | 109 | + print "*** $name failed ($mid) ***\n" if ($yoctoptest == 0) ; |
| 108 | push(@failures, sprintf("%-40s ($mid)", "$fullname")); | 110 | push(@failures, sprintf("%-40s ($mid)", "$fullname")); |
| 109 | $num_failures{$mid}++; | 111 | $num_failures{$mid}++; |
| 110 | + return 1; | 112 | if ($looptillfail == 1) { |
| 113 | print "Failure encountered, stopping to loop\n"; | ||
| 114 | exit 1 | ||
| 115 | } | ||
| 116 | + return 0; | ||
| 111 | } | 117 | } |
| 112 | 118 | ||
| 113 | sub do_one_test($$) | 119 | sub do_one_test($$) |
| @@ -117,7 +123,7 @@ index 224385f..3e0383b 100755 | |||
| 117 | $vgtest =~ /^(.*)\.vgtest/; | 123 | $vgtest =~ /^(.*)\.vgtest/; |
| 118 | my $name = $1; | 124 | my $name = $1; |
| 119 | my $fullname = "$dir/$name"; | 125 | my $fullname = "$dir/$name"; |
| 120 | @@ -425,7 +445,11 @@ sub do_one_test($$) | 126 | @@ -454,7 +475,11 @@ sub do_one_test($$) |
| 121 | } elsif (256 == $prereq_res) { | 127 | } elsif (256 == $prereq_res) { |
| 122 | # Nb: weird Perl-ism -- exit code of '1' is seen by Perl as 256... | 128 | # Nb: weird Perl-ism -- exit code of '1' is seen by Perl as 256... |
| 123 | # Prereq failed, skip. | 129 | # Prereq failed, skip. |
| @@ -130,8 +136,8 @@ index 224385f..3e0383b 100755 | |||
| 130 | return; | 136 | return; |
| 131 | } else { | 137 | } else { |
| 132 | # Bad prereq; abort. | 138 | # Bad prereq; abort. |
| 133 | @@ -438,7 +462,7 @@ sub do_one_test($$) | 139 | @@ -472,7 +497,7 @@ sub do_one_test($$) |
| 134 | if (defined $progB) { | 140 | } |
| 135 | # If there is a progB, let's start it in background: | 141 | # If there is a progB, let's start it in background: |
| 136 | printf("%-16s valgrind $extraopts $vgopts $prog $args (progB: $progB $argsB)\n", | 142 | printf("%-16s valgrind $extraopts $vgopts $prog $args (progB: $progB $argsB)\n", |
| 137 | - "$name:"); | 143 | - "$name:"); |
| @@ -139,7 +145,7 @@ index 224385f..3e0383b 100755 | |||
| 139 | # progB.done used to detect child has finished. See below. | 145 | # progB.done used to detect child has finished. See below. |
| 140 | # Note: redirection of stdout and stderr is before $progB to allow argsB | 146 | # Note: redirection of stdout and stderr is before $progB to allow argsB |
| 141 | # to e.g. redirect stdoutB to stderrB | 147 | # to e.g. redirect stdoutB to stderrB |
| 142 | @@ -452,7 +476,8 @@ sub do_one_test($$) | 148 | @@ -488,7 +513,8 @@ sub do_one_test($$) |
| 143 | . "touch progB.done) &"); | 149 | . "touch progB.done) &"); |
| 144 | } | 150 | } |
| 145 | } else { | 151 | } else { |
| @@ -147,9 +153,9 @@ index 224385f..3e0383b 100755 | |||
| 147 | + printf("%-16s valgrind $extraopts $vgopts $prog $args\n", "$name:") | 153 | + printf("%-16s valgrind $extraopts $vgopts $prog $args\n", "$name:") |
| 148 | + if ($yoctoptest == 0); | 154 | + if ($yoctoptest == 0); |
| 149 | } | 155 | } |
| 150 | 156 | ||
| 151 | # Pass the appropriate --tool option for the directory (can be overridden | 157 | # Collect environment variables, if any. |
| 152 | @@ -487,7 +512,7 @@ sub do_one_test($$) | 158 | @@ -529,7 +555,7 @@ sub do_one_test($$) |
| 153 | # Find all the .stdout.exp files. If none, use /dev/null. | 159 | # Find all the .stdout.exp files. If none, use /dev/null. |
| 154 | my @stdout_exps = <$name.stdout.exp*>; | 160 | my @stdout_exps = <$name.stdout.exp*>; |
| 155 | @stdout_exps = ( "/dev/null" ) if (0 == scalar @stdout_exps); | 161 | @stdout_exps = ( "/dev/null" ) if (0 == scalar @stdout_exps); |
| @@ -158,7 +164,7 @@ index 224385f..3e0383b 100755 | |||
| 158 | 164 | ||
| 159 | # Filter stderr | 165 | # Filter stderr |
| 160 | $stderr_filter_args = $name if (! defined $stderr_filter_args); | 166 | $stderr_filter_args = $name if (! defined $stderr_filter_args); |
| 161 | @@ -496,7 +521,7 @@ sub do_one_test($$) | 167 | @@ -538,7 +564,7 @@ sub do_one_test($$) |
| 162 | # Find all the .stderr.exp files. At least one must exist. | 168 | # Find all the .stderr.exp files. At least one must exist. |
| 163 | my @stderr_exps = <$name.stderr.exp*>; | 169 | my @stderr_exps = <$name.stderr.exp*>; |
| 164 | (0 != scalar @stderr_exps) or die "Could not find `$name.stderr.exp*'\n"; | 170 | (0 != scalar @stderr_exps) or die "Could not find `$name.stderr.exp*'\n"; |
| @@ -167,7 +173,7 @@ index 224385f..3e0383b 100755 | |||
| 167 | 173 | ||
| 168 | if (defined $progB) { | 174 | if (defined $progB) { |
| 169 | # wait for the child to be finished | 175 | # wait for the child to be finished |
| 170 | @@ -520,7 +545,7 @@ sub do_one_test($$) | 176 | @@ -562,7 +588,7 @@ sub do_one_test($$) |
| 171 | # Find all the .stdoutB.exp files. If none, use /dev/null. | 177 | # Find all the .stdoutB.exp files. If none, use /dev/null. |
| 172 | my @stdoutB_exps = <$name.stdoutB.exp*>; | 178 | my @stdoutB_exps = <$name.stdoutB.exp*>; |
| 173 | @stdoutB_exps = ( "/dev/null" ) if (0 == scalar @stdoutB_exps); | 179 | @stdoutB_exps = ( "/dev/null" ) if (0 == scalar @stdoutB_exps); |
| @@ -176,7 +182,7 @@ index 224385f..3e0383b 100755 | |||
| 176 | 182 | ||
| 177 | # Filter stderr | 183 | # Filter stderr |
| 178 | $stderrB_filter_args = $name if (! defined $stderrB_filter_args); | 184 | $stderrB_filter_args = $name if (! defined $stderrB_filter_args); |
| 179 | @@ -529,7 +554,7 @@ sub do_one_test($$) | 185 | @@ -571,7 +597,7 @@ sub do_one_test($$) |
| 180 | # Find all the .stderrB.exp files. At least one must exist. | 186 | # Find all the .stderrB.exp files. At least one must exist. |
| 181 | my @stderrB_exps = <$name.stderrB.exp*>; | 187 | my @stderrB_exps = <$name.stderrB.exp*>; |
| 182 | (0 != scalar @stderrB_exps) or die "Could not find `$name.stderrB.exp*'\n"; | 188 | (0 != scalar @stderrB_exps) or die "Could not find `$name.stderrB.exp*'\n"; |
| @@ -185,7 +191,7 @@ index 224385f..3e0383b 100755 | |||
| 185 | } | 191 | } |
| 186 | 192 | ||
| 187 | # Maybe do post-test check | 193 | # Maybe do post-test check |
| 188 | @@ -541,7 +566,7 @@ sub do_one_test($$) | 194 | @@ -583,7 +609,7 @@ sub do_one_test($$) |
| 189 | # Find all the .post.exp files. If none, use /dev/null. | 195 | # Find all the .post.exp files. If none, use /dev/null. |
| 190 | my @post_exps = <$name.post.exp*>; | 196 | my @post_exps = <$name.post.exp*>; |
| 191 | @post_exps = ( "/dev/null" ) if (0 == scalar @post_exps); | 197 | @post_exps = ( "/dev/null" ) if (0 == scalar @post_exps); |
| @@ -194,7 +200,7 @@ index 224385f..3e0383b 100755 | |||
| 194 | } | 200 | } |
| 195 | } | 201 | } |
| 196 | 202 | ||
| 197 | @@ -550,6 +575,13 @@ sub do_one_test($$) | 203 | @@ -592,6 +618,13 @@ sub do_one_test($$) |
| 198 | print("(cleanup operation failed: $cleanup)\n"); | 204 | print("(cleanup operation failed: $cleanup)\n"); |
| 199 | } | 205 | } |
| 200 | 206 | ||
| @@ -208,7 +214,7 @@ index 224385f..3e0383b 100755 | |||
| 208 | $num_tests_done++; | 214 | $num_tests_done++; |
| 209 | } | 215 | } |
| 210 | 216 | ||
| 211 | @@ -589,7 +621,7 @@ sub test_one_dir($$) | 217 | @@ -631,7 +664,7 @@ sub test_one_dir($$) |
| 212 | my $found_tests = (0 != (grep { $_ =~ /\.vgtest$/ } @fs)); | 218 | my $found_tests = (0 != (grep { $_ =~ /\.vgtest$/ } @fs)); |
| 213 | 219 | ||
| 214 | if ($found_tests) { | 220 | if ($found_tests) { |
| @@ -217,7 +223,7 @@ index 224385f..3e0383b 100755 | |||
| 217 | } | 223 | } |
| 218 | foreach my $f (@fs) { | 224 | foreach my $f (@fs) { |
| 219 | if (-d $f) { | 225 | if (-d $f) { |
| 220 | @@ -599,7 +631,7 @@ sub test_one_dir($$) | 226 | @@ -641,7 +674,7 @@ sub test_one_dir($$) |
| 221 | } | 227 | } |
| 222 | } | 228 | } |
| 223 | if ($found_tests) { | 229 | if ($found_tests) { |
| @@ -226,7 +232,7 @@ index 224385f..3e0383b 100755 | |||
| 226 | } | 232 | } |
| 227 | 233 | ||
| 228 | chdir(".."); | 234 | chdir(".."); |
| 229 | @@ -625,10 +657,12 @@ sub summarise_results | 235 | @@ -667,10 +700,12 @@ sub summarise_results |
| 230 | $num_failures{"stdout"}, plural($num_failures{"stdout"}), | 236 | $num_failures{"stdout"}, plural($num_failures{"stdout"}), |
| 231 | $num_failures{"stderrB"}, plural($num_failures{"stderrB"}), | 237 | $num_failures{"stderrB"}, plural($num_failures{"stderrB"}), |
| 232 | $num_failures{"stdoutB"}, plural($num_failures{"stdoutB"}), | 238 | $num_failures{"stdoutB"}, plural($num_failures{"stdoutB"}), |
| @@ -241,3 +247,6 @@ index 224385f..3e0383b 100755 | |||
| 241 | } | 247 | } |
| 242 | print "\n"; | 248 | print "\n"; |
| 243 | } | 249 | } |
| 250 | -- | ||
| 251 | 2.6.2 | ||
| 252 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/enable.building.on.4.x.kernel.patch b/meta/recipes-devtools/valgrind/valgrind/enable.building.on.4.x.kernel.patch deleted file mode 100644 index 300f2f19fa..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/enable.building.on.4.x.kernel.patch +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | Enable building valgrind on host with 4.x kernel. | ||
| 2 | |||
| 3 | For OpenEmbedded builds we should be checking something like | ||
| 4 | OLDEST_KERNEL instead of `uname -r`, but this is good enough for now. | ||
| 5 | |||
| 6 | Building on 4.x* currently fails with: | ||
| 7 | configure:5556: checking for the kernel version | ||
| 8 | configure:5579: result: unsupported (4.0.0-rc3-00111-gaffb817) | ||
| 9 | configure:5581: error: Valgrind works on kernels 2.4, 2.6 | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 13 | |||
| 14 | --- valgrind-3.9.0/configure.ac.orig 2015-03-13 19:17:01.247310868 +0100 | ||
| 15 | +++ valgrind-3.9.0/configure.ac 2015-03-13 19:19:27.388316108 +0100 | ||
| 16 | @@ -276,9 +276,9 @@ | ||
| 17 | kernel=`uname -r` | ||
| 18 | |||
| 19 | case "${kernel}" in | ||
| 20 | - 2.6.*|3.*) | ||
| 21 | - AC_MSG_RESULT([2.6.x/3.x family (${kernel})]) | ||
| 22 | - AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x]) | ||
| 23 | + 2.6.*|3.*|4.*) | ||
| 24 | + AC_MSG_RESULT([2.6.x/3.x/4.x family (${kernel})]) | ||
| 25 | + AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x or Linux 4.x]) | ||
| 26 | ;; | ||
| 27 | |||
| 28 | 2.4.*) | ||
| 29 | @@ -288,7 +288,7 @@ | ||
| 30 | |||
| 31 | *) | ||
| 32 | AC_MSG_RESULT([unsupported (${kernel})]) | ||
| 33 | - AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6]) | ||
| 34 | + AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6, 3.x, 4.x]) | ||
| 35 | ;; | ||
| 36 | esac | ||
| 37 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/force-nostabs.patch b/meta/recipes-devtools/valgrind/valgrind/force-nostabs.patch deleted file mode 100644 index 849dfc50f9..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/force-nostabs.patch +++ /dev/null | |||
| @@ -1,42 +0,0 @@ | |||
| 1 | Suppress building ptest apps with the -gstabs option | ||
| 2 | |||
| 3 | Force the configure tests for -gstabs compiler support to fail so that | ||
| 4 | the regression tests don't try to build with the -gstabs option. | ||
| 5 | Otherwise, the valgrind build when ptest is enabled fails with the | ||
| 6 | error: | ||
| 7 | Stabs debuginfo not supported: | ||
| 8 | ../package/usr/lib/valgrind/ptest/memcheck/tests/deep_templates | ||
| 9 | ERROR: Function failed: split_and_strip_files | ||
| 10 | |||
| 11 | Upstream-Status: Inappropriate [gstabs support is appropriate upstream, | ||
| 12 | but not for this distro] | ||
| 13 | |||
| 14 | Signed-off-by: Dave Lerner <dave.lerner@windriver.com> | ||
| 15 | |||
| 16 | diff --git a/configure.ac b/configure.ac | ||
| 17 | index 755dfb9..cc8b5e1 100644 | ||
| 18 | --- a/configure.ac | ||
| 19 | +++ b/configure.ac | ||
| 20 | @@ -1743,22 +1743,7 @@ AM_CONDITIONAL(DWARF4, test x$ac_have_dwarf4 = xyes) | ||
| 21 | CFLAGS=$safe_CFLAGS | ||
| 22 | |||
| 23 | |||
| 24 | -# does this compiler support -gstabs ? | ||
| 25 | - | ||
| 26 | -AC_MSG_CHECKING([if gcc accepts -gstabs]) | ||
| 27 | - | ||
| 28 | -safe_CFLAGS=$CFLAGS | ||
| 29 | -CFLAGS="-gstabs" | ||
| 30 | -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ | ||
| 31 | - return 0; | ||
| 32 | -]])], [ | ||
| 33 | -ac_have_gstabs=yes | ||
| 34 | -AC_MSG_RESULT([yes]) | ||
| 35 | -], [ | ||
| 36 | ac_have_gstabs=no | ||
| 37 | -AC_MSG_RESULT([no]) | ||
| 38 | -]) | ||
| 39 | -CFLAGS=$safe_CFLAGS | ||
| 40 | AM_CONDITIONAL([HAVE_GSTABS], [test x$ac_have_gstabs = xyes]) | ||
| 41 | |||
| 42 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/glibc.patch b/meta/recipes-devtools/valgrind/valgrind/glibc.patch deleted file mode 100644 index 863499d69d..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/glibc.patch +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | Backport of glibc 2.19 and 2.20 and 2.21 support. | ||
| 2 | |||
| 3 | Upstream-Status: Backport | ||
| 4 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
| 5 | |||
| 6 | Index: valgrind-3.10.1/configure.ac | ||
| 7 | =================================================================== | ||
| 8 | --- valgrind-3.10.1.orig/configure.ac | ||
| 9 | +++ valgrind-3.10.1/configure.ac | ||
| 10 | @@ -1018,6 +1018,34 @@ case "${GLIBC_VERSION}" in | ||
| 11 | DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 12 | DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 13 | ;; | ||
| 14 | + 2.19) | ||
| 15 | + AC_MSG_RESULT(2.19 family) | ||
| 16 | + AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x]) | ||
| 17 | + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
| 18 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 19 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 20 | + ;; | ||
| 21 | + 2.20) | ||
| 22 | + AC_MSG_RESULT(2.20 family) | ||
| 23 | + AC_DEFINE([GLIBC_2_20], 1, [Define to 1 if you're using glibc 2.20.x]) | ||
| 24 | + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
| 25 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 26 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 27 | + ;; | ||
| 28 | + 2.21) | ||
| 29 | + AC_MSG_RESULT(2.21 family) | ||
| 30 | + AC_DEFINE([GLIBC_2_21], 1, [Define to 1 if you're using glibc 2.21.x]) | ||
| 31 | + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
| 32 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 33 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 34 | + ;; | ||
| 35 | + 2.22) | ||
| 36 | + AC_MSG_RESULT(2.22 family) | ||
| 37 | + AC_DEFINE([GLIBC_2_22], 1, [Define to 1 if you're using glibc 2.22.x]) | ||
| 38 | + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
| 39 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 40 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 41 | + ;; | ||
| 42 | darwin) | ||
| 43 | AC_MSG_RESULT(Darwin) | ||
| 44 | AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind/pass-maltivec-only-if-it-supported.patch b/meta/recipes-devtools/valgrind/valgrind/pass-maltivec-only-if-it-supported.patch deleted file mode 100644 index f8167cb2f0..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/pass-maltivec-only-if-it-supported.patch +++ /dev/null | |||
| @@ -1,68 +0,0 @@ | |||
| 1 | Upstream-Status: Backport | ||
| 2 | |||
| 3 | r14566 | florian | 2014-09-24 17:02:54 -0500 (Wed, 24 Sep 2014) | 4 lines | ||
| 4 | |||
| 5 | The testbuckets none/tests/ppc{32,64} did not build in case the | ||
| 6 | toolchain did not support -maltivec -mabi=altivec. | ||
| 7 | This should work now. Fixes BZ #338731 | ||
| 8 | |||
| 9 | Index: none/tests/ppc32/Makefile.am | ||
| 10 | =================================================================== | ||
| 11 | --- a/none/tests/ppc32/Makefile.am (revision 14565) | ||
| 12 | +++ b/none/tests/ppc32/Makefile.am (revision 14566) | ||
| 13 | @@ -72,8 +72,12 @@ | ||
| 14 | allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@ | ||
| 15 | |||
| 16 | if HAS_ALTIVEC | ||
| 17 | +BUILD_FLAG_ALTIVEC = -maltivec | ||
| 18 | +BUILD_FLAG_ABI_ALTIVEC = -mabi=altivec | ||
| 19 | ALTIVEC_FLAG = -DHAS_ALTIVEC | ||
| 20 | else | ||
| 21 | +BUILD_FLAG_ALTIVEC = | ||
| 22 | +BUILD_FLAG_ABI_ALTIVEC = | ||
| 23 | ALTIVEC_FLAG = | ||
| 24 | endif | ||
| 25 | |||
| 26 | @@ -101,11 +105,12 @@ | ||
| 27 | ISA_2_07_FLAG = | ||
| 28 | endif | ||
| 29 | |||
| 30 | -jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames -maltivec \ | ||
| 31 | - @FLAG_M32@ $(ALTIVEC_FLAG) | ||
| 32 | +jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames \ | ||
| 33 | + @FLAG_M32@ $(ALTIVEC_FLAG) $(BUILD_FLAG_ALTIVEC) | ||
| 34 | |||
| 35 | -testVMX_CFLAGS = $(AM_CFLAGS) -O -g -Wall -maltivec -mabi=altivec -DALTIVEC \ | ||
| 36 | - -DGCC_COMPILER @FLAG_M32@ | ||
| 37 | +testVMX_CFLAGS = $(AM_CFLAGS) -O -g -Wall -DALTIVEC \ | ||
| 38 | + -DGCC_COMPILER @FLAG_M32@ $(BUILD_FLAG_ALTIVEC) \ | ||
| 39 | + $(BUILD_FLAG_ABI_ALTIVEC) | ||
| 40 | |||
| 41 | test_isa_2_06_part1_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames $(VSX_FLAG) \ | ||
| 42 | @FLAG_M32@ $(ALTIVEC_FLAG) $(BUILD_FLAG_VSX) | ||
| 43 | Index: none/tests/ppc64/Makefile.am | ||
| 44 | =================================================================== | ||
| 45 | --- a/none/tests/ppc64/Makefile.am (revision 14565) | ||
| 46 | +++ b/none/tests/ppc64/Makefile.am (revision 14566) | ||
| 47 | @@ -50,8 +50,10 @@ | ||
| 48 | allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@ | ||
| 49 | |||
| 50 | if HAS_ALTIVEC | ||
| 51 | +BUILD_FLAG_ALTIVEC = -maltivec | ||
| 52 | ALTIVEC_FLAG = -DHAS_ALTIVEC | ||
| 53 | else | ||
| 54 | +BUILD_FLAG_ALTIVEC = | ||
| 55 | ALTIVEC_FLAG = | ||
| 56 | endif | ||
| 57 | |||
| 58 | @@ -88,8 +90,8 @@ | ||
| 59 | test_isa_2_06_part3_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames $(VSX_FLAG) \ | ||
| 60 | @FLAG_M64@ $(ALTIVEC_FLAG) $(BUILD_FLAG_VSX) | ||
| 61 | |||
| 62 | -jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames -maltivec \ | ||
| 63 | - @FLAG_M64@ $(ALTIVEC_FLAG) | ||
| 64 | +jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames \ | ||
| 65 | + @FLAG_M64@ $(ALTIVEC_FLAG) $(BUILD_FLAG_ALTIVEC) | ||
| 66 | |||
| 67 | test_dfp1_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames $(DFP_FLAG) \ | ||
| 68 | @FLAG_M64@ $(BUILD_FLAGS_DFP) | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind/remove-ppc-tests-failing-build.patch b/meta/recipes-devtools/valgrind/valgrind/remove-ppc-tests-failing-build.patch deleted file mode 100644 index 1c640ffb71..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/remove-ppc-tests-failing-build.patch +++ /dev/null | |||
| @@ -1,75 +0,0 @@ | |||
| 1 | Remove test apps not building with ppc and PTEST | ||
| 2 | |||
| 3 | For mpc8316-rdb in none/tests/ppc32, the oe compiler options are | ||
| 4 | inconsistent with the imposed test compiler options generating errors | ||
| 5 | as follows: | ||
| 6 | test_isa_2_07_part1 | ||
| 7 | test_isa_2_07_part2 | ||
| 8 | test_tm | ||
| 9 | test_touch_tm | ||
| 10 | : unrecognized command line option '-mhtm' | ||
| 11 | |||
| 12 | jm-insns | ||
| 13 | testVMX | ||
| 14 | : AltiVec not supported in this target | ||
| 15 | |||
| 16 | For the following tests, their inline assembler is inconsistent with | ||
| 17 | the ppce300c3 variant: | ||
| 18 | round.c:393 | ||
| 19 | power5+_round.c:98 | ||
| 20 | : impossible constraint in 'asm' | ||
| 21 | |||
| 22 | For the following tests, with both mpc8316-rdb and with qemuppc bsp, | ||
| 23 | the inline assember is inconsistent with the oe compiler machine | ||
| 24 | tuning: | ||
| 25 | In memcheck/tests/ppc32 | ||
| 26 | power_ISA2_05.c:56 | ||
| 27 | In none/tests/ppc32 | ||
| 28 | test_dfp1.c:85 | ||
| 29 | test_dfp2.c:160 | ||
| 30 | test_dfp3.c:157 | ||
| 31 | test_dfp4.c:73 | ||
| 32 | test_dfp5.c:73 | ||
| 33 | : impossible constraint in 'asm' | ||
| 34 | |||
| 35 | Upstream-Status: Pending | ||
| 36 | |||
| 37 | Signed-off-by: Dave Lerner <dave.lerner@windriver.com> | ||
| 38 | |||
| 39 | Index: valgrind-3.10.0/memcheck/tests/ppc32/Makefile.am | ||
| 40 | =================================================================== | ||
| 41 | --- valgrind-3.10.0.orig/memcheck/tests/ppc32/Makefile.am | ||
| 42 | +++ valgrind-3.10.0/memcheck/tests/ppc32/Makefile.am | ||
| 43 | @@ -7,8 +7,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ | ||
| 44 | power_ISA2_05.stderr.exp power_ISA2_05.stdout.exp power_ISA2_05.vgtest \ | ||
| 45 | power_ISA2_05.stdout.exp_Without_FPPO | ||
| 46 | |||
| 47 | -check_PROGRAMS = \ | ||
| 48 | - power_ISA2_05 | ||
| 49 | +check_PROGRAMS = | ||
| 50 | |||
| 51 | power_ISA2_05_CFLAGS = $(AM_CFLAGS) $(WERROR) -Winline -Wall -Wshadow -g \ | ||
| 52 | -I$(top_srcdir)/include @FLAG_M32@ | ||
| 53 | Index: valgrind-3.10.0/none/tests/ppc32/Makefile.am | ||
| 54 | =================================================================== | ||
| 55 | --- valgrind-3.10.0.orig/none/tests/ppc32/Makefile.am | ||
| 56 | +++ valgrind-3.10.0/none/tests/ppc32/Makefile.am | ||
| 57 | @@ -52,16 +52,8 @@ check_PROGRAMS = \ | ||
| 58 | allexec \ | ||
| 59 | bug129390-ppc32 \ | ||
| 60 | bug139050-ppc32 \ | ||
| 61 | - ldstrev lsw jm-insns mftocrf mcrfs round test_fx test_gx \ | ||
| 62 | - testVMX twi tw xlc_dbl_u32 power5+_round power6_bcmp \ | ||
| 63 | - test_isa_2_06_part1 \ | ||
| 64 | - test_isa_2_06_part2 \ | ||
| 65 | - test_isa_2_06_part3 \ | ||
| 66 | - test_dfp1 test_dfp2 test_dfp3 test_dfp4 test_dfp5 \ | ||
| 67 | - test_isa_2_07_part1 \ | ||
| 68 | - test_isa_2_07_part2 \ | ||
| 69 | - test_tm \ | ||
| 70 | - test_touch_tm \ | ||
| 71 | + ldstrev lsw mftocrf mcrfs test_fx test_gx \ | ||
| 72 | + twi tw xlc_dbl_u32 power6_bcmp \ | ||
| 73 | ldst_multiple \ | ||
| 74 | data-cache-instructions | ||
| 75 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/sepbuildfix.patch b/meta/recipes-devtools/valgrind/valgrind/sepbuildfix.patch deleted file mode 100644 index 5db0ef8a3f..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/sepbuildfix.patch +++ /dev/null | |||
| @@ -1,235 +0,0 @@ | |||
| 1 | Fix out of tree builds. The paths to these files need to be fully specified in | ||
| 2 | the out of tree build case. glibc-2.X.supp is a generated file so the full path | ||
| 3 | is deliberately not specified in that case. | ||
| 4 | |||
| 5 | RP 2013/03/23 | ||
| 6 | |||
| 7 | Upstream-Status: Pending | ||
| 8 | |||
| 9 | Index: valgrind-3.9.0/configure.ac | ||
| 10 | =================================================================== | ||
| 11 | --- valgrind-3.9.0.orig/configure.ac | ||
| 12 | +++ valgrind-3.9.0/configure.ac | ||
| 13 | @@ -325,26 +325,26 @@ case "${host_os}" in | ||
| 14 | 9.*) | ||
| 15 | AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard]) | ||
| 16 | AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version]) | ||
| 17 | - DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}" | ||
| 18 | - DEFAULT_SUPP="darwin9-drd.supp ${DEFAULT_SUPP}" | ||
| 19 | + DEFAULT_SUPP="$srcdir/darwin9.supp ${DEFAULT_SUPP}" | ||
| 20 | + DEFAULT_SUPP="$srcdir/darwin9-drd.supp ${DEFAULT_SUPP}" | ||
| 21 | ;; | ||
| 22 | 10.*) | ||
| 23 | AC_MSG_RESULT([Darwin 10.x (${kernel}) / Mac OS X 10.6 Snow Leopard]) | ||
| 24 | AC_DEFINE([DARWIN_VERS], DARWIN_10_6, [Darwin / Mac OS X version]) | ||
| 25 | - DEFAULT_SUPP="darwin10.supp ${DEFAULT_SUPP}" | ||
| 26 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | ||
| 27 | + DEFAULT_SUPP="$srcdir/darwin10.supp ${DEFAULT_SUPP}" | ||
| 28 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | ||
| 29 | ;; | ||
| 30 | 11.*) | ||
| 31 | AC_MSG_RESULT([Darwin 11.x (${kernel}) / Mac OS X 10.7 Lion]) | ||
| 32 | AC_DEFINE([DARWIN_VERS], DARWIN_10_7, [Darwin / Mac OS X version]) | ||
| 33 | - DEFAULT_SUPP="darwin11.supp ${DEFAULT_SUPP}" | ||
| 34 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | ||
| 35 | + DEFAULT_SUPP="$srcdir/darwin11.supp ${DEFAULT_SUPP}" | ||
| 36 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | ||
| 37 | ;; | ||
| 38 | 12.*) | ||
| 39 | AC_MSG_RESULT([Darwin 12.x (${kernel}) / Mac OS X 10.8 Mountain Lion]) | ||
| 40 | AC_DEFINE([DARWIN_VERS], DARWIN_10_8, [Darwin / Mac OS X version]) | ||
| 41 | - DEFAULT_SUPP="darwin12.supp ${DEFAULT_SUPP}" | ||
| 42 | - DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" | ||
| 43 | + DEFAULT_SUPP="$srcdir/darwin12.supp ${DEFAULT_SUPP}" | ||
| 44 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | ||
| 45 | ;; | ||
| 46 | *) | ||
| 47 | AC_MSG_RESULT([unsupported (${kernel})]) | ||
| 48 | @@ -799,124 +799,124 @@ case "${GLIBC_VERSION}" in | ||
| 49 | 2.2) | ||
| 50 | AC_MSG_RESULT(2.2 family) | ||
| 51 | AC_DEFINE([GLIBC_2_2], 1, [Define to 1 if you're using glibc 2.2.x]) | ||
| 52 | - DEFAULT_SUPP="glibc-2.2.supp ${DEFAULT_SUPP}" | ||
| 53 | - DEFAULT_SUPP="glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}" | ||
| 54 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 55 | + DEFAULT_SUPP="$srcdir/glibc-2.2.supp ${DEFAULT_SUPP}" | ||
| 56 | + DEFAULT_SUPP="$srcdir/glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}" | ||
| 57 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 58 | ;; | ||
| 59 | |||
| 60 | 2.3) | ||
| 61 | AC_MSG_RESULT(2.3 family) | ||
| 62 | AC_DEFINE([GLIBC_2_3], 1, [Define to 1 if you're using glibc 2.3.x]) | ||
| 63 | - DEFAULT_SUPP="glibc-2.3.supp ${DEFAULT_SUPP}" | ||
| 64 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 65 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 66 | + DEFAULT_SUPP="$srcdir/glibc-2.3.supp ${DEFAULT_SUPP}" | ||
| 67 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 68 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 69 | ;; | ||
| 70 | |||
| 71 | 2.4) | ||
| 72 | AC_MSG_RESULT(2.4 family) | ||
| 73 | AC_DEFINE([GLIBC_2_4], 1, [Define to 1 if you're using glibc 2.4.x]) | ||
| 74 | - DEFAULT_SUPP="glibc-2.4.supp ${DEFAULT_SUPP}" | ||
| 75 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 76 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 77 | + DEFAULT_SUPP="$srcdir/glibc-2.4.supp ${DEFAULT_SUPP}" | ||
| 78 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 79 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 80 | ;; | ||
| 81 | |||
| 82 | 2.5) | ||
| 83 | AC_MSG_RESULT(2.5 family) | ||
| 84 | AC_DEFINE([GLIBC_2_5], 1, [Define to 1 if you're using glibc 2.5.x]) | ||
| 85 | - DEFAULT_SUPP="glibc-2.5.supp ${DEFAULT_SUPP}" | ||
| 86 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 87 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 88 | + DEFAULT_SUPP="$srcdir/glibc-2.5.supp ${DEFAULT_SUPP}" | ||
| 89 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 90 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 91 | ;; | ||
| 92 | 2.6) | ||
| 93 | AC_MSG_RESULT(2.6 family) | ||
| 94 | AC_DEFINE([GLIBC_2_6], 1, [Define to 1 if you're using glibc 2.6.x]) | ||
| 95 | - DEFAULT_SUPP="glibc-2.6.supp ${DEFAULT_SUPP}" | ||
| 96 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 97 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 98 | + DEFAULT_SUPP="$srcdir/glibc-2.6.supp ${DEFAULT_SUPP}" | ||
| 99 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 100 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 101 | ;; | ||
| 102 | 2.7) | ||
| 103 | AC_MSG_RESULT(2.7 family) | ||
| 104 | AC_DEFINE([GLIBC_2_7], 1, [Define to 1 if you're using glibc 2.7.x]) | ||
| 105 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
| 106 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 107 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 108 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 109 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 110 | ;; | ||
| 111 | 2.8) | ||
| 112 | AC_MSG_RESULT(2.8 family) | ||
| 113 | AC_DEFINE([GLIBC_2_8], 1, [Define to 1 if you're using glibc 2.8.x]) | ||
| 114 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
| 115 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 116 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 117 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 118 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 119 | ;; | ||
| 120 | 2.9) | ||
| 121 | AC_MSG_RESULT(2.9 family) | ||
| 122 | AC_DEFINE([GLIBC_2_9], 1, [Define to 1 if you're using glibc 2.9.x]) | ||
| 123 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
| 124 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 125 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 126 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 127 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 128 | ;; | ||
| 129 | 2.10) | ||
| 130 | AC_MSG_RESULT(2.10 family) | ||
| 131 | AC_DEFINE([GLIBC_2_10], 1, [Define to 1 if you're using glibc 2.10.x]) | ||
| 132 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
| 133 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 134 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 135 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 136 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 137 | ;; | ||
| 138 | 2.11) | ||
| 139 | AC_MSG_RESULT(2.11 family) | ||
| 140 | AC_DEFINE([GLIBC_2_11], 1, [Define to 1 if you're using glibc 2.11.x]) | ||
| 141 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
| 142 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 143 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 144 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 145 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 146 | ;; | ||
| 147 | 2.12) | ||
| 148 | AC_MSG_RESULT(2.12 family) | ||
| 149 | AC_DEFINE([GLIBC_2_12], 1, [Define to 1 if you're using glibc 2.12.x]) | ||
| 150 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
| 151 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 152 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 153 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 154 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 155 | ;; | ||
| 156 | 2.13) | ||
| 157 | AC_MSG_RESULT(2.13 family) | ||
| 158 | AC_DEFINE([GLIBC_2_13], 1, [Define to 1 if you're using glibc 2.13.x]) | ||
| 159 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
| 160 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 161 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 162 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 163 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 164 | ;; | ||
| 165 | 2.14) | ||
| 166 | AC_MSG_RESULT(2.14 family) | ||
| 167 | AC_DEFINE([GLIBC_2_14], 1, [Define to 1 if you're using glibc 2.14.x]) | ||
| 168 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
| 169 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 170 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 171 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 172 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 173 | ;; | ||
| 174 | 2.15) | ||
| 175 | AC_MSG_RESULT(2.15 family) | ||
| 176 | AC_DEFINE([GLIBC_2_15], 1, [Define to 1 if you're using glibc 2.15.x]) | ||
| 177 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
| 178 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 179 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 180 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 181 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 182 | ;; | ||
| 183 | 2.16) | ||
| 184 | AC_MSG_RESULT(2.16 family) | ||
| 185 | AC_DEFINE([GLIBC_2_16], 1, [Define to 1 if you're using glibc 2.16.x]) | ||
| 186 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
| 187 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 188 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 189 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 190 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 191 | ;; | ||
| 192 | 2.17) | ||
| 193 | AC_MSG_RESULT(2.17 family) | ||
| 194 | AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x]) | ||
| 195 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
| 196 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 197 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 198 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 199 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 200 | ;; | ||
| 201 | 2.18) | ||
| 202 | AC_MSG_RESULT(2.18 family) | ||
| 203 | AC_DEFINE([GLIBC_2_18], 1, [Define to 1 if you're using glibc 2.18.x]) | ||
| 204 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | ||
| 205 | - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 206 | - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 207 | + DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" | ||
| 208 | + DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" | ||
| 209 | ;; | ||
| 210 | darwin) | ||
| 211 | AC_MSG_RESULT(Darwin) | ||
| 212 | @@ -926,7 +926,7 @@ case "${GLIBC_VERSION}" in | ||
| 213 | bionic) | ||
| 214 | AC_MSG_RESULT(Bionic) | ||
| 215 | AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic]) | ||
| 216 | - DEFAULT_SUPP="bionic.supp ${DEFAULT_SUPP}" | ||
| 217 | + DEFAULT_SUPP="$srcdir/bionic.supp ${DEFAULT_SUPP}" | ||
| 218 | ;; | ||
| 219 | |||
| 220 | *) | ||
| 221 | @@ -943,11 +943,11 @@ AC_SUBST(GLIBC_VERSION) | ||
| 222 | # attempt to detect whether such libraries are installed on the | ||
| 223 | # build machine (or even if any X facilities are present); just | ||
| 224 | # add the suppressions antidisirregardless. | ||
| 225 | -DEFAULT_SUPP="xfree-4.supp ${DEFAULT_SUPP}" | ||
| 226 | -DEFAULT_SUPP="xfree-3.supp ${DEFAULT_SUPP}" | ||
| 227 | +DEFAULT_SUPP="$srcdir/xfree-4.supp ${DEFAULT_SUPP}" | ||
| 228 | +DEFAULT_SUPP="$srcdir/xfree-3.supp ${DEFAULT_SUPP}" | ||
| 229 | |||
| 230 | # Add glibc and X11 suppressions for exp-sgcheck | ||
| 231 | -DEFAULT_SUPP="exp-sgcheck.supp ${DEFAULT_SUPP}" | ||
| 232 | +DEFAULT_SUPP="$srcdir/exp-sgcheck.supp ${DEFAULT_SUPP}" | ||
| 233 | |||
| 234 | |||
| 235 | #---------------------------------------------------------------------------- | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb b/meta/recipes-devtools/valgrind/valgrind_3.11.0.bb index 95b3966c69..575db35680 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.11.0.bb | |||
| @@ -2,10 +2,10 @@ SUMMARY = "Valgrind memory debugger and instrumentation framework" | |||
| 2 | HOMEPAGE = "http://valgrind.org/" | 2 | HOMEPAGE = "http://valgrind.org/" |
| 3 | BUGTRACKER = "http://valgrind.org/support/bug_reports.html" | 3 | BUGTRACKER = "http://valgrind.org/support/bug_reports.html" |
| 4 | LICENSE = "GPLv2 & GPLv2+ & BSD" | 4 | LICENSE = "GPLv2 & GPLv2+ & BSD" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \ | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
| 6 | file://include/pub_tool_basics.h;beginline=1;endline=29;md5=e7071929a50d4b0fc27a3014b315b0f7 \ | 6 | file://include/pub_tool_basics.h;beginline=1;endline=29;md5=ebb8e640ef633f940c425686c873f9fa \ |
| 7 | file://include/valgrind.h;beginline=1;endline=56;md5=92df8a1bde56fe2af70931ff55f6622f \ | 7 | file://include/valgrind.h;beginline=1;endline=56;md5=4b5e24908e53016ea561c45f4234a327 \ |
| 8 | file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215" | 8 | file://COPYING.DOCS;md5=24ea4c7092233849b4394699333b5c56" |
| 9 | 9 | ||
| 10 | X11DEPENDS = "virtual/libx11" | 10 | X11DEPENDS = "virtual/libx11" |
| 11 | DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)} \ | 11 | DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)} \ |
| @@ -15,27 +15,20 @@ DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d | |||
| 15 | SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ | 15 | SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ |
| 16 | file://fixed-perl-path.patch \ | 16 | file://fixed-perl-path.patch \ |
| 17 | file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \ | 17 | file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \ |
| 18 | file://sepbuildfix.patch \ | ||
| 19 | file://glibc.patch \ | ||
| 20 | file://force-nostabs.patch \ | ||
| 21 | file://remove-arm-variant-specific.patch \ | 18 | file://remove-arm-variant-specific.patch \ |
| 22 | file://remove-ppc-tests-failing-build.patch \ | ||
| 23 | file://valgrind-remove-rpath.patch \ | ||
| 24 | file://enable.building.on.4.x.kernel.patch \ | ||
| 25 | file://add-ptest.patch \ | ||
| 26 | file://pass-maltivec-only-if-it-supported.patch \ | ||
| 27 | file://run-ptest \ | 19 | file://run-ptest \ |
| 28 | file://0001-valgrind-Enable-rt_sigpending-syscall-on-ppc64-linux.patch \ | ||
| 29 | file://11_mips-link-tool.patch \ | 20 | file://11_mips-link-tool.patch \ |
| 30 | " | 21 | file://0002-remove-rpath.patch \ |
| 22 | file://0004-Fix-out-of-tree-builds.patch \ | ||
| 23 | file://0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch \ | ||
| 24 | file://0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch \ | ||
| 25 | " | ||
| 31 | 26 | ||
| 32 | SRC_URI[md5sum] = "60ddae962bc79e7c95cfc4667245707f" | 27 | SRC_URI[md5sum] = "4ea62074da73ae82e0162d6550d3f129" |
| 33 | SRC_URI[sha256sum] = "fa253dc26ddb661b6269df58144eff607ea3f76a9bcfe574b0c7726e1dfcb997" | 28 | SRC_URI[sha256sum] = "6c396271a8c1ddd5a6fb9abe714ea1e8a86fce85b30ab26b4266aeb4c2413b42" |
| 34 | 29 | ||
| 35 | COMPATIBLE_HOST = '(i.86|x86_64|arm|mips|powerpc|powerpc64).*-linux' | 30 | COMPATIBLE_HOST = '(i.86|x86_64|arm|mips|powerpc|powerpc64).*-linux' |
| 36 | 31 | ||
| 37 | PR = "r1" | ||
| 38 | |||
| 39 | inherit autotools ptest | 32 | inherit autotools ptest |
| 40 | 33 | ||
| 41 | EXTRA_OECONF = "--enable-tls --without-mpicc" | 34 | EXTRA_OECONF = "--enable-tls --without-mpicc" |
| @@ -60,6 +53,10 @@ RRECOMMENDS_${PN} += "${TCLIBC}-dbg" | |||
| 60 | 53 | ||
| 61 | RDEPENDS_${PN}-ptest += " sed perl glibc-utils perl-module-file-glob" | 54 | RDEPENDS_${PN}-ptest += " sed perl glibc-utils perl-module-file-glob" |
| 62 | 55 | ||
| 56 | # One of the tests contains a bogus interpreter path on purpose, and QA | ||
| 57 | # check complains about it | ||
| 58 | INSANE_SKIP_${PN}-ptest += "file-rdeps" | ||
| 59 | |||
| 63 | do_compile_ptest() { | 60 | do_compile_ptest() { |
| 64 | oe_runmake check CFLAGS="${CFLAGS} -O0" CXXFLAGS="${CXXFLAGS} -O0" | 61 | oe_runmake check CFLAGS="${CFLAGS} -O0" CXXFLAGS="${CXXFLAGS} -O0" |
| 65 | } | 62 | } |
