Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 6bfba6f64e7b (bug 1480688) for android build bustages on a CLOSED TREE

Browse Source
This commit is contained in:
Andreea Pavel 2018-08-04 12:53:55 +03:00
parent b85f1c8fe9
commit 8ac372b9b7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/unix/elfhack/elfhack.cpp
View File

@ -1095,10 +1095,10 @@ int do_relocation_section(Elf *elf, unsigned int rel_type, unsigned int rel_type
ElfSection* eh_frame_hdr = eh_frame_segment ? eh_frame_segment->getFirstSection() : nullptr;
// The .eh_frame section usually follows the eh_frame_hdr section.
ElfSection* eh_frame = eh_frame_hdr ? eh_frame_hdr->getNext() : nullptr;
if (eh_frame_hdr && (!eh_frame || strcmp(eh_frame->getName(), ".eh_frame"))) {
if (eh_frame_hdr && !eh_frame) {
throw std::runtime_error("Expected to find an .eh_frame section after .eh_frame_hdr");
}
if (eh_frame && eh_frame_hdr->getAddr() > relhack->getAddr() && eh_frame->getAddr() < relhackcode->getAddr()) {
if (eh_frame && strcmp(eh_frame->getName(), ".eh_frame") == 0) {
// The distance between both sections needs to be preserved because eh_frame_hdr
// contains relative offsets to eh_frame. Well, they could be relocated too, but
// it's not worth the effort for the few number of bytes this would save.