diff options
-rw-r--r-- | meta/recipes-devtools/elfutils/elfutils/fix-build-gcc-4.8.patch | 44 | ||||
-rw-r--r-- | meta/recipes-devtools/elfutils/elfutils_0.148.bb | 1 |
2 files changed, 45 insertions, 0 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 new file mode 100644 index 0000000000..a7c351941f --- /dev/null +++ b/meta/recipes-devtools/elfutils/elfutils/fix-build-gcc-4.8.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | This patch fixes a warning seen with gcc 4.8 (especially on ubuntu 13.10) | ||
2 | |||
3 | | addr2line.c: In function 'handle_address': | ||
4 | | addr2line.c:450:7: error: format '%a' expects argument of type 'float *', but argument 3 has type 'char **' [-Werror=format=] | ||
5 | | if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2 | ||
6 | | ^ | ||
7 | | addr2line.c:453:7: error: format '%a' expects argument of type 'float *', but argument 3 has type 'char **' [-Werror=format=] | ||
8 | | switch (sscanf (string, "%a[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j)) | ||
9 | | ^ | ||
10 | | cc1: all warnings being treated as errors | ||
11 | |||
12 | |||
13 | %a is old GNU style and should be abandoned in favor of %m | ||
14 | |||
15 | Also see | ||
16 | |||
17 | http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54361 | ||
18 | |||
19 | to support this assertion | ||
20 | |||
21 | This patch is added via redhat-compatibility patch so lets revert this part | ||
22 | here. | ||
23 | |||
24 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
25 | |||
26 | Upstream-Status: Inappropriate [Caused by an earlier patch] | ||
27 | |||
28 | Index: elfutils-0.155/src/addr2line.c | ||
29 | =================================================================== | ||
30 | --- elfutils-0.155.orig/src/addr2line.c | ||
31 | +++ elfutils-0.155/src/addr2line.c | ||
32 | @@ -447,10 +447,10 @@ handle_address (const char *string, Dwfl | ||
33 | bool parsed = false; | ||
34 | int i, j; | ||
35 | char *name = NULL; | ||
36 | - if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2 | ||
37 | + if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2 | ||
38 | && string[i] == '\0') | ||
39 | parsed = adjust_to_section (name, &addr, dwfl); | ||
40 | - switch (sscanf (string, "%a[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j)) | ||
41 | + switch (sscanf (string, "%m[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j)) | ||
42 | { | ||
43 | default: | ||
44 | break; | ||
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.148.bb b/meta/recipes-devtools/elfutils/elfutils_0.148.bb index 9c0a08eafa..420c9df17f 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.148.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.148.bb | |||
@@ -33,6 +33,7 @@ SRC_URI += "\ | |||
33 | file://dso-link-change.patch \ | 33 | file://dso-link-change.patch \ |
34 | file://nm-Fix-size-passed-to-snprintf-for-invalid-sh_name-case.patch \ | 34 | file://nm-Fix-size-passed-to-snprintf-for-invalid-sh_name-case.patch \ |
35 | file://elfutils-ar-c-fix-num-passed-to-memset.patch \ | 35 | file://elfutils-ar-c-fix-num-passed-to-memset.patch \ |
36 | file://fix-build-gcc-4.8.patch \ | ||
36 | " | 37 | " |
37 | # Only apply when building uclibc based target recipe | 38 | # Only apply when building uclibc based target recipe |
38 | SRC_URI_append_libc-uclibc = " file://uclibc-support.patch" | 39 | SRC_URI_append_libc-uclibc = " file://uclibc-support.patch" |