From 497441b54edbbac03e536b28ae06d5353980455f Mon Sep 17 00:00:00 2001
From: John Reiser <jreiser@BitWagon.com>
Date: Sun, 22 Apr 2007 16:19:13 -0700
Subject: [PATCH] merge

---
 src/conf.h       | 2 +-
 src/p_lx_elf.h   | 2 +-
 src/p_vmlinx.h   | 6 +++---
 src/packer_c.cpp | 4 ++--
 src/packmast.cpp | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/conf.h b/src/conf.h
index 65e1cfb6..62a51821 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -448,7 +448,7 @@ private:
 #define UPX_F_LINUX_ELFI_i386   20
 #define UPX_F_WINCE_ARM_PE      21
 #define UPX_F_LINUX_ELF64_AMD   22
-#define UPX_F_LINUX_ELF32_ARMLE 23
+#define UPX_F_LINUX_ELF32_ARMEL 23
 #define UPX_F_BSD_i386          24
 #define UPX_F_BSD_ELF_i386      25
 #define UPX_F_BSD_SH_i386       26
diff --git a/src/p_lx_elf.h b/src/p_lx_elf.h
index dbf45bd1..fc8533d2 100644
--- a/src/p_lx_elf.h
+++ b/src/p_lx_elf.h
@@ -416,7 +416,7 @@ class PackLinuxElf32armLe : public PackLinuxElf32Le
 public:
     PackLinuxElf32armLe(InputFile *f);
     virtual ~PackLinuxElf32armLe();
-    virtual int getFormat() const { return UPX_F_LINUX_ELF32_ARMLE; }
+    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 int *getFilters() const;
diff --git a/src/p_vmlinx.h b/src/p_vmlinx.h
index f9c28a4e..7d085dd2 100644
--- a/src/p_vmlinx.h
+++ b/src/p_vmlinx.h
@@ -125,8 +125,8 @@ class PackVmlinuxARM : public PackVmlinuxBase<ElfClass_LE32>
 public:
     PackVmlinuxARM(InputFile *f) : super(f, Ehdr::EM_ARM,
         Ehdr::ELFCLASS32, Ehdr::ELFDATA2LSB, "decompress_kernel") { }
-    virtual int getFormat() const { return UPX_F_VMLINUX_ARM; }
-    virtual const char *getName() const { return "vmlinux/ARM"; }
+    virtual int getFormat() const { return UPX_F_VMLINUX_ARMEL; }
+    virtual const char *getName() const { return "vmlinux/armel"; }
     virtual const char *getFullName(const options_t *) const { return "arm-linux.kernel.vmlinux"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
@@ -150,7 +150,7 @@ public:
     PackVmlinuxARMEB(InputFile *f) : super(f, Ehdr::EM_ARM,
         Ehdr::ELFCLASS32, Ehdr::ELFDATA2MSB, "decompress_kernel") { }
     virtual int getFormat() const { return UPX_F_VMLINUX_ARMEB; }
-    virtual const char *getName() const { return "vmlinux/ARMEB"; }
+    virtual const char *getName() const { return "vmlinux/armeb"; }
     virtual const char *getFullName(const options_t *) const { return "armbe-linux.kernel.vmlinux"; }
     virtual const int *getCompressionMethods(int method, int level) const;
     virtual const int *getFilters() const;
diff --git a/src/packer_c.cpp b/src/packer_c.cpp
index c14c8428..1862fd24 100644
--- a/src/packer_c.cpp
+++ b/src/packer_c.cpp
@@ -208,7 +208,7 @@ const char *Packer::getDecompressorSections() const
         if (UPX_F_LINUX_ELF_i386   ==ph.format
         ||  UPX_F_LINUX_ELFI_i386  ==ph.format
         ||  UPX_F_LINUX_ELF64_AMD  ==ph.format
-        ||  UPX_F_LINUX_ELF32_ARMLE==ph.format
+        ||  UPX_F_LINUX_ELF32_ARMEL==ph.format
         ||  UPX_F_LINUX_ELFPPC32   ==ph.format
         ||  UPX_F_LINUX_ELF32_ARMEB==ph.format
         ||  UPX_F_BSD_ELF_i386     ==ph.format
@@ -245,7 +245,7 @@ void Packer::defineDecompressorSymbols()
     if (UPX_F_LINUX_ELF_i386   ==ph.format
     ||  UPX_F_LINUX_ELFI_i386  ==ph.format
     ||  UPX_F_LINUX_ELF64_AMD  ==ph.format
-    ||  UPX_F_LINUX_ELF32_ARMLE==ph.format
+    ||  UPX_F_LINUX_ELF32_ARMEL==ph.format
     ||  UPX_F_LINUX_ELFPPC32   ==ph.format
     ||  UPX_F_LINUX_ELF32_ARMEB==ph.format
     ||  UPX_F_BSD_ELF_i386     ==ph.format
diff --git a/src/packmast.cpp b/src/packmast.cpp
index d77419b1..efaa1194 100644
--- a/src/packmast.cpp
+++ b/src/packmast.cpp
@@ -192,7 +192,7 @@ Packer* PackMaster::visitAllPackers(visit_func_t func, InputFile *f, const optio
     //
     // linux kernel
     //
-    if ((p = func(new PackVmlinuxARM(f), user)) != NULL)
+    if ((p = func(new PackVmlinuxARMEL(f), user)) != NULL)
         return p;
     if ((p = func(new PackVmlinuxARMEB(f), user)) != NULL)
         return p;