From 4b616f06c1764b6c36d8d9e8fda6897682d91e4b Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 28 May 2014 16:49:57 +0800 Subject: elfutils: upgrade to 0.158 Add 'm4-biarch.m4-tweak-AC_RUN_IFELSE-for-cross-compiling.patch' to fix cross compiling failure; Rebase 'elf_additions.diff' for 0.158; Drop obsolete patches: - nm-Fix-size-passed-to-snprintf-for-invalid-sh_name-case.patch - elfutils-ar-c-fix-num-passed-to-memset.patch - fix-build-gcc-4.8.patch Pick patches from debian: http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.158-2.debian.tar.xz We could not directly add elfutils_0.158-2.debian.tar.xz to SRC_URI, because it contains other souce codes which are not pathces. (From OE-Core rev: d9c7a02240ce37d5b2569d9177e8ba534b9295ce) Signed-off-by: Hongxu Jia Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../elfutils/elfutils-0.158/scanf-format.patch | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.158/scanf-format.patch (limited to 'meta/recipes-devtools/elfutils/elfutils-0.158/scanf-format.patch') diff --git a/meta/recipes-devtools/elfutils/elfutils-0.158/scanf-format.patch b/meta/recipes-devtools/elfutils/elfutils-0.158/scanf-format.patch new file mode 100644 index 0000000000..c08519cf53 --- /dev/null +++ b/meta/recipes-devtools/elfutils/elfutils-0.158/scanf-format.patch @@ -0,0 +1,40 @@ +From: Kurt Roeckx +Subject: Use %m[ instead of %a[ in scanf() + +%a was a gnu extention, but C99 made this a float. So it got +changed to %m (supported by glibc 2.7), but %a[ and %as are +still supported by glibc. The portability branch changed this +from %m to %a again since that's supported by more versions of +glibc. However gcc gives a warning about this using -Wformat +and we have a new enough libc to use %m. + +Index: elfutils-0.153/src/addr2line.c +=================================================================== +--- elfutils-0.153.orig/src/addr2line.c 2012-02-24 22:29:50.000000000 +0000 ++++ elfutils-0.153/src/addr2line.c 2012-02-24 22:29:52.000000000 +0000 +@@ -455,10 +455,10 @@ + bool parsed = false; + int i, j; + char *name = NULL; +- if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2 ++ if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2 + && string[i] == '\0') + parsed = adjust_to_section (name, &addr, dwfl); +- switch (sscanf (string, "%a[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j)) ++ switch (sscanf (string, "%m[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j)) + { + default: + break; +Index: elfutils-0.153/tests/line2addr.c +=================================================================== +--- elfutils-0.153.orig/tests/line2addr.c 2012-02-24 22:29:50.000000000 +0000 ++++ elfutils-0.153/tests/line2addr.c 2012-02-24 22:29:52.000000000 +0000 +@@ -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: -- cgit v1.2.3-54-g00ecf