From f7751684afffd4c2c5b0e9d71798ec7dc3245ec3 Mon Sep 17 00:00:00 2001 From: John Reiser Date: Sun, 5 Feb 2017 13:26:02 -0800 Subject: [PATCH] Stubs LZMA_DEC00 and LZMA_ELF00 fall through; no "+80C" alignment. addStubEntrySections() and getDecompressorSections() modified: p_lx_elf.cpp modified: p_mach.cpp modified: packer_c.cpp --- src/p_lx_elf.cpp | 2 +- src/p_mach.cpp | 8 ++++---- src/packer_c.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp index f1c4dfa4..ab75311a 100644 --- a/src/p_lx_elf.cpp +++ b/src/p_lx_elf.cpp @@ -528,7 +528,7 @@ PackLinuxElf::addStubEntrySections(Filter const *) ( M_IS_NRV2E(ph.method) ? "NRV_HEAD,NRV2E,NRV_TAIL" : M_IS_NRV2D(ph.method) ? "NRV_HEAD,NRV2D,NRV_TAIL" : M_IS_NRV2B(ph.method) ? "NRV_HEAD,NRV2B,NRV_TAIL" - : M_IS_LZMA(ph.method) ? "LZMA_ELF00,+80C,LZMA_DEC20,LZMA_DEC30" + : M_IS_LZMA(ph.method) ? "LZMA_ELF00,LZMA_DEC20,LZMA_DEC30" : NULL), NULL); if (hasLoaderSection("CFLUSH")) addLoader("CFLUSH"); diff --git a/src/p_mach.cpp b/src/p_mach.cpp index 93c943f0..d912539a 100644 --- a/src/p_mach.cpp +++ b/src/p_mach.cpp @@ -366,7 +366,7 @@ void PackMachAMD64::addStubEntrySections(Filter const * /*ft*/) ( M_IS_NRV2E(ph.method) ? "NRV_HEAD,NRV2E,NRV_TAIL" : M_IS_NRV2D(ph.method) ? "NRV_HEAD,NRV2D,NRV_TAIL" : M_IS_NRV2B(ph.method) ? "NRV_HEAD,NRV2B,NRV_TAIL" - : M_IS_LZMA(ph.method) ? "LZMA_ELF00,+80C,LZMA_DEC20,LZMA_DEC30" + : M_IS_LZMA(ph.method) ? "LZMA_ELF00,LZMA_DEC20,LZMA_DEC30" : NULL), NULL); if (hasLoaderSection("CFLUSH")) addLoader("CFLUSH"); @@ -390,7 +390,7 @@ void PackMachPPC32::addStubEntrySections(Filter const * /*ft*/) ( M_IS_NRV2E(ph.method) ? "NRV_HEAD,NRV2E,NRV_TAIL" : M_IS_NRV2D(ph.method) ? "NRV_HEAD,NRV2D,NRV_TAIL" : M_IS_NRV2B(ph.method) ? "NRV_HEAD,NRV2B,NRV_TAIL" - : M_IS_LZMA(ph.method) ? "LZMA_ELF00,+80C,LZMA_DEC20,LZMA_DEC30" + : M_IS_LZMA(ph.method) ? "LZMA_ELF00,LZMA_DEC20,LZMA_DEC30" : NULL), NULL); if (hasLoaderSection("CFLUSH")) addLoader("CFLUSH"); @@ -408,7 +408,7 @@ void PackMachARMEL::addStubEntrySections(Filter const * /*ft*/) ( M_IS_NRV2E(ph.method) ? "NRV_HEAD,NRV2E,NRV_TAIL" : M_IS_NRV2D(ph.method) ? "NRV_HEAD,NRV2D,NRV_TAIL" : M_IS_NRV2B(ph.method) ? "NRV_HEAD,NRV2B,NRV_TAIL" - : M_IS_LZMA(ph.method) ? "LZMA_ELF00,+80C,LZMA_DEC20,LZMA_DEC30" + : M_IS_LZMA(ph.method) ? "LZMA_ELF00,LZMA_DEC20,LZMA_DEC30" : NULL), NULL); if (hasLoaderSection("CFLUSH")) addLoader("CFLUSH"); @@ -423,7 +423,7 @@ void PackMachARM64EL::addStubEntrySections(Filter const * /*ft*/) ( M_IS_NRV2E(ph.method) ? "NRV_HEAD,NRV2E,NRV_TAIL" : M_IS_NRV2D(ph.method) ? "NRV_HEAD,NRV2D,NRV_TAIL" : M_IS_NRV2B(ph.method) ? "NRV_HEAD,NRV2B,NRV_TAIL" - : M_IS_LZMA(ph.method) ? "LZMA_ELF00,+80C,LZMA_DEC20,LZMA_DEC30" + : M_IS_LZMA(ph.method) ? "LZMA_ELF00,LZMA_DEC20,LZMA_DEC30" : NULL), NULL); if (hasLoaderSection("CFLUSH")) addLoader("CFLUSH"); diff --git a/src/packer_c.cpp b/src/packer_c.cpp index cee10b53..37ec04fe 100644 --- a/src/packer_c.cpp +++ b/src/packer_c.cpp @@ -190,11 +190,11 @@ const char *Packer::getDecompressorSections() const static const char lzma_small[] = "LZMA_DEC00,LZMA_DEC10,LZMA_DEC30"; static const char lzma_fast[] = - "LZMA_DEC00,+80C,LZMA_DEC20,LZMA_DEC30"; + "LZMA_DEC00,LZMA_DEC20,LZMA_DEC30"; static const char lzma_elf_small[] = "LZMA_ELF00,LZMA_DEC10,LZMA_DEC30"; static const char lzma_elf_fast[] = - "LZMA_ELF00,+80C,LZMA_DEC20,LZMA_DEC30"; + "LZMA_ELF00,LZMA_DEC20,LZMA_DEC30"; if (ph.method == M_NRV2B_LE32) return opt->small ? nrv2b_le32_small : nrv2b_le32_fast;