diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2014-10-28 07:57:54 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-05 17:42:45 +0000 |
| commit | 80b7db50d191c27c8ea78206140a4fa23adcf292 (patch) | |
| tree | 3cac4660ae434a426d96bde2824015ed279cfebc /meta/recipes-devtools/valgrind/valgrind | |
| parent | 6e1769f44e18657c5bd576f8b053832d0ce825d7 (diff) | |
| download | openembedded-core-contrib-80b7db50d191c27c8ea78206140a4fa23adcf292.tar.gz | |
valgrind: Upgrade to 3.10.0
Rebase existing patches
Add patch to fix rpath issue with ptest
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/valgrind/valgrind')
3 files changed, 49 insertions, 22 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 Signed-off-by: Dave Lerner <dave.lerner@windriver.com> -diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am -index 2a19f5b..ccdeb77 100644 ---- a/none/tests/arm/Makefile.am -+++ b/none/tests/arm/Makefile.am -@@ -16,15 +16,16 @@ EXTRA_DIST = \ - vcvt_fixed_float_VFP.vgtest \ - vfp.stdout.exp vfp.stderr.exp vfp.vgtest +Index: valgrind-3.10.0/none/tests/arm/Makefile.am +=================================================================== +--- valgrind-3.10.0.orig/none/tests/arm/Makefile.am ++++ valgrind-3.10.0/none/tests/arm/Makefile.am +@@ -17,15 +17,16 @@ EXTRA_DIST = \ + vfp.stdout.exp vfp.stderr.exp vfp.vgtest \ + vfpv4_fma.stdout.exp vfpv4_fma.stderr.exp vfpv4_fma.vgtest +# For yocto: +# Only include tests that don't require Thumb. @@ -31,8 +31,8 @@ index 2a19f5b..ccdeb77 100644 - v6intThumb \ v6media \ vcvt_fixed_float_VFP \ - vfp -@@ -34,32 +35,3 @@ AM_CXXFLAGS += @FLAG_M32@ + vfp \ +@@ -36,34 +37,3 @@ AM_CXXFLAGS += @FLAG_M32@ AM_CCASFLAGS += @FLAG_M32@ allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@ @@ -65,3 +65,5 @@ index 2a19f5b..ccdeb77 100644 -intdiv_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a15 -mthumb -ldrt_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -mthumb -ldrt_arm_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -marm +- +-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 Signed-off-by: Dave Lerner <dave.lerner@windriver.com> -diff --git a/memcheck/tests/ppc32/Makefile.am b/memcheck/tests/ppc32/Makefile.am -index bd70eea..1436e8e 100644 ---- a/memcheck/tests/ppc32/Makefile.am -+++ b/memcheck/tests/ppc32/Makefile.am +Index: valgrind-3.10.0/memcheck/tests/ppc32/Makefile.am +=================================================================== +--- valgrind-3.10.0.orig/memcheck/tests/ppc32/Makefile.am ++++ valgrind-3.10.0/memcheck/tests/ppc32/Makefile.am @@ -7,8 +7,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ power_ISA2_05.stderr.exp power_ISA2_05.stdout.exp power_ISA2_05.vgtest \ power_ISA2_05.stdout.exp_Without_FPPO @@ -50,11 +50,11 @@ index bd70eea..1436e8e 100644 power_ISA2_05_CFLAGS = $(AM_CFLAGS) $(WERROR) -Winline -Wall -Wshadow -g \ -I$(top_srcdir)/include @FLAG_M32@ -diff --git a/none/tests/ppc32/Makefile.am b/none/tests/ppc32/Makefile.am -index 4f581b6..91ce7e7 100644 ---- a/none/tests/ppc32/Makefile.am -+++ b/none/tests/ppc32/Makefile.am -@@ -50,16 +50,8 @@ check_PROGRAMS = \ +Index: valgrind-3.10.0/none/tests/ppc32/Makefile.am +=================================================================== +--- valgrind-3.10.0.orig/none/tests/ppc32/Makefile.am ++++ valgrind-3.10.0/none/tests/ppc32/Makefile.am +@@ -52,16 +52,8 @@ check_PROGRAMS = \ allexec \ bug129390-ppc32 \ bug139050-ppc32 \ @@ -67,9 +67,9 @@ index 4f581b6..91ce7e7 100644 - test_isa_2_07_part1 \ - test_isa_2_07_part2 \ - test_tm \ -- test_touch_tm +- test_touch_tm \ + ldstrev lsw mftocrf mcrfs test_fx test_gx \ -+ twi tw xlc_dbl_u32 power6_bcmp ++ twi tw xlc_dbl_u32 power6_bcmp \ + ldst_multiple \ + data-cache-instructions - AM_CFLAGS += @FLAG_M32@ - 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 @@ + +Upstream-Status: Inapporpiate [embedded config] +Signed-off-by: Saul Wold <sgw@linux.intel.com> + +Index: valgrind-3.10.0/none/tests/Makefile.am +=================================================================== +--- valgrind-3.10.0.orig/none/tests/Makefile.am ++++ valgrind-3.10.0/none/tests/Makefile.am +@@ -280,7 +280,6 @@ threaded_fork_LDADD = -lpthread + threadederrno_LDADD = -lpthread + tls_SOURCES = tls.c tls2.c + tls_DEPENDENCIES = tls.so tls2.so +-tls_LDFLAGS = -Wl,-rpath,$(abs_top_builddir)/none/tests + tls_LDADD = tls.so tls2.so -lpthread + tls_so_SOURCES = tls_so.c + tls_so_DEPENDENCIES = tls2.so +@@ -288,7 +287,7 @@ if VGCONF_OS_IS_DARWIN + tls_so_LDFLAGS = -dynamic -dynamiclib -all_load -fpic + tls_so_LDADD = `pwd`/tls2.so + else +- tls_so_LDFLAGS = -Wl,-rpath,$(abs_top_builddir)/none/tests -shared -fPIC ++ tls_so_LDFLAGS = -shared -fPIC + tls_so_LDADD = tls2.so + endif + tls_so_CFLAGS = $(AM_CFLAGS) -fPIC |