diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-10-28 17:41:18 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-06 23:35:34 +0000 |
commit | 6c6b6753c0d3494fa79ae493d5d798495a9b03ba (patch) | |
tree | b1ab7d4095d01053d7ef6f42493d8653e1ad04c3 /meta/recipes-devtools/valgrind/valgrind | |
parent | 0340573629b5faab18859e731a91876d0798186a (diff) | |
download | poky-6c6b6753c0d3494fa79ae493d5d798495a9b03ba.tar.gz |
valgrind: update to 3.12.0
Remove backported gcc5-port.patch
Remove 11_mips-link-tool.patch as there is nothing in the target file
(or the entire source tree) that resembles anything contained in the patch.
(From OE-Core rev: 221093e850fbc3c154e9069f1958384b59ba3f70)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/valgrind/valgrind')
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind/11_mips-link-tool.patch | 37 | ||||
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind/gcc5-port.patch | 64 |
2 files changed, 0 insertions, 101 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 @@ | |||
1 | Debian 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 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
8 | |||
9 | |||
10 | Description: Disable the MIPS linker workarounds when using -Ttext-section | ||
11 | Origin: vendor | ||
12 | Bug-Debian: http://bugs.debian.org/777704 | ||
13 | Author: James Cowgill <james410@cowgill.org.uk> | ||
14 | Last-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 @@ | |||
1 | backport fix from upstream to fix build errors with gcc 6 | ||
2 | |||
3 | http://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 | |||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | Upstream-Status: Backport | ||
17 | |||
18 | Index: 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]]*) | ||
31 | Index: 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 | ||
48 | Index: 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 | ||