summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-10-28 07:57:54 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-05 18:01:04 +0000
commit54d020345ebde2c3e7044b144e829e14b4f81f3d (patch)
treed85f47497b759fc1162ac020015326c4a0a14d72 /meta
parentab7059585a08bc6dd2512cef02c5c3b9c36a2256 (diff)
downloadpoky-54d020345ebde2c3e7044b144e829e14b4f81f3d.tar.gz
valgrind: Upgrade to 3.10.0
Rebase existing patches Add patch to fix rpath issue with ptest (From OE-Core rev: 80b7db50d191c27c8ea78206140a4fa23adcf292) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/remove-arm-variant-specific.patch20
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/remove-ppc-tests-failing-build.patch26
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/valgrind-remove-rpath.patch25
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.10.0.bb (renamed from meta/recipes-devtools/valgrind/valgrind_3.9.0.bb)6
4 files changed, 52 insertions, 25 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/remove-arm-variant-specific.patch b/meta/recipes-devtools/valgrind/valgrind/remove-arm-variant-specific.patch
index 46dea60eb3..f84bf9ae9a 100644
--- a/meta/recipes-devtools/valgrind/valgrind/remove-arm-variant-specific.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/remove-arm-variant-specific.patch
@@ -8,13 +8,13 @@ Upstream-Status: Pending
8 8
9Signed-off-by: Dave Lerner <dave.lerner@windriver.com> 9Signed-off-by: Dave Lerner <dave.lerner@windriver.com>
10 10
11diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am 11Index: valgrind-3.10.0/none/tests/arm/Makefile.am
12index 2a19f5b..ccdeb77 100644 12===================================================================
13--- a/none/tests/arm/Makefile.am 13--- valgrind-3.10.0.orig/none/tests/arm/Makefile.am
14+++ b/none/tests/arm/Makefile.am 14+++ valgrind-3.10.0/none/tests/arm/Makefile.am
15@@ -16,15 +16,16 @@ EXTRA_DIST = \ 15@@ -17,15 +17,16 @@ EXTRA_DIST = \
16 vcvt_fixed_float_VFP.vgtest \ 16 vfp.stdout.exp vfp.stderr.exp vfp.vgtest \
17 vfp.stdout.exp vfp.stderr.exp vfp.vgtest 17 vfpv4_fma.stdout.exp vfpv4_fma.stderr.exp vfpv4_fma.vgtest
18 18
19+# For yocto: 19+# For yocto:
20+# Only include tests that don't require Thumb. 20+# Only include tests that don't require Thumb.
@@ -31,8 +31,8 @@ index 2a19f5b..ccdeb77 100644
31- v6intThumb \ 31- v6intThumb \
32 v6media \ 32 v6media \
33 vcvt_fixed_float_VFP \ 33 vcvt_fixed_float_VFP \
34 vfp 34 vfp \
35@@ -34,32 +35,3 @@ AM_CXXFLAGS += @FLAG_M32@ 35@@ -36,34 +37,3 @@ AM_CXXFLAGS += @FLAG_M32@
36 AM_CCASFLAGS += @FLAG_M32@ 36 AM_CCASFLAGS += @FLAG_M32@
37 37
38 allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@ 38 allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@
@@ -65,3 +65,5 @@ index 2a19f5b..ccdeb77 100644
65-intdiv_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a15 -mthumb 65-intdiv_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a15 -mthumb
66-ldrt_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -mthumb 66-ldrt_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -mthumb
67-ldrt_arm_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -marm 67-ldrt_arm_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -marm
68-
69-vfpv4_fma_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a15 -mfpu=vfpv4 -marm
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
index 2a14e1852c..1c640ffb71 100644
--- a/meta/recipes-devtools/valgrind/valgrind/remove-ppc-tests-failing-build.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/remove-ppc-tests-failing-build.patch
@@ -36,10 +36,10 @@ Upstream-Status: Pending
36 36
37Signed-off-by: Dave Lerner <dave.lerner@windriver.com> 37Signed-off-by: Dave Lerner <dave.lerner@windriver.com>
38 38
39diff --git a/memcheck/tests/ppc32/Makefile.am b/memcheck/tests/ppc32/Makefile.am 39Index: valgrind-3.10.0/memcheck/tests/ppc32/Makefile.am
40index bd70eea..1436e8e 100644 40===================================================================
41--- a/memcheck/tests/ppc32/Makefile.am 41--- valgrind-3.10.0.orig/memcheck/tests/ppc32/Makefile.am
42+++ b/memcheck/tests/ppc32/Makefile.am 42+++ valgrind-3.10.0/memcheck/tests/ppc32/Makefile.am
43@@ -7,8 +7,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ 43@@ -7,8 +7,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
44 power_ISA2_05.stderr.exp power_ISA2_05.stdout.exp power_ISA2_05.vgtest \ 44 power_ISA2_05.stderr.exp power_ISA2_05.stdout.exp power_ISA2_05.vgtest \
45 power_ISA2_05.stdout.exp_Without_FPPO 45 power_ISA2_05.stdout.exp_Without_FPPO
@@ -50,11 +50,11 @@ index bd70eea..1436e8e 100644
50 50
51 power_ISA2_05_CFLAGS = $(AM_CFLAGS) $(WERROR) -Winline -Wall -Wshadow -g \ 51 power_ISA2_05_CFLAGS = $(AM_CFLAGS) $(WERROR) -Winline -Wall -Wshadow -g \
52 -I$(top_srcdir)/include @FLAG_M32@ 52 -I$(top_srcdir)/include @FLAG_M32@
53diff --git a/none/tests/ppc32/Makefile.am b/none/tests/ppc32/Makefile.am 53Index: valgrind-3.10.0/none/tests/ppc32/Makefile.am
54index 4f581b6..91ce7e7 100644 54===================================================================
55--- a/none/tests/ppc32/Makefile.am 55--- valgrind-3.10.0.orig/none/tests/ppc32/Makefile.am
56+++ b/none/tests/ppc32/Makefile.am 56+++ valgrind-3.10.0/none/tests/ppc32/Makefile.am
57@@ -50,16 +50,8 @@ check_PROGRAMS = \ 57@@ -52,16 +52,8 @@ check_PROGRAMS = \
58 allexec \ 58 allexec \
59 bug129390-ppc32 \ 59 bug129390-ppc32 \
60 bug139050-ppc32 \ 60 bug139050-ppc32 \
@@ -67,9 +67,9 @@ index 4f581b6..91ce7e7 100644
67- test_isa_2_07_part1 \ 67- test_isa_2_07_part1 \
68- test_isa_2_07_part2 \ 68- test_isa_2_07_part2 \
69- test_tm \ 69- test_tm \
70- test_touch_tm 70- test_touch_tm \
71+ ldstrev lsw mftocrf mcrfs test_fx test_gx \ 71+ ldstrev lsw mftocrf mcrfs test_fx test_gx \
72+ twi tw xlc_dbl_u32 power6_bcmp 72+ twi tw xlc_dbl_u32 power6_bcmp \
73 ldst_multiple \
74 data-cache-instructions
73 75
74 AM_CFLAGS += @FLAG_M32@
75 AM_CXXFLAGS += @FLAG_M32@
diff --git a/meta/recipes-devtools/valgrind/valgrind/valgrind-remove-rpath.patch b/meta/recipes-devtools/valgrind/valgrind/valgrind-remove-rpath.patch
new file mode 100644
index 0000000000..07a272633e
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind/valgrind-remove-rpath.patch
@@ -0,0 +1,25 @@
1
2Upstream-Status: Inapporpiate [embedded config]
3Signed-off-by: Saul Wold <sgw@linux.intel.com>
4
5Index: valgrind-3.10.0/none/tests/Makefile.am
6===================================================================
7--- valgrind-3.10.0.orig/none/tests/Makefile.am
8+++ valgrind-3.10.0/none/tests/Makefile.am
9@@ -280,7 +280,6 @@ threaded_fork_LDADD = -lpthread
10 threadederrno_LDADD = -lpthread
11 tls_SOURCES = tls.c tls2.c
12 tls_DEPENDENCIES = tls.so tls2.so
13-tls_LDFLAGS = -Wl,-rpath,$(abs_top_builddir)/none/tests
14 tls_LDADD = tls.so tls2.so -lpthread
15 tls_so_SOURCES = tls_so.c
16 tls_so_DEPENDENCIES = tls2.so
17@@ -288,7 +287,7 @@ if VGCONF_OS_IS_DARWIN
18 tls_so_LDFLAGS = -dynamic -dynamiclib -all_load -fpic
19 tls_so_LDADD = `pwd`/tls2.so
20 else
21- tls_so_LDFLAGS = -Wl,-rpath,$(abs_top_builddir)/none/tests -shared -fPIC
22+ tls_so_LDFLAGS = -shared -fPIC
23 tls_so_LDADD = tls2.so
24 endif
25 tls_so_CFLAGS = $(AM_CFLAGS) -fPIC
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.9.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.10.0.bb
index c415e773a8..4c6e1a7a0a 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.9.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.10.0.bb
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \
9 9
10X11DEPENDS = "virtual/libx11" 10X11DEPENDS = "virtual/libx11"
11DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" 11DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
12PR = "r8"
13 12
14SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ 13SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
15 file://fixed-perl-path.patch \ 14 file://fixed-perl-path.patch \
@@ -19,12 +18,13 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
19 file://force-nostabs.patch \ 18 file://force-nostabs.patch \
20 file://remove-arm-variant-specific.patch \ 19 file://remove-arm-variant-specific.patch \
21 file://remove-ppc-tests-failing-build.patch \ 20 file://remove-ppc-tests-failing-build.patch \
21 file://valgrind-remove-rpath.patch \
22 file://add-ptest.patch \ 22 file://add-ptest.patch \
23 file://run-ptest \ 23 file://run-ptest \
24 " 24 "
25 25
26SRC_URI[md5sum] = "0947de8112f946b9ce64764af7be6df2" 26SRC_URI[md5sum] = "7c311a72a20388aceced1aa5573ce970"
27SRC_URI[sha256sum] = "e6af71a06bc2534541b07743e1d58dc3caf744f38205ca3e5b5a0bdf372ed6f0" 27SRC_URI[sha256sum] = "03047f82dfc6985a4c7d9d2700e17bc05f5e1a0ca6ad902e5d6c81aeb720edc9"
28 28
29COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64).*-linux' 29COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64).*-linux'
30COMPATIBLE_HOST_armv7a = 'arm.*-linux' 30COMPATIBLE_HOST_armv7a = 'arm.*-linux'
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-27 17:31:20 +0000