summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-10-29 21:42:39 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-11 14:10:46 +0000
commitab3f627aaf1abaf6a5d3ff0131e74ef6768778f3 (patch)
treec7be8fb44afd97d074f18d4b8e04854088a0b7ed
parent9a56d0701ae5bce5b744a5ee5fe23e52ac194358 (diff)
downloadpoky-ab3f627aaf1abaf6a5d3ff0131e74ef6768778f3.tar.gz
elfutils-native: Update the patch to include the missing pieces needed for tests
In the last patch we missed similar update for test/line2addr.c which meant that the build still failed. (From OE-Core master rev: cb966afe86a5856d846fb0d4fb627cdce2ae0670) (From OE-Core rev: 51008a21629561c8d40a7addcddde6c2be176e90) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/elfutils/elfutils/fix-build-gcc-4.8.patch21
1 files changed, 17 insertions, 4 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils/fix-build-gcc-4.8.patch b/meta/recipes-devtools/elfutils/elfutils/fix-build-gcc-4.8.patch
index a7c351941f..0e28690207 100644
--- a/meta/recipes-devtools/elfutils/elfutils/fix-build-gcc-4.8.patch
+++ b/meta/recipes-devtools/elfutils/elfutils/fix-build-gcc-4.8.patch
@@ -25,11 +25,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
25 25
26Upstream-Status: Inappropriate [Caused by an earlier patch] 26Upstream-Status: Inappropriate [Caused by an earlier patch]
27 27
28Index: elfutils-0.155/src/addr2line.c 28Index: elfutils-0.148/src/addr2line.c
29=================================================================== 29===================================================================
30--- elfutils-0.155.orig/src/addr2line.c 30--- elfutils-0.148.orig/src/addr2line.c 2013-09-23 17:46:45.513586538 -0700
31+++ elfutils-0.155/src/addr2line.c 31+++ elfutils-0.148/src/addr2line.c 2013-09-23 17:46:46.329586558 -0700
32@@ -447,10 +447,10 @@ handle_address (const char *string, Dwfl 32@@ -447,10 +447,10 @@
33 bool parsed = false; 33 bool parsed = false;
34 int i, j; 34 int i, j;
35 char *name = NULL; 35 char *name = NULL;
@@ -42,3 +42,16 @@ Index: elfutils-0.155/src/addr2line.c
42 { 42 {
43 default: 43 default:
44 break; 44 break;
45Index: elfutils-0.148/tests/line2addr.c
46===================================================================
47--- elfutils-0.148.orig/tests/line2addr.c 2013-09-23 17:46:45.521586538 -0700
48+++ elfutils-0.148/tests/line2addr.c 2013-09-23 17:46:46.329586558 -0700
49@@ -132,7 +132,7 @@
50 {
51 struct args a = { .arg = argv[cnt] };
52
53- switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line))
54+ switch (sscanf (a.arg, "%m[^:]:%d", &a.file, &a.line))
55 {
56 default:
57 case 0: