generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not adjust PT_GNU_STACK segment

Browse Source 
Bug: http://b/20687795
Bug: http://b/18051137
Change-Id: Ie8af3892cfbebcc0249e7981284c4ad97ff40317
This commit is contained in:
Dmitriy Ivanov
2015-05-04 11:11:23 -07:00
committed by Dimitry Ivanov
parent dc145b5106
commit 064a9800f3
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/relocation_packer/src/elf_file.cc
View File

@@ -312,6 +312,13 @@ static void AdjustProgramHeaderOffsets(typename ELF::Phdr* program_headers,
for (size_t i = 0; i < count; ++i) { for (size_t i = 0; i < count; ++i) {
typename ELF::Phdr* program_header = &program_headers[i]; typename ELF::Phdr* program_header = &program_headers[i];
// Do not adjust PT_GNU_STACK - it confuses gdb and results
// in incorrect unwinding if the executable is stripped after
// packing.
if (program_header->p_type == PT_GNU_STACK) {
continue;
}
if (program_header->p_offset > hole_start) { if (program_header->p_offset > hole_start) {
// The hole start is past this segment, so adjust offset. // The hole start is past this segment, so adjust offset.
program_header->p_offset += hole_size; program_header->p_offset += hole_size;