mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-02 17:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

patchelf: Fix alignment patch

Browse Source 
The previous fix was in the right direction but needed to account
for the section alignment of the current section. Tweak the patch
to handle this.

(From OE-Core rev: e464efc07a8997c43998a9c6a9544be11ab4f303)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2021-05-02 12:11:20 +01:00
parent 93aaa5e994
commit c19e2c23be
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
meta/recipes-devtools/patchelf/patchelf/alignmentfix.patch
View File

@@ -31,12 +31,14 @@ Index: git/src/patchelf.cc
===================================================================
--- git.orig/src/patchelf.cc
+++ git/src/patchelf.cc
@@ -1035,6 +1035,8 @@ void ElfFile<ElfFileParamNames>::normali
phdrs.push_back(new_phdr);
curr_off += size;
+ /* The next section offset would be aligned */
+ curr_off = roundUp(curr_off, sectionAlignment);
}
}
wri(hdr->e_phnum, phdrs.size());
@@ -1010,8 +1010,9 @@ void ElfFile<ElfFileParamNames>::normali
size_t size = 0;
for (const auto & shdr : shdrs) {
if (rdi(shdr.sh_type) != SHT_NOTE) continue;
- if (rdi(shdr.sh_offset) != curr_off) continue;
+ if (rdi(shdr.sh_offset) != roundUp(curr_off, rdi(shdr.sh_addralign))) continue;
size = rdi(shdr.sh_size);
+ curr_off = roundUp(curr_off, rdi(shdr.sh_addralign));
break;
}
if (size == 0)