summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.158/fixheadercheck.patch24
-rw-r--r--meta/recipes-devtools/elfutils/elfutils_0.158.bb12
2 files changed, 29 insertions, 7 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.158/fixheadercheck.patch b/meta/recipes-devtools/elfutils/elfutils-0.158/fixheadercheck.patch
new file mode 100644
index 0000000000..8796e9a394
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/elfutils-0.158/fixheadercheck.patch
@@ -0,0 +1,24 @@
1For some binaries we can get a invalid section alignment, for example if
2sh_align = 1 and sh_addralign is 0. In the case of a zero size section like
3".note.GNU-stack", this is irrelavent as far as I can tell and we shouldn't
4error in this case.
5
6RP 2014/6/11
7
8Upstream-Status: Pending
9
10Index: elfutils-0.158/libelf/elf32_updatenull.c
11===================================================================
12--- elfutils-0.158.orig/libelf/elf32_updatenull.c 2012-12-14 22:40:48.000000000 +0000
13+++ elfutils-0.158/libelf/elf32_updatenull.c 2014-06-11 16:35:43.417386291 +0000
14@@ -327,8 +327,8 @@
15 we test for the alignment of the section being large
16 enough for the largest alignment required by a data
17 block. */
18- if (unlikely (! powerof2 (shdr->sh_addralign))
19- || unlikely (shdr->sh_addralign < sh_align))
20+ if (shdr->sh_size && (unlikely (! powerof2 (shdr->sh_addralign))
21+ || unlikely (shdr->sh_addralign < sh_align)))
22 {
23 __libelf_seterrno (ELF_E_INVALID_ALIGN);
24 return -1;
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.158.bb b/meta/recipes-devtools/elfutils/elfutils_0.158.bb
index e4253645bf..ef3dd0bb40 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.158.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.158.bb
@@ -25,13 +25,11 @@ SRC_URI += "\
25 file://core_filename.patch \ 25 file://core_filename.patch \
26 file://CVE-2014-0172.patch \ 26 file://CVE-2014-0172.patch \
27 file://unwind_non_linux.patch \ 27 file://unwind_non_linux.patch \
28" 28 file://elf_additions.diff \
29 29 file://mempcpy.patch \
30SRC_URI += " \ 30 file://dso-link-change.patch \
31 file://elf_additions.diff \ 31 file://m4-biarch.m4-tweak-AC_RUN_IFELSE-for-cross-compiling.patch \
32 file://mempcpy.patch \ 32 file://fixheadercheck.patch \
33 file://dso-link-change.patch \
34 file://m4-biarch.m4-tweak-AC_RUN_IFELSE-for-cross-compiling.patch \
35" 33"
36 34
37# Only apply when building uclibc based target recipe 35# Only apply when building uclibc based target recipe