summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/11_mips-link-tool.patch37
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/gcc5-port.patch64
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.12.0.bb (renamed from meta/recipes-devtools/valgrind/valgrind_3.11.0.bb)6
3 files changed, 2 insertions, 105 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/11_mips-link-tool.patch b/meta/recipes-devtools/valgrind/valgrind/11_mips-link-tool.patch
deleted file mode 100644
index ecb33b8cb3..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/11_mips-link-tool.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1Debian fix for MIPS: mmap(0x400000, 32768) failed in UME with error 22 (Invalid argument)
2
3 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=777704
4
5Upstream-Status: Pending
6
7Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
8
9
10Description: Disable the MIPS linker workarounds when using -Ttext-section
11Origin: vendor
12Bug-Debian: http://bugs.debian.org/777704
13Author: James Cowgill <james410@cowgill.org.uk>
14Last-Update: 2015-04-25
15
16--- a/coregrind/link_tool_exe_linux.in
17+++ b/coregrind/link_tool_exe_linux.in
18@@ -76,12 +76,13 @@
19 my $arch = substr($x, 0, index($x, "'"));
20
21 my $extra_args;
22-if (($arch eq 'mips') || ($arch eq 'mipsel')
23- || ($arch eq 'mipsisa32r2el')) {
24- $extra_args = "-static -Wl,--section-start=.reginfo=$ala";
25-} elsif (($arch eq 'mips64') || ($arch eq 'mips64el') ||
26- ($arch eq 'mipsisa64el')) {
27- $extra_args = "-static -Wl,--section-start=.MIPS.options=$ala";
28+if ($arch =~ /^mips/ && "@FLAG_T_TEXT@" eq '-Ttext') {
29+ # We only need to use the special mips options when using -Ttext
30+ if ($arch =~ /^mips(64|isa64)/) {
31+ $extra_args = "-static -Wl,--section-start=.MIPS.options=$ala";
32+ } else {
33+ $extra_args = "-static -Wl,--section-start=.reginfo=$ala";
34+ }
35 } else {
36 $extra_args = "-static -Wl,@FLAG_T_TEXT@=$ala";
37 }
diff --git a/meta/recipes-devtools/valgrind/valgrind/gcc5-port.patch b/meta/recipes-devtools/valgrind/valgrind/gcc5-port.patch
deleted file mode 100644
index 76bc821872..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/gcc5-port.patch
+++ /dev/null
@@ -1,64 +0,0 @@
1backport fix from upstream to fix build errors with gcc 6
2
3http://valgrind.10908.n7.nabble.com/Valgrind-r15773-in-trunk-configure-ac-drd-tests-std-thread-cpp-drd-tests-std-thread2-cpp-td56109.html
4
5../../../valgrind-3.11.0/drd/tests/std_thread.cpp:30:3: error: '_Impl_base' is not a member of 'std::thread'
6 std::thread::_Impl_base* __t = static_cast<std::thread::_Impl_base*>(__p);
7 ^~~
8../../../valgrind-3.11.0/drd/tests/std_thread.cpp:30:28: error: '__t' was not declared in this scope
9 std::thread::_Impl_base* __t = static_cast<std::thread::_Impl_base*>(__p);
10 ^~~
11../../../valgrind-3.11.0/drd/tests/std_thread.cpp:30:59: error: '_Impl_base' in 'class std::thread' does not name a type
12 std::thread::_Impl_base* __t = static_cast<std::thread::_Impl_base*>(__p);
13 ^~~~~~~~~~
14
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16Upstream-Status: Backport
17
18Index: configure.ac
19===================================================================
20--- a/configure.ac (revision 15772)
21+++ b/configure.ac (revision 15773)
22@@ -160,7 +160,7 @@
23 icc-1[[3-9]].*)
24 AC_MSG_RESULT([ok (ICC version ${gcc_version})])
25 ;;
26- notclang-[[3-9]].*|notclang-[[1-9][0-9]]*)
27+ notclang-[[3-9]]|notclang-[[3-9]].*|notclang-[[1-9][0-9]]*)
28 AC_MSG_RESULT([ok (${gcc_version})])
29 ;;
30 clang-2.9|clang-[[3-9]].*|clang-[[1-9][0-9]]*)
31Index: drd/tests/std_thread2.cpp
32===================================================================
33--- a/drd/tests/std_thread2.cpp (revision 15772)
34+++ b/drd/tests/std_thread2.cpp (revision 15773)
35@@ -26,6 +26,7 @@
36 return 0;
37 }
38
39+#if defined(__GNUC__) && __GNUC__ -0 < 6
40 //
41 // From libstdc++-v3/src/c++11/thread.cc
42 //
43@@ -70,3 +71,4 @@
44 }
45 }
46 }
47+#endif
48Index: drd/tests/std_thread.cpp
49===================================================================
50--- a/drd/tests/std_thread.cpp (revision 15772)
51+++ b/drd/tests/std_thread.cpp (revision 15773)
52@@ -21,6 +21,7 @@
53 return 0;
54 }
55
56+#if defined(__GNUC__) && __GNUC__ -0 < 6
57 //
58 // From libstdc++-v3/src/c++11/thread.cc
59 //
60@@ -65,3 +66,4 @@
61 }
62 }
63 }
64+#endif
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.11.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb
index 42fd27f537..a1138804ce 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.11.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb
@@ -16,20 +16,18 @@ 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://run-ptest \ 18 file://run-ptest \
19 file://11_mips-link-tool.patch \
20 file://0002-remove-rpath.patch \ 19 file://0002-remove-rpath.patch \
21 file://0004-Fix-out-of-tree-builds.patch \ 20 file://0004-Fix-out-of-tree-builds.patch \
22 file://0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch \ 21 file://0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch \
23 file://0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch \ 22 file://0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch \
24 file://use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch \ 23 file://use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch \
25 file://avoid-neon-for-targets-which-don-t-support-it.patch \ 24 file://avoid-neon-for-targets-which-don-t-support-it.patch \
26 file://gcc5-port.patch \
27" 25"
28SRC_URI_append_libc-musl = "\ 26SRC_URI_append_libc-musl = "\
29 file://0001-fix-build-for-musl-targets.patch \ 27 file://0001-fix-build-for-musl-targets.patch \
30" 28"
31SRC_URI[md5sum] = "4ea62074da73ae82e0162d6550d3f129" 29SRC_URI[md5sum] = "6eb03c0c10ea917013a7622e483d61bb"
32SRC_URI[sha256sum] = "6c396271a8c1ddd5a6fb9abe714ea1e8a86fce85b30ab26b4266aeb4c2413b42" 30SRC_URI[sha256sum] = "67ca4395b2527247780f36148b084f5743a68ab0c850cb43e4a5b4b012cf76a1"
33 31
34COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux' 32COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux'
35 33