mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

Update source for previous rename.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer 2016-09-22 12:12:43 +02:00
parent 4c473acfec
commit aef54a4bfd
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/p_lx_elf.cpp
View File

@ -1211,19 +1211,19 @@ PackOpenBSDElf32x86::buildLoader(const Filter *ft)
} }
static const static const
#include "stub/armel-eabi-linux.elf-entry.h" #include "stub/arm.v5a-linux.elf-entry.h"
static const static const
#include "stub/armel-eabi-linux.elf-fold.h" #include "stub/arm.v5a-linux.elf-fold.h"
static const static const
#include "stub/arm.v5t-linux.shlib-init.h" #include "stub/arm.v5t-linux.shlib-init.h"
static const static const
#include "stub/arm-linux.elf-entry.h" #include "stub/arm.v4a-linux.elf-entry.h"
static const static const
#include "stub/arm-linux.elf-fold.h" #include "stub/arm.v4a-linux.elf-fold.h"
#if 0 #if 0
static const static const
#include "stub/arm-linux.shlib-init.h" #include "stub/arm.v4a-linux.shlib-init.h"
#endif #endif
static const static const
@ -1253,13 +1253,13 @@ PackLinuxElf32armLe::buildLoader(Filter const *ft)
return; return;
} }
buildLinuxLoader( buildLinuxLoader(
stub_armel_eabi_linux_elf_entry, sizeof(stub_armel_eabi_linux_elf_entry), stub_arm_v5a_linux_elf_entry, sizeof(stub_arm_v5a_linux_elf_entry),
stub_armel_eabi_linux_elf_fold, sizeof(stub_armel_eabi_linux_elf_fold), ft); stub_arm_v5a_linux_elf_fold, sizeof(stub_arm_v5a_linux_elf_fold), ft);
} }
else { else {
buildLinuxLoader( buildLinuxLoader(
stub_arm_linux_elf_entry, sizeof(stub_arm_linux_elf_entry), stub_arm_v4a_linux_elf_entry, sizeof(stub_arm_v4a_linux_elf_entry),
stub_arm_linux_elf_fold, sizeof(stub_arm_linux_elf_fold), ft); stub_arm_v4a_linux_elf_fold, sizeof(stub_arm_v4a_linux_elf_fold), ft);
} }
} }
@ -2427,12 +2427,12 @@ void PackLinuxElf32armLe::pack1(OutputFile *fo, Filter &ft)
unsigned const e_flags = get_te32(&ehdri.e_flags); 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) {
memcpy(&h3, stub_armel_eabi_linux_elf_fold, sizeof(Elf32_Ehdr) + 2*sizeof(Elf32_Phdr)); memcpy(&h3, stub_arm_v5a_linux_elf_fold, sizeof(Elf32_Ehdr) + 2*sizeof(Elf32_Phdr));
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_v4a_linux_elf_fold, sizeof(Elf32_Ehdr) + 2*sizeof(Elf32_Phdr));
} }
// Fighting over .e_ident[EI_ABIVERSION]: Debian armhf is latest culprit. // Fighting over .e_ident[EI_ABIVERSION]: Debian armhf is latest culprit.
// So copy from input to output; but see PackLinuxElf32::generateElfHdr // So copy from input to output; but see PackLinuxElf32::generateElfHdr