From 3bda09e105721f70e2a682b2603703745bf5a8db Mon Sep 17 00:00:00 2001 From: John Reiser Date: Sun, 22 Apr 2007 20:04:13 -0700 Subject: [PATCH] more cleanup armel etc --- src/p_lx_elf.h | 6 +++--- src/p_vmlinx.cpp | 13 ------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/p_lx_elf.h b/src/p_lx_elf.h index fc8533d2..fe5feadd 100644 --- a/src/p_lx_elf.h +++ b/src/p_lx_elf.h @@ -417,8 +417,8 @@ public: PackLinuxElf32armLe(InputFile *f); virtual ~PackLinuxElf32armLe(); virtual int getFormat() const { return UPX_F_LINUX_ELF32_ARMEL; } - virtual const char *getName() const { return "linux/armLE"; } - virtual const char *getFullName(const options_t *) const { return "arm-linux.elf"; } + virtual const char *getName() const { return "linux/armel"; } + virtual const char *getFullName(const options_t *) const { return "armel-linux.elf"; } virtual const int *getFilters() const; protected: @@ -437,7 +437,7 @@ public: PackLinuxElf32armBe(InputFile *f); virtual ~PackLinuxElf32armBe(); virtual int getFormat() const { return UPX_F_LINUX_ELF32_ARMEB; } - virtual const char *getName() const { return "linux/armBE"; } + virtual const char *getName() const { return "linux/armeb"; } virtual const char *getFullName(const options_t *) const { return "armeb-linux.elf"; } virtual const int *getFilters() const; diff --git a/src/p_vmlinx.cpp b/src/p_vmlinx.cpp index 49d18fc4..bb0e14aa 100644 --- a/src/p_vmlinx.cpp +++ b/src/p_vmlinx.cpp @@ -559,11 +559,6 @@ const int *PackVmlinuxARMEB::getCompressionMethods(int method, int level) const return Packer::getDefaultCompressionMethods_8(method, level); } -const int *PackVmlinuxARMEB::getCompressionMethods(int method, int level) const -{ - return Packer::getDefaultCompressionMethods_8(method, level); -} - const int *PackVmlinuxARMEL::getFilters() const { @@ -788,14 +783,6 @@ void PackVmlinuxARMEB::defineDecompressorSymbols() linker->defineSymbol("METHOD", ph.method); } -void PackVmlinuxARMEB::defineDecompressorSymbols() -{ - super::defineDecompressorSymbols(); - linker->defineSymbol( "COMPRESSED_LENGTH", ph.c_len); - linker->defineSymbol("UNCOMPRESSED_LENGTH", ph.u_len); - linker->defineSymbol("METHOD", ph.method); -} - void PackVmlinuxI386::defineDecompressorSymbols() { super::defineDecompressorSymbols();