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-11-01 11:09:03 +0000
commitc177fb687370a72bb7403fb2a61c04483f06c359 (patch)
treeecda22b3ac383d11f2fadd863d1dd0def6718af8
parenta7ba2f942270619f017479491c58439e2b40ce3e (diff)
downloadast2050-yocto-poky-c177fb687370a72bb7403fb2a61c04483f06c359.zip
ast2050-yocto-poky-c177fb687370a72bb7403fb2a61c04483f06c359.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 rev: cb966afe86a5856d846fb0d4fb627cdce2ae0670) 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 a7c3519..0e28690 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>
Upstream-Status: Inappropriate [Caused by an earlier patch]
-Index: elfutils-0.155/src/addr2line.c
+Index: elfutils-0.148/src/addr2line.c
===================================================================
---- elfutils-0.155.orig/src/addr2line.c
-+++ elfutils-0.155/src/addr2line.c
-@@ -447,10 +447,10 @@ handle_address (const char *string, Dwfl
+--- elfutils-0.148.orig/src/addr2line.c 2013-09-23 17:46:45.513586538 -0700
++++ elfutils-0.148/src/addr2line.c 2013-09-23 17:46:46.329586558 -0700
+@@ -447,10 +447,10 @@
bool parsed = false;
int i, j;
char *name = NULL;
@@ -42,3 +42,16 @@ Index: elfutils-0.155/src/addr2line.c
{
default:
break;
+Index: elfutils-0.148/tests/line2addr.c
+===================================================================
+--- elfutils-0.148.orig/tests/line2addr.c 2013-09-23 17:46:45.521586538 -0700
++++ elfutils-0.148/tests/line2addr.c 2013-09-23 17:46:46.329586558 -0700
+@@ -132,7 +132,7 @@
+ {
+ struct args a = { .arg = argv[cnt] };
+
+- switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line))
++ switch (sscanf (a.arg, "%m[^:]:%d", &a.file, &a.line))
+ {
+ default:
+ case 0:
OpenPOWER on IntegriCloud