jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

ARM copy .e_flags from input to output to preserve soft_FP flag, etc.

Browse Source
This commit is contained in:
John Reiser
2010-11-09 11:05:55 -08:00
parent b1f02f91d7
commit a10293f8f7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_elf.cpp
+4 -2
View File
@@ -1840,25 +1840,27 @@ void PackLinuxElf32armLe::pack1(OutputFile *fo, Filter &ft)
fo->write(ibuf, xct_off); fo->write(ibuf, xct_off);
return; return;
} }
unsigned const e_flags = get_te32(&ehdri.e_flags);
cprElfHdr3 h3; cprElfHdr3 h3;
if (Elf32_Ehdr::ELFOSABI_LINUX==ei_osabi) { if (Elf32_Ehdr::ELFOSABI_LINUX==ei_osabi) {
unsigned const e_flags = get_te32(&ehdri.e_flags);
memcpy(&h3, stub_armel_eabi_linux_elf_fold, sizeof(Elf32_Ehdr) + 2*sizeof(Elf32_Phdr)); memcpy(&h3, stub_armel_eabi_linux_elf_fold, sizeof(Elf32_Ehdr) + 2*sizeof(Elf32_Phdr));
set_te32(&h3.ehdr.e_flags, e_flags);
h3.ehdr.e_ident[Elf32_Ehdr::EI_ABIVERSION] = e_flags>>24; h3.ehdr.e_ident[Elf32_Ehdr::EI_ABIVERSION] = e_flags>>24;
} }
else { else {
memcpy(&h3, stub_arm_linux_elf_fold, sizeof(Elf32_Ehdr) + 2*sizeof(Elf32_Phdr)); memcpy(&h3, stub_arm_linux_elf_fold, sizeof(Elf32_Ehdr) + 2*sizeof(Elf32_Phdr));
} }
set_te32(&h3.ehdr.e_flags, e_flags);
generateElfHdr(fo, &h3, getbrk(phdri, e_phnum) ); generateElfHdr(fo, &h3, getbrk(phdri, e_phnum) );
} }
void PackLinuxElf32armBe::pack1(OutputFile *fo, Filter &ft) void PackLinuxElf32armBe::pack1(OutputFile *fo, Filter &ft)
{ {
super::pack1(fo, ft); super::pack1(fo, ft);
unsigned const e_flags = get_te32(&ehdri.e_flags);
cprElfHdr3 h3; cprElfHdr3 h3;
memcpy(&h3, stub_armeb_linux_elf_fold, sizeof(Elf32_Ehdr) + 2*sizeof(Elf32_Phdr)); memcpy(&h3, stub_armeb_linux_elf_fold, sizeof(Elf32_Ehdr) + 2*sizeof(Elf32_Phdr));
set_te32(&h3.ehdr.e_flags, e_flags);
generateElfHdr(fo, &h3, getbrk(phdri, e_phnum) ); generateElfHdr(fo, &h3, getbrk(phdri, e_phnum) );
} }