merge

src/bele.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_BELE_H
-#define __UPX_BELE_H
+#define __UPX_BELE_H 1
 
 
 /*************************************************************************
@@ -543,7 +543,7 @@ int __acc_cdecl_qsort le64_compare_signed(const void *, const void *);
 
 
 // just for testing...
-#if !defined(ACC_CFG_NO_UNALIGNED)
+#if !(ACC_CFG_NO_UNALIGNED)
 #if 0 && (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_CC_GNUC >= 0x030200)
    typedef acc_uint16e_t LE16_unaligned __attribute__((__aligned__(1)));
    typedef acc_uint32e_t LE32_unaligned __attribute__((__aligned__(1)));

src/bele_policy.h

@@ -39,7 +39,7 @@
    // CTP - Compile-Time Polymorphism (templates)
 #  define V     static inline
 #  define S     static int __acc_cdecl_qsort
-#  define C
+#  define C     /*empty*/
 #elif defined(BELE_RTP)
    // RTP - Run-Time Polymorphism (virtual functions)
 #  define V     virtual

src/bptr.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_BPTR_H
-#define __UPX_BPTR_H
+#define __UPX_BPTR_H 1
 
 
 /*************************************************************************

src/c_file.cpp

@@ -28,7 +28,7 @@
 
 #include "conf.h"
 
-#if defined(USE_CONSOLE)
+#if (USE_CONSOLE)
 
 /*************************************************************************
 //

src/c_init.cpp

@@ -30,7 +30,7 @@
 
 FILE *con_term = NULL;
 
-#if defined(USE_CONSOLE)
+#if (USE_CONSOLE)
 
 /*************************************************************************
 //
@@ -84,14 +84,14 @@ static int do_init(FILE *f)
     if (!acc_isatty(STDIN_FILENO) || !acc_isatty(STDOUT_FILENO) || !acc_isatty(STDERR_FILENO))
         return con_mode;
 
-#if defined(USE_ANSI)
+#if (USE_ANSI)
     try_init(&console_ansi_mono,f);
     try_init(&console_ansi_color,f);
 #endif
-#if defined(USE_SCREEN)
+#if (USE_SCREEN)
     try_init(&console_screen,f);
 #endif
-#if defined(USE_AALIB)
+#if (USE_AALIB)
     try_init(&console_aalib,f);
 #endif
 

src/c_none.cpp

@@ -28,7 +28,7 @@
 
 #include "conf.h"
 
-#if defined(USE_CONSOLE)
+#if (USE_CONSOLE)
 
 /*************************************************************************
 //

src/c_screen.cpp

@@ -28,7 +28,7 @@
 
 #include "conf.h"
 
-#if defined(USE_SCREEN)
+#if (USE_SCREEN)
 
 #include "screen.h"
 
@@ -130,15 +130,15 @@ static int init(FILE *f, int o, int now)
     if (!screen)
         screen = do_construct(screen_djgpp2_construct(),fd);
 #endif
-#if defined(USE_SCREEN_WIN32)
+#if (USE_SCREEN_WIN32)
     if (!screen)
         screen = do_construct(screen_win32_construct(),fd);
 #endif
-#if defined(USE_SCREEN_VCSA)
+#if (USE_SCREEN_VCSA)
     if (!screen)
         screen = do_construct(screen_vcsa_construct(),fd);
 #endif
-#if defined(USE_SCREEN_CURSES)
+#if (USE_SCREEN_CURSES)
     if (!screen && o == CON_SCREEN)
         screen = do_construct(screen_curses_construct(),fd);
 #endif
@@ -298,7 +298,7 @@ static void print0(FILE *f, const char *ss)
 static bool intro(FILE *f)
 {
     UNUSED(f);
-#if defined(USE_FRAMES)
+#if (USE_FRAMES)
     if (screen->intro)
         return screen->intro(screen,screen_show_frames);
 #endif

src/compress.cpp

@@ -43,7 +43,7 @@ unsigned upx_adler32(const void *buf, unsigned len, unsigned adler)
     assert(buf != NULL);
 #if 0
     return adler32(adler, (const Bytef *) buf, len); // zlib
-#elif defined(WITH_UCL)
+#elif (WITH_UCL)
     return ucl_adler32(adler, (const ucl_bytep) buf, len);
 #else
 #  error
@@ -59,7 +59,7 @@ unsigned upx_crc32(const void *buf, unsigned len, unsigned crc)
     assert(buf != NULL);
 #if 0
     return crc32(crc, (const Bytef *) buf, len); // zlib
-#elif defined(WITH_UCL)
+#elif (WITH_UCL)
     return ucl_crc32(crc, (const ucl_bytep) buf, len);
 #else
 #  error
@@ -108,17 +108,17 @@ int upx_compress           ( const upx_bytep src, unsigned  src_len,
 
     if (0) {
     }
-#if defined(WITH_LZMA)
+#if (WITH_LZMA)
     else if (M_IS_LZMA(method))
         r = upx_lzma_compress(src, src_len, dst, dst_len,
                               cb, method, level, cconf, cresult);
 #endif
-#if defined(WITH_NRV)
+#if (WITH_NRV)
     else if (M_IS_NRV2B(method) || M_IS_NRV2D(method) || M_IS_NRV2E(method))
         r = upx_nrv_compress(src, src_len, dst, dst_len,
                              cb, method, level, cconf, cresult);
 #endif
-#if defined(WITH_UCL)
+#if (WITH_UCL)
     else if (M_IS_NRV2B(method) || M_IS_NRV2D(method) || M_IS_NRV2E(method))
         r = upx_ucl_compress(src, src_len, dst, dst_len,
                              cb, method, level, cconf, cresult);
@@ -154,19 +154,19 @@ int upx_decompress         ( const upx_bytep src, unsigned  src_len,
 
     if (0) {
     }
-#if defined(WITH_LZMA)
+#if (WITH_LZMA)
     else if (M_IS_LZMA(method))
         r = upx_lzma_decompress(src, src_len, dst, dst_len, method, cresult);
 #endif
-#if defined(WITH_NRV)
+#if (WITH_NRV)
     else if (M_IS_NRV2B(method) || M_IS_NRV2D(method) || M_IS_NRV2E(method))
         r = upx_nrv_decompress(src, src_len, dst, dst_len, method, cresult);
 #endif
-#if defined(WITH_UCL)
+#if (WITH_UCL)
     else if (M_IS_NRV2B(method) || M_IS_NRV2D(method) || M_IS_NRV2E(method))
         r = upx_ucl_decompress(src, src_len, dst, dst_len, method, cresult);
 #endif
-#if defined(WITH_ZLIB)
+#if (WITH_ZLIB)
     else if (M_IS_DEFLATE(method))
         r = upx_zlib_decompress(src, src_len, dst, dst_len, method, cresult);
 #endif
@@ -201,15 +201,15 @@ int upx_test_overlap       ( const upx_bytep buf,
 
     if (0) {
     }
-#if defined(WITH_LZMA)
+#if (WITH_LZMA)
     else if (M_IS_LZMA(method))
         r = upx_lzma_test_overlap(buf, tbuf, src_off, src_len, dst_len, method, cresult);
 #endif
-#if defined(WITH_NRV)
+#if (WITH_NRV)
     else if (M_IS_NRV2B(method) || M_IS_NRV2D(method) || M_IS_NRV2E(method))
         r = upx_nrv_test_overlap(buf, tbuf, src_off, src_len, dst_len, method, cresult);
 #endif
-#if defined(WITH_UCL)
+#if (WITH_UCL)
     else if (M_IS_NRV2B(method) || M_IS_NRV2D(method) || M_IS_NRV2E(method))
         r = upx_ucl_test_overlap(buf, tbuf, src_off, src_len, dst_len, method, cresult);
 #endif

src/compress.h

@@ -27,14 +27,14 @@
 
 
 #ifndef __UPX_COMPRESS_H
-#define __UPX_COMPRESS_H
+#define __UPX_COMPRESS_H 1
 
 
 /*************************************************************************
 //
 **************************************************************************/
 
-#if defined(WITH_LZMA)
+#if (WITH_LZMA)
 const char *upx_lzma_version_string(void);
 int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned* dst_len,
@@ -55,7 +55,7 @@ int upx_lzma_test_overlap  ( const upx_bytep buf,
 #endif
 
 
-#if defined(WITH_NRV)
+#if (WITH_NRV)
 const char *upx_nrv_version_string(void);
 int upx_nrv_compress       ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned* dst_len,
@@ -76,7 +76,7 @@ int upx_nrv_test_overlap   ( const upx_bytep buf,
 #endif
 
 
-#if defined(WITH_UCL)
+#if (WITH_UCL)
 const char *upx_ucl_version_string(void);
 int upx_ucl_compress       ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned* dst_len,
@@ -96,7 +96,8 @@ int upx_ucl_test_overlap   ( const upx_bytep buf,
                              const upx_compress_result_t *cresult );
 #endif
 
-#if defined(WITH_ZLIB)
+
+#if (WITH_ZLIB)
 const char *upx_zlib_version_string(void);
 int upx_zlib_compress      ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned* dst_len,

src/compress_lzma.cpp

@@ -47,7 +47,7 @@ void lzma_compress_config_t::reset()
 }
 
 
-#if !defined(WITH_LZMA)
+#if !(WITH_LZMA)
 extern int compress_lzma_dummy;
 int compress_lzma_dummy = 0;
 #else
@@ -291,7 +291,7 @@ int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
     unsigned char props_buf[LZMA_PROPS_SIZE];
     SizeT props_buf_size; props_buf_size = LZMA_PROPS_SIZE;
 
-#if defined(USE_LZMA_PROPERTIES)
+#if (USE_LZMA_PROPERTIES)
     if (dst_avail < 1)
         goto error;
     dst[0] = 0; // filled below
@@ -312,7 +312,7 @@ int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
     assert(x_len <= dst_avail);
     *dst_len += x_len;
     if (rh == SZ_OK) {
-#if defined(USE_LZMA_PROPERTIES)
+#if (USE_LZMA_PROPERTIES)
         dst[-1] = props_buf[0];
 #endif
         r = UPX_E_OK;
@@ -513,7 +513,7 @@ int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
         goto error;
     }
     assert(os.b_pos == 5);
-#if defined(USE_LZMA_PROPERTIES)
+#if (USE_LZMA_PROPERTIES)
     os.b_pos = 1;
 #else
     os.b_pos = 0;
@@ -586,7 +586,7 @@ int upx_lzma_decompress    ( const upx_bytep src, unsigned  src_len,
     SRes rh;
     ELzmaStatus status;
 
-#if defined(USE_LZMA_PROPERTIES)
+#if (USE_LZMA_PROPERTIES)
     rh = LzmaProps_Decode(&s.Properties, src, src_len);
     if (rh != 0)
         goto error;
@@ -684,7 +684,7 @@ int upx_lzma_decompress    ( const upx_bytep src, unsigned  src_len,
     int r = UPX_E_ERROR;
     int rh;
 
-#if defined(USE_LZMA_PROPERTIES)
+#if (USE_LZMA_PROPERTIES)
     if (src_len < 2)
         goto error;
     rh = LzmaDecodeProperties(&s.Properties, src, src_len);

src/compress_ucl.cpp

@@ -28,23 +28,23 @@
 
 #include "conf.h"
 #include "compress.h"
-#if !defined(WITH_UCL)
+#if !(WITH_UCL)
 extern int compress_ucl_dummy;
 int compress_ucl_dummy = 0;
 #else
 
-#if 1 && !defined(UCL_USE_ASM) && (ACC_ARCH_I386)
+#if 1 && !(UCL_USE_ASM) && (ACC_ARCH_I386)
 #  if (ACC_CC_GNUC || ACC_CC_INTELC || ACC_CC_MSC || ACC_CC_WATCOMC)
-#    define UCL_USE_ASM
+#    define UCL_USE_ASM 1
 #  endif
 #endif
-#if defined(UCL_NO_ASM)
+#if (UCL_NO_ASM)
 #  undef UCL_USE_ASM
 #endif
-#if defined(ACC_CFG_NO_UNALIGNED)
+#if (ACC_CFG_NO_UNALIGNED)
 #  undef UCL_USE_ASM
 #endif
-#if 1 && defined(UCL_USE_ASM)
+#if 1 && (UCL_USE_ASM)
 #  include <ucl/ucl_asm.h>
 #  define ucl_nrv2b_decompress_safe_8       ucl_nrv2b_decompress_asm_safe_8
 #  define ucl_nrv2b_decompress_safe_le16    ucl_nrv2b_decompress_asm_safe_le16

src/compress_zlib.cpp

@@ -41,7 +41,7 @@ void zlib_compress_config_t::reset()
 }
 
 
-#if !defined(WITH_ZLIB)
+#if !(WITH_ZLIB)
 extern int compress_zlib_dummy;
 int compress_zlib_dummy = 0;
 #else

src/conf.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_CONF_H
-#define __UPX_CONF_H
+#define __UPX_CONF_H 1
 
 #include "version.h"
 
@@ -167,10 +167,10 @@
 #undef linux
 #undef small
 #undef tos
-#if defined(ACC_CC_DMC)
+#if (ACC_CC_DMC)
 #  undef tell
 #endif
-#if !defined(ACC_CC_PGI)
+#if !(ACC_CC_PGI)
 #  undef unix
 #endif
 #if defined(__DJGPP__)
@@ -189,14 +189,14 @@
 #  undef WITH_LZMA
 #endif
 #if defined(UPX_OFFICIAL_BUILD)
-#  if !defined(WITH_LZMA) || !defined(WITH_NRV) || !defined(WITH_UCL)
+#  if !(WITH_LZMA) || !(WITH_NRV) || !(WITH_UCL)
 #    error
 #  endif
 #endif
-#if defined(WITH_NRV)
+#if (WITH_NRV)
 #  include <nrv/nrvconf.h>
 #endif
-#if defined(WITH_UCL)
+#if (WITH_UCL)
 #  define ucl_compress_config_t REAL_ucl_compress_config_t
 #  include <ucl/uclconf.h>
 #  include <ucl/ucl.h>
@@ -206,11 +206,6 @@
 #  undef ucl_compress_config_t
 #  undef ucl_compress_config_p
 #endif
-#if !defined(__UPX_CHECKER)
-#  if defined(__UCL_CHECKER) || defined(__NRV_CHECKER)
-#    define __UPX_CHECKER
-#  endif
-#endif
 #if !defined(UINT_MAX) || (UINT_MAX < 0xffffffffL)
 #  error "UINT_MAX"
 #endif
@@ -224,7 +219,7 @@
 **************************************************************************/
 
 // malloc debuggers
-#if defined(WITH_VALGRIND)
+#if (WITH_VALGRIND)
 #  include <valgrind/memcheck.h>
 #endif
 
@@ -263,11 +258,11 @@
 #endif
 
 
-#if !defined(HAVE_STRCASECMP) && defined(HAVE_STRICMP)
+#if !(HAVE_STRCASECMP) && (HAVE_STRICMP)
-#  define strcasecmp      stricmp
+#  define strcasecmp        stricmp
 #endif
-#if !defined(HAVE_STRNCASECMP) && defined(HAVE_STRNICMP)
+#if !(HAVE_STRNCASECMP) && (HAVE_STRNICMP)
-#  define strncasecmp     strnicmp
+#  define strncasecmp       strnicmp
 #endif
 
 

src/console.h

@@ -39,41 +39,41 @@
 #undef USE_SCREEN_WIN32
 #undef USE_FRAMES
 
-#if defined(WITH_GUI) && !defined(NO_CONSOLE)
+#if 1 && (WITH_GUI) && !defined(NO_CONSOLE)
-#  define NO_CONSOLE
+#  define NO_CONSOLE 1
 #endif
 
 #if 1 && defined(__linux__)
-#  define USE_SCREEN
+#  define USE_SCREEN 1
-#  define USE_SCREEN_VCSA
+#  define USE_SCREEN_VCSA 1
-#  if !defined(HAVE_LINUX_KD_H)
+#  if !(HAVE_LINUX_KD_H)
 #    undef USE_SCREEN
 #    undef USE_SCREEN_VCSA
 #  endif
-#  if !defined(HAVE_LINUX_KDEV_T_H) || !defined(HAVE_LINUX_MAJOR_H)
+#  if !(HAVE_LINUX_KDEV_T_H) || !(HAVE_LINUX_MAJOR_H)
 #    undef USE_SCREEN
 #    undef USE_SCREEN_VCSA
 #  endif
 #endif
 
 #if 1 && defined(__DJGPP__)
-#  define USE_SCREEN
+#  define USE_SCREEN 1
 #elif 1 && (ACC_OS_CYGWIN || ACC_OS_WIN32 || ACC_OS_WIN64)
-#  define USE_SCREEN
+#  define USE_SCREEN 1
-#  define USE_SCREEN_WIN32
+#  define USE_SCREEN_WIN32 1
 #elif 1 && (ACC_OS_EMX && defined(__RSXNT__))
-#  define USE_SCREEN
+#  define USE_SCREEN 1
-#  define USE_SCREEN_WIN32
+#  define USE_SCREEN_WIN32 1
 #endif
 
 
-#if 0 || defined(NO_ANSI)
+#if 0 || (NO_ANSI)
 #  undef USE_ANSI
 #endif
-#if 0 || defined(NO_SCREEN)
+#if 0 || (NO_SCREEN)
 #  undef USE_SCREEN
 #endif
-#if 0 || defined(NO_FRAMES) || !defined(USE_SCREEN)
+#if 0 || (NO_FRAMES) || !(USE_SCREEN)
 #  undef USE_FRAMES
 #endif
 #if 1
@@ -81,11 +81,11 @@
 #endif
 
 
-#if 0 || defined(USE_ANSI) || defined(USE_SCREEN)
+#if 0 || (USE_ANSI) || (USE_SCREEN)
-#  define USE_CONSOLE
+#  define USE_CONSOLE 1
 #endif
 
-#if 0 || defined(NO_CONSOLE) || !defined(USE_CONSOLE)
+#if 0 || (NO_CONSOLE) || !(USE_CONSOLE)
 #  undef USE_CONSOLE
 #  undef USE_ANSI
 #  undef USE_SCREEN
@@ -110,7 +110,7 @@ enum {
 };
 
 
-#if defined(USE_CONSOLE)
+#if (USE_CONSOLE)
 
 typedef struct
 {
@@ -165,7 +165,7 @@ void __acc_cdecl_va con_fprintf(FILE *f, const char *format, ...);
 
 extern FILE *con_term;
 
-#if defined(USE_CONSOLE)
+#if (USE_CONSOLE)
 
 extern int con_mode;
 extern console_t *con;

src/except.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_EXCEPT_H
-#define __UPX_EXCEPT_H
+#define __UPX_EXCEPT_H 1
 
 #ifdef __cplusplus
 
@@ -204,7 +204,7 @@ public:
 // (noreturn) is probably not the correct semantics for throwing exceptions
 #define NORET __attribute__((__noreturn__))
 #else
-#define NORET
+#define NORET /*empty*/
 #endif
 
 void throwCantPack(const char *msg) NORET;

src/file.cpp

@@ -37,7 +37,7 @@
 
 void File::chmod(const char *name, int mode)
 {
-#if defined(HAVE_CHMOD)
+#if (HAVE_CHMOD)
     if (::chmod(name,mode) != 0)
         throwIOException(name,errno);
 #else

src/file.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_FILE_H
-#define __UPX_FILE_H
+#define __UPX_FILE_H 1
 
 class MemBuffer;
 

src/filter.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_FILTER_H
-#define __UPX_FILTER_H
+#define __UPX_FILTER_H 1
 
 class Filter;
 class FilterImp;

src/help.cpp

@@ -310,13 +310,13 @@ void show_help(int verbose)
 //                "\nUPX comes with ABSOLUTELY NO WARRANTY; for details type 'upx -L'.\n"
                 "");
 
-#if defined(DEBUG) || defined(TESTING)
+#if (DEBUG) || (TESTING)
     fg = con_fg(f,FG_RED);
     con_fprintf(f,"\nWARNING: this version is compiled with"
-#if defined(DEBUG)
+#if (DEBUG)
                 " -DDEBUG"
 #endif
-#if defined(TESTING)
+#if (TESTING)
                 " -DTESTING"
 #endif
                 "\n");
@@ -380,22 +380,22 @@ void show_version(int x)
     UNUSED(v);
 
     fprintf(fp, "upx %s\n", UPX_VERSION_STRING);
-#if defined(WITH_NRV)
+#if (WITH_NRV)
     v = upx_nrv_version_string();
     if (v != NULL && v[0])
         fprintf(fp, "NRV data compression library %s\n", v);
 #endif
-#if defined(WITH_UCL)
+#if (WITH_UCL)
     v = upx_ucl_version_string();
     if (v != NULL && v[0])
         fprintf(fp, "UCL data compression library %s\n", v);
 #endif
-#if defined(WITH_ZLIB)
+#if (WITH_ZLIB)
     v = upx_zlib_version_string();
     if (v != NULL && v[0])
         fprintf(fp, "zlib data compression library %s\n", v);
 #endif
-#if defined(WITH_LZMA)
+#if (WITH_LZMA)
     v = upx_lzma_version_string();
     if (v != NULL && v[0])
         fprintf(fp, "LZMA SDK version %s\n", v);
@@ -404,10 +404,10 @@ void show_version(int x)
     fprintf(fp, "Copyright (C) 1996-2010 Laszlo Molnar\n");
     fprintf(fp, "Copyright (C) 2000-2010 John F. Reiser\n");
     fprintf(fp, "Copyright (C) 2002-2010 Jens Medoch\n");
-#if defined(WITH_ZLIB)
+#if (WITH_ZLIB)
     fprintf(fp, "Copyright (C) 1995" "-2005 Jean-loup Gailly and Mark Adler\n");
 #endif
-#if defined(WITH_LZMA)
+#if (WITH_LZMA)
     fprintf(fp, "Copyright (C) 1999" "-2006 Igor Pavlov\n");
 #endif
     fprintf(fp, "UPX comes with ABSOLUTELY NO WARRANTY; for details type '%s -L'.\n", progname);

src/lefile.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_LEFILE_H
-#define __UPX_LEFILE_H
+#define __UPX_LEFILE_H 1
 
 class InputFile;
 class OutputFile;

src/linker.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_LINKER_H
-#define __UPX_LINKER_H
+#define __UPX_LINKER_H 1
 
 
 /*************************************************************************

src/main.cpp

@@ -27,7 +27,6 @@
 
 
 #include "conf.h"
-#include "mygetopt.h"
 #include "file.h"
 #include "packer.h"
 #include "p_elf.h"
@@ -63,7 +62,7 @@ void options_t::reset()
     o->console = CON_FILE;
 #if defined(__DJGPP__)
     o->console = CON_INIT;
-#elif defined(USE_SCREEN_WIN32)
+#elif (USE_SCREEN_WIN32)
     o->console = CON_INIT;
 #elif 1 && defined(__linux__)
     o->console = CON_INIT;
@@ -90,6 +89,19 @@ static int done_script_name = 0;
 const char *argv0 = "";
 const char *progname = "";
 
+static acc_getopt_t mfx_getopt;
+#define mfx_optarg      mfx_getopt.optarg
+#define mfx_optind      mfx_getopt.optind
+#define mfx_option      acc_getopt_longopt_t
+static void handle_opterr(acc_getopt_p g, const char *f, void *v)
+{
+    struct A { va_list ap; };
+    struct A *a = (struct A *) v;
+    fprintf( stderr, "%s: ", g->progname);
+    vfprintf(stderr, f, a->ap);
+    fprintf( stderr, "\n");
+}
+
 
 static int num_files = -1;
 static int exit_code = EXIT_OK;
@@ -1061,13 +1073,14 @@ static const struct mfx_option longopts[] =
 };
 
     int optc, longind;
-    char buf[256];
+    char shortopts[256];
 
-    prepare_shortopts(buf,"123456789hH?V",longopts),
+    prepare_shortopts(shortopts, "123456789hH?V", longopts),
-    mfx_optind = 0;
+    acc_getopt_init(&mfx_getopt, 1, argc, argv);
-    mfx_opterr = 1;
+    mfx_getopt.progname = progname;
+    mfx_getopt.opterr = handle_opterr;
     opt->o_unix.osabi0 = Elf32_Ehdr::ELFOSABI_LINUX;
-    while ((optc = mfx_getopt_long(argc, argv, buf, longopts, &longind)) >= 0)
+    while ((optc = acc_getopt(&mfx_getopt, shortopts, longopts, &longind)) >= 0)
     {
         if (do_option(optc, argv[mfx_optind-1]) != 0)
             e_usage();
@@ -1153,7 +1166,7 @@ static const struct mfx_option longopts[] =
     int targc;
     char **targv = NULL;
     static const char sep[] = " \t";
-    char buf[256];
+    char shortopts[256];
 
     var = getenv(OPTIONS_VAR);
     if (var == NULL || !var[0])
@@ -1209,10 +1222,11 @@ static const struct mfx_option longopts[] =
             e_envopt(targv[i]);
 
     /* handle options */
-    prepare_shortopts(buf,"123456789",longopts);
+    prepare_shortopts(shortopts, "123456789", longopts);
-    mfx_optind = 0;
+    acc_getopt_init(&mfx_getopt, 1, targc, targv);
-    mfx_opterr = 1;
+    mfx_getopt.progname = progname;
-    while ((optc = mfx_getopt_long(targc, targv, buf, longopts, &longind)) >= 0)
+    mfx_getopt.opterr = handle_opterr;
+    while ((optc = acc_getopt(&mfx_getopt, shortopts, longopts, &longind)) >= 0)
     {
         if (do_option(optc, targv[mfx_optind-1]) != 0)
             e_envopt(NULL);
@@ -1405,7 +1419,7 @@ void upx_sanity_check(void)
 // main entry point
 **************************************************************************/
 
-#if !defined(WITH_GUI)
+#if !(WITH_GUI)
 
 #if (ACC_ARCH_M68K && ACC_OS_TOS && ACC_CC_GNUC) && defined(__MINT__)
 extern "C" { extern long _stksize; long _stksize = 256 * 1024L; }
@@ -1455,7 +1469,7 @@ int __acc_cdecl_main main(int argc, char *argv[])
 
     set_term(stderr);
 
-#if defined(WITH_UCL)
+#if (WITH_UCL)
     if (ucl_init() != UCL_E_OK)
     {
         show_head();
@@ -1466,7 +1480,7 @@ int __acc_cdecl_main main(int argc, char *argv[])
         e_exit(EXIT_INIT);
     }
 #endif
-#if defined(WITH_NRV)
+#if (WITH_NRV)
     if (nrv_init() != NRV_E_OK || NRV_VERSION != nrv_version())
     {
         show_head();
@@ -1559,7 +1573,7 @@ int __acc_cdecl_main main(int argc, char *argv[])
     return exit_code;
 }
 
-#endif /* !defined(WITH_GUI) */
+#endif /* !(WITH_GUI) */
 
 
 /*

src/mem.cpp

@@ -41,7 +41,7 @@ static int mcheck_init()
     if (use_mcheck < 0)
     {
         use_mcheck = 1;
-#if defined(WITH_VALGRIND) && defined(RUNNING_ON_VALGRIND)
+#if (WITH_VALGRIND) && defined(RUNNING_ON_VALGRIND)
         if (RUNNING_ON_VALGRIND)
         {
             //fprintf(stderr, "upx: detected RUNNING_ON_VALGRIND\n");

src/mem.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_MEM_H
-#define __UPX_MEM_H
+#define __UPX_MEM_H 1
 
 
 /*************************************************************************

src/mygetopt.cpp

@@ -1,706 +0,0 @@
-/* Getopt for GNU.
-   NOTE: getopt is now part of the C library, so if you don't know what
-   "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu
-   before changing it!
-
-   Copyright (C) 1987, 88, 89, 90, 91, 92, 1993
-        Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-
-
-#undef PROGNAME
-#if 0
-#ifndef EOF
-#include <stdio.h>
-#include <string.h>
-#endif
-#define PROGNAME(x)     (x)
-#else
-#include "conf.h"
-static const char *my_progname(const char *argv0)
-{
-    return progname ? progname : argv0;
-}
-#define PROGNAME(x)     my_progname(x)
-#endif
-
-
-/* If GETOPT_COMPAT is defined, `+' as well as `--' can introduce a
-   long-named option.  Because this is not POSIX.2 compliant, it is
-   being phased out.  */
-/* #define GETOPT_COMPAT */
-#undef GETOPT_COMPAT
-
-/* This version of `getopt' appears to the caller like standard Unix `getopt'
-   but it behaves differently for the user, since it allows the user
-   to intersperse the options with the other arguments.
-
-   As `getopt' works, it permutes the elements of ARGV so that,
-   when it is done, all the options precede everything else.  Thus
-   all application programs are extended to handle flexible argument order.
-
-   Setting the environment variable POSIXLY_CORRECT disables permutation.
-   Then the behavior is completely standard.
-
-   GNU application programs can use a third alternative mode in which
-   they can distinguish the relative order of options and other arguments.  */
-
-#include "mygetopt.h"
-#define option                  mfx_option
-#define optarg                  mfx_optarg
-#define optind                  mfx_optind
-#define opterr                  mfx_opterr
-#define optopt                  mfx_optopt
-#undef BAD_OPTION
-
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-char *optarg = NULL;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
-
-   On entry to `getopt', zero means this is the first call; initialize.
-
-   When `getopt' returns EOF, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-/* XXX 1003.2 says this must be 1 before any call.  */
-int optind = 0;
-
-/* The next char to be scanned in the option-element
-   in which the last option character we returned was found.
-   This allows us to pick up the scan where we left off.
-
-   If this is zero, or a null string, it means resume the scan
-   by advancing to the next ARGV-element.  */
-
-static char *nextchar;
-
-/* Callers store zero here to inhibit the error message
-   for unrecognized options.  */
-
-int opterr = 1;
-
-/* Set to an option character which was unrecognized.
-   This must be initialized on some systems to avoid linking in the
-   system's own getopt implementation.  */
-
-#define BAD_OPTION '\0'
-int optopt = BAD_OPTION;
-
-/* Describe how to deal with options that follow non-option ARGV-elements.
-
-   If the caller did not specify anything,
-   the default is REQUIRE_ORDER if the environment variable
-   POSIXLY_CORRECT is defined, PERMUTE otherwise.
-
-   REQUIRE_ORDER means don't recognize them as options;
-   stop option processing when the first non-option is seen.
-   This is what Unix does.
-   This mode of operation is selected by either setting the environment
-   variable POSIXLY_CORRECT, or using `+' as the first character
-   of the list of option characters.
-
-   PERMUTE is the default.  We permute the contents of ARGV as we scan,
-   so that eventually all the non-options are at the end.  This allows options
-   to be given in any order, even with programs that were not written to
-   expect this.
-
-   RETURN_IN_ORDER is an option available to programs that were written
-   to expect options and other ARGV-elements in any order and that care about
-   the ordering of the two.  We describe each non-option ARGV-element
-   as if it were the argument of an option with character code 1.
-   Using `-' as the first character of the list of option characters
-   selects this mode of operation.
-
-   The special argument `--' forces an end of option-scanning regardless
-   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
-   `--' can cause `getopt' to return EOF with `optind' != ARGC.  */
-
-static enum
-{
-  REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
-} ordering;
-
-/* Handle permutation of arguments.  */
-
-/* Describe the part of ARGV that contains non-options that have
-   been skipped.  `first_nonopt' is the index in ARGV of the first of them;
-   `last_nonopt' is the index after the last of them.  */
-
-static int first_nonopt;
-static int last_nonopt;
-
-/* Exchange two adjacent subsequences of ARGV.
-   One subsequence is elements [first_nonopt,last_nonopt)
-   which contains all the non-options that have been skipped so far.
-   The other is elements [last_nonopt,optind), which contains all
-   the options processed since those non-options were skipped.
-
-   `first_nonopt' and `last_nonopt' are relocated so that they describe
-   the new indices of the non-options in ARGV after they are moved.
-
-   To perform the swap, we first reverse the order of all elements. So
-   all options now come before all non options, but they are in the
-   wrong order. So we put back the options and non options in original
-   order by reversing them again. For example:
-       original input:      a b c -x -y
-       reverse all:         -y -x c b a
-       reverse options:     -x -y c b a
-       reverse non options: -x -y a b c
-*/
-
-
-static void exchange (char **argv)
-{
-  char *temp; char **first, **last;
-
-  /* Reverse all the elements [first_nonopt, optind) */
-  first = &argv[first_nonopt];
-  last  = &argv[optind-1];
-  while (first < last) {
-    temp = *first; *first = *last; *last = temp; first++; last--;
-  }
-  /* Put back the options in order */
-  first = &argv[first_nonopt];
-  first_nonopt += (optind - last_nonopt);
-  last  = &argv[first_nonopt - 1];
-  while (first < last) {
-    temp = *first; *first = *last; *last = temp; first++; last--;
-  }
-
-  /* Put back the non options in order */
-  first = &argv[first_nonopt];
-  last_nonopt = optind;
-  last  = &argv[last_nonopt-1];
-  while (first < last) {
-    temp = *first; *first = *last; *last = temp; first++; last--;
-  }
-}
-
-/* Scan elements of ARGV (whose length is ARGC) for option characters
-   given in OPTSTRING.
-
-   If an element of ARGV starts with '-', and is not exactly "-" or "--",
-   then it is an option element.  The characters of this element
-   (aside from the initial '-') are option characters.  If `getopt'
-   is called repeatedly, it returns successively each of the option characters
-   from each of the option elements.
-
-   If `getopt' finds another option character, it returns that character,
-   updating `optind' and `nextchar' so that the next call to `getopt' can
-   resume the scan with the following option character or ARGV-element.
-
-   If there are no more option characters, `getopt' returns `EOF'.
-   Then `optind' is the index in ARGV of the first ARGV-element
-   that is not an option.  (The ARGV-elements have been permuted
-   so that those that are not options now come last.)
-
-   OPTSTRING is a string containing the legitimate option characters.
-   If an option character is seen that is not listed in OPTSTRING,
-   return BAD_OPTION after printing an error message.  If you set `opterr' to
-   zero, the error message is suppressed but we still return BAD_OPTION.
-
-   If a char in OPTSTRING is followed by a colon, that means it wants an arg,
-   so the following text in the same ARGV-element, or the text of the following
-   ARGV-element, is returned in `optarg'.  Two colons mean an option that
-   wants an optional arg; if there is text in the current ARGV-element,
-   it is returned in `optarg', otherwise `optarg' is set to zero.
-
-   If OPTSTRING starts with `-' or `+', it requests different methods of
-   handling the non-option ARGV-elements.
-   See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
-
-   Long-named options begin with `--' instead of `-'.
-   Their names may be abbreviated as long as the abbreviation is unique
-   or is an exact match for some defined option.  If they have an
-   argument, it follows the option name in the same ARGV-element, separated
-   from the option name by a `=', or else the in next ARGV-element.
-   When `getopt' finds a long-named option, it returns 0 if that option's
-   `flag' field is nonzero, the value of the option's `val' field
-   if the `flag' field is zero.
-
-   LONGOPTS is a vector of `struct option' terminated by an
-   element containing a name which is zero.
-
-   LONGIND returns the index in LONGOPT of the long-named option found.
-   It is only valid when a long-named option has been found by the most
-   recent call.
-
-   If LONG_ONLY is nonzero, '-' as well as '--' can introduce
-   long-named options.  */
-
-static int _getopt_internal (int argc, char **argv, const char *optstring,
-                 const struct option *longopts, int *longind,
-                 int long_only)
-{
-  static char empty_string[1];
-  int option_index;
-
-  if (longind != NULL)
-    *longind = -1;
-
-  optarg = 0;
-
-  /* Initialize the internal data when the first call is made.
-     Start processing options with ARGV-element 1 (since ARGV-element 0
-     is the program name); the sequence of previously skipped
-     non-option ARGV-elements is empty.  */
-
-  if (optind == 0)
-    {
-      first_nonopt = last_nonopt = optind = 1;
-
-      nextchar = NULL;
-
-      /* Determine how to handle the ordering of options and nonoptions.  */
-
-      if (optstring[0] == '-')
-        {
-          ordering = RETURN_IN_ORDER;
-          ++optstring;
-        }
-      else if (optstring[0] == '+')
-        {
-          ordering = REQUIRE_ORDER;
-          ++optstring;
-        }
-#if 0
-      else if (getenv ("POSIXLY_CORRECT") != NULL)
-        ordering = REQUIRE_ORDER;
-#endif
-      else
-        ordering = PERMUTE;
-    }
-
-  if (nextchar == NULL || *nextchar == '\0')
-    {
-      if (ordering == PERMUTE)
-        {
-          /* If we have just processed some options following some non-options,
-             exchange them so that the options come first.  */
-
-          if (first_nonopt != last_nonopt && last_nonopt != optind)
-            exchange (argv);
-          else if (last_nonopt != optind)
-            first_nonopt = optind;
-
-          /* Now skip any additional non-options
-             and extend the range of non-options previously skipped.  */
-
-          while (optind < argc
-                 && (argv[optind][0] != '-' || argv[optind][1] == '\0')
-#ifdef GETOPT_COMPAT
-                 && (longopts == NULL
-                     || argv[optind][0] != '+' || argv[optind][1] == '\0')
-#endif                          /* GETOPT_COMPAT */
-                 )
-            optind++;
-          last_nonopt = optind;
-        }
-
-      /* Special ARGV-element `--' means premature end of options.
-         Skip it like a null option,
-         then exchange with previous non-options as if it were an option,
-         then skip everything else like a non-option.  */
-
-      if (optind != argc && !strcmp (argv[optind], "--"))
-        {
-          optind++;
-
-          if (first_nonopt != last_nonopt && last_nonopt != optind)
-            exchange (argv);
-          else if (first_nonopt == last_nonopt)
-            first_nonopt = optind;
-          last_nonopt = argc;
-
-          optind = argc;
-        }
-
-      /* If we have done all the ARGV-elements, stop the scan
-         and back over any non-options that we skipped and permuted.  */
-
-      if (optind == argc)
-        {
-          /* Set the next-arg-index to point at the non-options
-             that we previously skipped, so the caller will digest them.  */
-          if (first_nonopt != last_nonopt)
-            optind = first_nonopt;
-          return EOF;
-        }
-
-      /* If we have come to a non-option and did not permute it,
-         either stop the scan or describe it to the caller and pass it by.  */
-
-      if ((argv[optind][0] != '-' || argv[optind][1] == '\0')
-#ifdef GETOPT_COMPAT
-          && (longopts == NULL
-              || argv[optind][0] != '+' || argv[optind][1] == '\0')
-#endif                          /* GETOPT_COMPAT */
-          )
-        {
-          if (ordering == REQUIRE_ORDER)
-            return EOF;
-          optarg = argv[optind++];
-          return 1;
-        }
-
-      /* We have found another option-ARGV-element.
-         Start decoding its characters.  */
-
-      nextchar = (argv[optind] + 1
-                  + (longopts != NULL && argv[optind][1] == '-'));
-    }
-
-  if (longopts != NULL
-      && ((argv[optind][0] == '-'
-           && (argv[optind][1] == '-' || long_only))
-#ifdef GETOPT_COMPAT
-          || argv[optind][0] == '+'
-#endif                          /* GETOPT_COMPAT */
-          ))
-    {
-      const struct option *p;
-      char *s = nextchar;
-      int exact = 0;
-      int ambig = 0;
-      const struct option *pfound = NULL;
-      int indfound = 0;
-      int needexact = 0;
-
-      /* allow `--option#value' because you cannout assign a '='
-         to an environment variable under DOS command.com */
-      while (*s && *s != '=' && * s != '#')
-        s++;
-
-      /* Test all options for either exact match or abbreviated matches.  */
-      for (p = longopts, option_index = 0; p->name;
-           p++, option_index++)
-        if (!strncmp (p->name, nextchar, (unsigned) (s - nextchar)))
-          {
-            if (p->has_arg & 0x10)
-              needexact = 1;
-            if ((unsigned) (s - nextchar) == strlen (p->name))
-              {
-                /* Exact match found.  */
-                pfound = p;
-                indfound = option_index;
-                exact = 1;
-                break;
-              }
-            else if (pfound == NULL)
-              {
-                /* First nonexact match found.  */
-                pfound = p;
-                indfound = option_index;
-              }
-            else
-              /* Second nonexact match found.  */
-              ambig = 1;
-          }
-
-      /* don't allow nonexact longoptions */
-      if (needexact && !exact)
-        {
-          if (opterr)
-            fprintf (stderr, "%s: unrecognized option `%s'\n",
-                     PROGNAME(argv[0]), argv[optind]);
-          nextchar += strlen (nextchar);
-          optind++;
-          return BAD_OPTION;
-        }
-      if (ambig && !exact)
-        {
-          if (opterr)
-            fprintf (stderr, "%s: option `%s' is ambiguous\n",
-                     PROGNAME(argv[0]), argv[optind]);
-          nextchar += strlen (nextchar);
-          optind++;
-          return BAD_OPTION;
-        }
-
-      if (pfound != NULL)
-        {
-          int have_arg = (s[0] != '\0');
-          if (have_arg && (pfound->has_arg & 0xf))
-            have_arg = (s[1] != '\0');
-          option_index = indfound;
-          optind++;
-          if (have_arg)
-            {
-              /* Don't test has_arg with >, because some C compilers don't
-                 allow it to be used on enums.  */
-              if (pfound->has_arg & 0xf)
-                optarg = s + 1;
-              else
-                {
-                  if (opterr)
-                    {
-                      if (argv[optind - 1][1] == '-')
-                        /* --option */
-                        fprintf (stderr,
-                                 "%s: option `--%s' doesn't allow an argument\n",
-                                 PROGNAME(argv[0]), pfound->name);
-                      else
-                        /* +option or -option */
-                        fprintf (stderr,
-                             "%s: option `%c%s' doesn't allow an argument\n",
-                             PROGNAME(argv[0]), argv[optind - 1][0], pfound->name);
-                    }
-                  nextchar += strlen (nextchar);
-                  return BAD_OPTION;
-                }
-            }
-          else if ((pfound->has_arg & 0xf) == 1)
-            {
-#if 0
-              if (optind < argc)
-#else
-              if (optind < argc && (pfound->has_arg & 0x20) == 0)
-#endif
-                optarg = argv[optind++];
-              else
-                {
-                  if (opterr)
-                    fprintf (stderr, "%s: option `--%s%s' requires an argument\n",
-                             PROGNAME(argv[0]), pfound->name,
-                             (pfound->has_arg & 0x20) ? "=" : "");
-                  nextchar += strlen (nextchar);
-                  return optstring[0] == ':' ? ':' : BAD_OPTION;
-                }
-            }
-          nextchar += strlen (nextchar);
-          if (longind != NULL)
-            *longind = option_index;
-          if (pfound->flag)
-            {
-              *(pfound->flag) = pfound->val;
-              return 0;
-            }
-          return pfound->val;
-        }
-      /* Can't find it as a long option.  If this is not getopt_long_only,
-         or the option starts with '--' or is not a valid short
-         option, then it's an error.
-         Otherwise interpret it as a short option.  */
-      if (!long_only || argv[optind][1] == '-'
-#ifdef GETOPT_COMPAT
-          || argv[optind][0] == '+'
-#endif                          /* GETOPT_COMPAT */
-          || strchr (optstring, *nextchar) == NULL)
-        {
-          if (opterr)
-            {
-              if (argv[optind][1] == '-')
-                /* --option */
-                fprintf (stderr, "%s: unrecognized option `--%s'\n",
-                         PROGNAME(argv[0]), nextchar);
-              else
-                /* +option or -option */
-                fprintf (stderr, "%s: unrecognized option `%c%s'\n",
-                         PROGNAME(argv[0]), argv[optind][0], nextchar);
-            }
-          nextchar = empty_string;
-          optind++;
-          return BAD_OPTION;
-        }
-        (void) &ambig;  /* UNUSED */
-    }
-
-  /* Look at and handle the next option-character.  */
-
-  {
-    char c = *nextchar++;
-    const char *temp = strchr (optstring, c);
-
-    /* Increment `optind' when we start to process its last character.  */
-    if (*nextchar == '\0')
-      ++optind;
-
-    if (temp == NULL || c == ':')
-      {
-        if (opterr)
-          {
-#if 0
-            if (c < 040 || c >= 0177)
-              fprintf (stderr, "%s: unrecognized option, character code 0%o\n",
-                       PROGNAME(argv[0]), c);
-            else
-              fprintf (stderr, "%s: unrecognized option `-%c'\n", PROGNAME(argv[0]), c);
-#else
-            /* 1003.2 specifies the format of this message.  */
-            fprintf (stderr, "%s: illegal option -- %c\n", PROGNAME(argv[0]), c);
-#endif
-          }
-        optopt = c;
-        return BAD_OPTION;
-      }
-    if (temp[1] == ':')
-      {
-        if (temp[2] == ':')
-          {
-            /* This is an option that accepts an argument optionally.  */
-            if (*nextchar != '\0')
-              {
-                optarg = nextchar;
-                optind++;
-              }
-            else
-              optarg = 0;
-            nextchar = NULL;
-          }
-        else
-          {
-            /* This is an option that requires an argument.  */
-            if (*nextchar != '\0')
-              {
-                optarg = nextchar;
-                /* If we end this ARGV-element by taking the rest as an arg,
-                   we must advance to the next element now.  */
-                optind++;
-              }
-            else if (optind == argc)
-              {
-                if (opterr)
-                  {
-#if 0
-                    fprintf (stderr, "%s: option `-%c' requires an argument\n",
-                             PROGNAME(argv[0]), c);
-#else
-                    /* 1003.2 specifies the format of this message.  */
-                    fprintf (stderr, "%s: option requires an argument -- %c\n",
-                             PROGNAME(argv[0]), c);
-#endif
-                  }
-                optopt = c;
-                if (optstring[0] == ':')
-                  c = ':';
-                else
-                  c = BAD_OPTION;
-              }
-            else
-              /* We already incremented `optind' once;
-                 increment it again when taking next ARGV-elt as argument.  */
-              optarg = argv[optind++];
-            nextchar = NULL;
-          }
-      }
-    return c;
-  }
-}
-
-int mfx_getopt(int argc, char **argv, const char *optstring)
-{
-  return _getopt_internal (argc, argv, optstring,
-                           (const struct option *) 0,
-                           (int *) 0,
-                           0);
-}
-
-int mfx_getopt_long(int argc, char **argv, const char *options,
-                    const struct option *long_options, int *opt_index)
-{
-  return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
-}
-
-
-#ifdef TEST
-
-/* Compile with -DTEST to make an executable for use in testing
-   the above definition of `getopt'.  */
-
-int
-main (argc, argv)
-     int argc;
-     char **argv;
-{
-  int c;
-  int digit_optind = 0;
-
-  while (1)
-    {
-      int this_option_optind = optind ? optind : 1;
-
-      c = getopt (argc, argv, "abc:d:0123456789");
-      if (c == EOF)
-        break;
-
-      switch (c)
-        {
-        case '0':
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-        case '8':
-        case '9':
-          if (digit_optind != 0 && digit_optind != this_option_optind)
-            printf ("digits occur in two different argv-elements.\n");
-          digit_optind = this_option_optind;
-          printf ("option %c\n", c);
-          break;
-
-        case 'a':
-          printf ("option a\n");
-          break;
-
-        case 'b':
-          printf ("option b\n");
-          break;
-
-        case 'c':
-          printf ("option c with value `%s'\n", optarg);
-          break;
-
-        case BAD_OPTION:
-          break;
-
-        default:
-          printf ("?? getopt returned character code 0%o ??\n", c);
-        }
-    }
-
-  if (optind < argc)
-    {
-      printf ("non-option ARGV-elements: ");
-      while (optind < argc)
-        printf ("%s ", argv[optind++]);
-      printf ("\n");
-    }
-
-  exit (0);
-}
-
-#endif /* TEST */
-
-
-/*
-vi:ts=4:et:nowrap
-*/
-

src/mygetopt.h

@@ -1,102 +0,0 @@
-/* Declarations for getopt.
-   Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef __MFX_GETOPT_H
-#define __MFX_GETOPT_H 1
-
-#ifdef __cplusplus
-/* extern "C" { */
-#endif
-
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-extern char *mfx_optarg;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
-
-   On entry to `getopt', zero means this is the first call; initialize.
-
-   When `getopt' returns EOF, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-extern int mfx_optind;
-
-/* Callers store zero here to inhibit the error message `getopt' prints
-   for unrecognized options.  */
-
-extern int mfx_opterr;
-
-/* Set to an option character which was unrecognized.  */
-
-extern int mfx_optopt;
-
-/* Describe the long-named options requested by the application.
-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-   of `struct option' terminated by an element containing a name which is
-   zero.
-
-   The field `has_arg' is:
-   no_argument          (or 0) if the option does not take an argument,
-   required_argument    (or 1) if the option requires an argument,
-   optional_argument    (or 2) if the option takes an optional argument.
-
-   If the field `flag' is not NULL, it points to a variable that is set
-   to the value given in the field `val' when the option is found, but
-   left unchanged if the option is not found.
-
-   To have a long-named option do something other than set an `int' to
-   a compiled-in constant, such as set a value from `optarg', set the
-   option's `flag' field to zero and its `val' field to a nonzero
-   value (the equivalent single-letter option character, if there is
-   one).  For long options that have a zero `flag' field, `getopt'
-   returns the contents of the `val' field.  */
-
-struct mfx_option
-{
-  const char *name;
-  /* has_arg can't be an enum because some compilers complain about
-     type mismatches in all the code that assumes it is an int.  */
-  int has_arg;
-  int *flag;
-  int val;
-};
-
-/* Names for the values of the `has_arg' field of `struct option'.  */
-
-#define mfx_no_argument         0
-#define mfx_required_argument   1
-#define mfx_optional_argument   2
-#define mfx_exact_argument      0x10            /* no abbrev. */
-
-int mfx_getopt(int argc, char **argv, const char *shortopts);
-int mfx_getopt_long(int argc, char **argv, const char *shortopts,
-                    const struct mfx_option *longopts, int *longind);
-
-#ifdef __cplusplus
-/* } */
-#endif
-
-#endif /* __MFX_GETOPT_H */

src/options.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_OPTIONS_H
-#define __UPX_OPTIONS_H
+#define __UPX_OPTIONS_H 1
 
 
 /*************************************************************************

src/p_armpe.h

@@ -27,7 +27,8 @@
 
 
 #ifndef __UPX_P_ARMPE_H
-#define __UPX_P_ARMPE_H
+#define __UPX_P_ARMPE_H 1
+
 
 /*************************************************************************
 // arm/pe

src/p_com.cpp

@@ -36,7 +36,7 @@
 static const
 #include "stub/i086-dos16.com.h"
 
-//#define TESTING
+//#define TESTING 1
 
 
 /*************************************************************************

src/p_com.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_P_COM_H
-#define __UPX_P_COM_H
+#define __UPX_P_COM_H 1
 
 
 /*************************************************************************

src/p_djgpp2.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_P_DJGPP2_H
-#define __UPX_P_DJGPP2_H
+#define __UPX_P_DJGPP2_H 1
 
 
 /*************************************************************************

src/p_elf.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_P_ELF_H
-#define __UPX_P_ELF_H
+#define __UPX_P_ELF_H 1
 
 
 /*************************************************************************

src/p_exe.cpp

@@ -514,7 +514,7 @@ void PackExe::pack(OutputFile *fo)
         if (ph.max_run_found + ph.max_match_found > 0x8000)
             throwCantPack("decompressor limit exceeded, send a bugreport");
 
-#ifdef TESTING
+#if TESTING
     if (opt->debug.debug_level)
     {
         printf("image+relocs %d -> %d\n",ih_imagesize+relocsize,ph.c_len);
@@ -631,7 +631,7 @@ void PackExe::pack(OutputFile *fo)
 //fprintf(stderr,"\ne_len=%x d_len=%x c_len=%x oo=%x ulen=%x destp=%x copys=%x images=%x",e_len,d_len,packedsize,ph.overlap_overhead,ph.u_len,destpara,copysize,ih_imagesize);
 
     // write header + write loader + compressed file
-#ifdef TESTING
+#if TESTING
     if (opt->debug.debug_level)
         printf("\n%d %d %d %d\n",(int)sizeof(oh),e_len,packedsize,d_len);
 #endif

src/p_exe.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_P_EXE_H
-#define __UPX_P_EXE_H
+#define __UPX_P_EXE_H 1
 
 
 /*************************************************************************

src/p_lx_elf.cpp

@@ -175,8 +175,8 @@ void PackLinuxElf::pack3(OutputFile *fo, Filter &ft)
     unsigned disp;
     unsigned const zero = 0;
     unsigned len = fo->getBytesWritten();
-    fo->write(&zero, 3& -len);  // ALIGN_UP 0 mod 4
+    fo->write(&zero, 3& (0u-len));  // ALIGN_UP 0 mod 4
-    len += (3& -len); // 0 mod 4
+    len += (3& (0u-len)); // 0 mod 4
 
     unsigned const t = 4 ^ (4 & len) ^ ((!!xct_off)<<2);  // 0 or 4
     fo->write(&zero, t);
@@ -635,7 +635,11 @@ void PackLinuxElf32x86::addStubEntrySections(Filter const *ft)
     }
 
     addLoader("IDENTSTR", NULL);
-    addLoader("LEXEC020", (opt->o_unix.unmap_all_pages ? "LUNMP000" : "LUNMP001"), "LEXEC025", NULL);
+    addLoader("LEXEC020", NULL);
+    if (Elf32_Ehdr::ET_DYN==get_te16(&ehdri.e_type)) {
+        addLoader("LEXECDYN", NULL);
+    }
+    addLoader((opt->o_unix.unmap_all_pages ? "LUNMP000" : "LUNMP001"), "LEXEC025", NULL);
     addLoader("FOLDEXEC", NULL);
 }
 
@@ -2262,8 +2266,8 @@ void PackLinuxElf32::pack4(OutputFile *fo, Filter &ft)
     overlay_offset = sz_elf_hdrs + sizeof(linfo);
     unsigned const zero = 0;
     unsigned len = fo->getBytesWritten();
-    fo->write(&zero, 3& -len);  // align to 0 mod 4
+    fo->write(&zero, 3& (0u-len));  // align to 0 mod 4
-    len += 3& -len;
+    len += 3& (0u-len);
     set_te32(&elfout.phdr[0].p_filesz, len);
     super::pack4(fo, ft);  // write PackHeader and overlay_offset
 
@@ -2325,8 +2329,8 @@ void PackLinuxElf64::pack4(OutputFile *fo, Filter &ft)
     overlay_offset = sz_elf_hdrs + sizeof(linfo);
     unsigned const zero = 0;
     unsigned len = fo->getBytesWritten();
-    fo->write(&zero, 3& -len);  // align to 0 mod 4
+    fo->write(&zero, 3& (0u-len));  // align to 0 mod 4
-    len += 3& -len;
+    len += 3& (0u-len);
     set_te64(&elfout.phdr[0].p_filesz, len);
     super::pack4(fo, ft);  // write PackHeader and overlay_offset
 

src/p_lx_elf.h

@@ -31,7 +31,7 @@
 
 
 #ifndef __UPX_P_LX_ELF_H  //{
-#define __UPX_P_LX_ELF_H
+#define __UPX_P_LX_ELF_H 1
 
 
 class PackLinuxElf : public PackUnix

src/p_lx_exc.h

@@ -30,7 +30,7 @@
 
 
 #ifndef __UPX_P_LX_EXC_H
-#define __UPX_P_LX_EXC_H
+#define __UPX_P_LX_EXC_H 1
 
 
 /*************************************************************************

src/p_lx_interp.h

@@ -31,7 +31,7 @@
 
 
 #ifndef __UPX_P_LX_INTERP_H  //{
-#define __UPX_P_LX_INTERP_H
+#define __UPX_P_LX_INTERP_H 1
 
 
 /*************************************************************************

src/p_lx_sh.h

@@ -31,7 +31,7 @@
 
 
 #ifndef __UPX_P_LX_SH_H  //{
-#define __UPX_P_LX_SH_H
+#define __UPX_P_LX_SH_H 1
 
 
 /*************************************************************************

src/p_mach.cpp

@@ -1382,6 +1382,23 @@ void PackMachFat::unpack(OutputFile *fo)
                 packer.unpack(fo);
             }
         } break;
+        case PackMachFat::CPU_TYPE_X86_64: {
+            N_Mach::Mach_header<MachClass_LE64::MachITypes> hdr;
+            typedef N_Mach::Mach_header<MachClass_LE64::MachITypes> Mach_header;
+            fi->readx(&hdr, sizeof(hdr));
+            if (hdr.filetype==Mach_header::MH_EXECUTE) {
+                PackMachAMD64 packer(fi);
+                packer.initPackHeader();
+                packer.canUnpack();
+                packer.unpack(fo);
+            }
+            else if (hdr.filetype==Mach_header::MH_DYLIB) {
+                PackDylibAMD64 packer(fi);
+                packer.initPackHeader();
+                packer.canUnpack();
+                packer.unpack(fo);
+            }
+        } break;
         case PackMachFat::CPU_TYPE_POWERPC: {
             N_Mach::Mach_header<MachClass_BE32::MachITypes> hdr;
             typedef N_Mach::Mach_header<MachClass_BE32::MachITypes> Mach_header;
@@ -1489,6 +1506,18 @@ int PackMachFat::canUnpack()
             else
                 ph.format = packer.getFormat(); // FIXME: copy entire PackHeader
         } break;
+        case PackMachFat::CPU_TYPE_X86_64: {
+            PackMachAMD64 packer(fi);
+            if (!packer.canUnpack()) {
+                PackDylibAMD64 pack2r(fi);
+                if (!pack2r.canUnpack())
+                    return 0;
+                else
+                    ph.format = pack2r.getFormat(); // FIXME: copy entire PackHeader
+            }
+            else
+                ph.format = packer.getFormat(); // FIXME: copy entire PackHeader
+        } break;
         case PackMachFat::CPU_TYPE_POWERPC: {
             PackMachPPC32 packer(fi);
             if (!packer.canUnpack()) {

src/p_mach.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_P_MACHO_H
-#define __UPX_P_MACHO_H
+#define __UPX_P_MACHO_H 1
 
 
 __packed_struct(Mach_fat_header)
@@ -640,7 +640,7 @@ protected:
         BE32 flavor;
         BE32 count;          /* sizeof(following_thread_state)/4 */
         Mach_ppc_thread_state state;
-    #define WANT_MACH_THREAD_ENUM
+    #define WANT_MACH_THREAD_ENUM 1
     #include "p_mach_enum.h"
     __packed_struct_end()
 
@@ -689,7 +689,7 @@ protected:
         LE32 flavor;
         LE32 count;          /* sizeof(following_thread_state)/4 */
         Mach_i386_thread_state state;
-    #define WANT_MACH_THREAD_ENUM
+    #define WANT_MACH_THREAD_ENUM 1
     #include "p_mach_enum.h"
     __packed_struct_end()
 
@@ -738,7 +738,7 @@ protected:
         LE32 flavor;
         LE32 count;          /* sizeof(following_thread_state)/4 */
         Mach_AMD64_thread_state state;
-    #define WANT_MACH_THREAD_ENUM
+    #define WANT_MACH_THREAD_ENUM 1
     #include "p_mach_enum.h"
     __packed_struct_end()
 
@@ -788,7 +788,7 @@ protected:
         LE32 flavor;
         LE32 count;          /* sizeof(following_thread_state)/4 */
         Mach_ARM_thread_state state;
-    #define WANT_MACH_THREAD_ENUM
+    #define WANT_MACH_THREAD_ENUM 1
     #include "p_mach_enum.h"
     __packed_struct_end()
 
@@ -841,7 +841,7 @@ protected:
 
     // linker
     Linker *linker;
-#define WANT_MACH_HEADER_ENUM
+#define WANT_MACH_HEADER_ENUM 1
 #include "p_mach_enum.h"
 };
 

src/p_mach_enum.h

@@ -79,6 +79,9 @@
         LC_CODE_SIGNATURE = 0x1d,
         LC_SEGMENT_SPLIT_INFO = 0x1e,
         LC_REEXPORT_DYLIB = 0x1f,
+        LC_LAZY_LOAD_DYLIB= 0X20,
+        LC_ENCRYPTION_INFO= 0X21,
+        LC_DYLD_INFO      = 0X22,  // compressed dyld information (10.6.x)
         LC_REQ_DYLD      = 0x80000000  // OR'ed ==> must not ignore
     };
     enum { // maxprot

src/p_ps1.h

@@ -31,7 +31,7 @@
 
 
 #ifndef __UPX_P_PS1_H
-#define __UPX_P_PS1_H
+#define __UPX_P_PS1_H 1
 
 
 /*************************************************************************

src/p_sys.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_P_SYS_H
-#define __UPX_P_SYS_H
+#define __UPX_P_SYS_H 1
 
 
 /*************************************************************************

src/p_tmt.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_P_TMT_H
-#define __UPX_P_TMT_H
+#define __UPX_P_TMT_H 1
 
 
 /*************************************************************************

src/p_tos.cpp

@@ -446,7 +446,7 @@ void PackTos::pack(OutputFile *fo)
     overlay = file_size - (FH_SIZE + i_text + i_data + i_sym);
     fi->readx(ibuf+t,overlay);
 
-#if 0 || defined(TESTING)
+#if 0 || (TESTING)
     printf("text: %d, data: %d, sym: %d, bss: %d, flags=0x%x\n",
            i_text, i_data, i_sym, i_bss, (int)ih.fh_flag);
     printf("xx1 reloc: %d, overlay: %d, fixup: %d\n", relocsize, overlay, overlay >= 4 ? (int)get_be32(ibuf+t) : -1);
@@ -476,7 +476,7 @@ void PackTos::pack(OutputFile *fo)
         symbols.need_reloc = true;
     }
 
-#if 0 || defined(TESTING)
+#if 0 || (TESTING)
     printf("xx2: %d relocs: %d, overlay: %d, t: %d\n", nrelocs, relocsize, overlay, t);
 #endif
 
@@ -487,7 +487,7 @@ void PackTos::pack(OutputFile *fo)
     ih.fh_sym = 0;                      // we stripped all symbols
     memcpy(ibuf+t, &ih, FH_SIZE);
     t += FH_SIZE;
-#if 0 || defined(TESTING)
+#if 0 || (TESTING)
     printf("xx3 reloc: %d, overlay: %d, t: %d\n", relocsize, overlay, t);
 #endif
     assert(t <= isize);
@@ -686,7 +686,7 @@ void PackTos::pack(OutputFile *fo)
     // add an empty relocation fixup to workaround a bug in some TOS versions
     oh.fh_reloc = 0;
 
-#if 0 || defined(TESTING)
+#if 0 || (TESTING)
     printf("old text: %6d, data: %6d, bss: %6d, reloc: %d, overlay: %d\n",
            i_text, i_data, i_bss, relocsize, overlay);
     printf("new text: %6d, data: %6d, bss: %6d, flag=0x%x\n",

src/p_tos.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_P_TOS_H
-#define __UPX_P_TOS_H
+#define __UPX_P_TOS_H 1
 
 
 /*************************************************************************

src/p_unix.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_P_UNIX_H
-#define __UPX_P_UNIX_H
+#define __UPX_P_UNIX_H 1
 
 
 /*************************************************************************

src/p_vmlinx.cpp

@@ -322,6 +322,7 @@ void PackVmlinuxBase<T>::pack(OutputFile *fo)
         unsigned const frag = (3& (0u-len_cpr));
         ppc32_extra += sizeof(hdr_info) + len_cpr + frag;
         fo_off += len_cpr + frag;
+        memset(&cpr_hdr[len_cpr], 0, frag);  // valgrind only
         fo->write(cpr_hdr, len_cpr + frag);
 
         // Partial filter: .text and following contiguous SHF_EXECINSTR

src/p_vmlinx.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_P_VMLINX_H
-#define __UPX_P_VMLINX_H
+#define __UPX_P_VMLINX_H 1
 
 #include "p_elf.h"
 

src/p_vmlinz.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_P_VMLINZ_H
-#define __UPX_P_VMLINZ_H
+#define __UPX_P_VMLINZ_H 1
 
 
 /*************************************************************************

src/p_vxd.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_P_VXD_H
-#define __UPX_P_VXD_H
+#define __UPX_P_VXD_H 1
 
 
 /*************************************************************************

src/p_w16ne.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_P_W16NE_H
-#define __UPX_P_W16NE_H
+#define __UPX_P_W16NE_H 1
 
 
 /*************************************************************************

src/p_w32pe.cpp

@@ -273,7 +273,7 @@ void PackW32Pe::processTls(Reloc *rel,const Interval *iv,unsigned newaddr) // pa
     // add new relocation entries
     unsigned ic;
     //NEW: if TLS callbacks are used, relocate the VA of the callback chain, too - Stefan Widmann
-    for (ic = 0; ic < (use_tls_callbacks ? 16 : 12); ic += 4)
+    for (ic = 0; ic < (use_tls_callbacks ? 16u : 12u); ic += 4)
         rel->add(newaddr + ic,3);
 
     tls * const tlsp = (tls*) otls;

src/p_w32pe.h

@@ -27,7 +27,8 @@
 
 
 #ifndef __UPX_P_W32PE_H
-#define __UPX_P_W32PE_H
+#define __UPX_P_W32PE_H 1
+
 
 /*************************************************************************
 // w32/pe

src/p_wcle.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_P_WCLE_H
-#define __UPX_P_WCLE_H
+#define __UPX_P_WCLE_H 1
 
 
 /*************************************************************************

src/packer.cpp

@@ -26,7 +26,7 @@
  */
 
 
-//#define WANT_STL
+//#define WANT_STL 1
 #include "conf.h"
 #include "file.h"
 #include "packer.h"
@@ -211,7 +211,7 @@ bool Packer::compress(upx_bytep i_ptr, unsigned i_len, upx_bytep o_ptr,
             cconf.conf_ucl.max_offset = opt->crp.crp_ucl.max_offset;
         if (opt->crp.crp_ucl.max_match != UINT_MAX && opt->crp.crp_ucl.max_match < cconf.conf_ucl.max_match)
             cconf.conf_ucl.max_match = opt->crp.crp_ucl.max_match;
-#if defined(WITH_NRV)
+#if (WITH_NRV)
         if (ph.level >= 7 || (ph.level >= 4 && ph.u_len >= 512*1024))
             step = 0;
 #endif
@@ -625,7 +625,7 @@ unsigned Packer::getRandomId() const
 #endif
     while (id == 0)
     {
-#if !defined(HAVE_GETTIMEOFDAY) || defined(__DJGPP__)
+#if !(HAVE_GETTIMEOFDAY) || defined(__DJGPP__)
         id ^= (unsigned) time(NULL);
         id ^= ((unsigned) clock()) << 12;
 #else
@@ -634,7 +634,7 @@ unsigned Packer::getRandomId() const
         id ^= (unsigned) tv.tv_sec;
         id ^= ((unsigned) tv.tv_usec) << 12;  // shift into high-bits
 #endif
-#if defined(HAVE_GETPID)
+#if (HAVE_GETPID)
         id ^= (unsigned) getpid();
 #endif
         id ^= (unsigned) fi->st.st_ino;

src/packer.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_PACKER_H
-#define __UPX_PACKER_H
+#define __UPX_PACKER_H 1
 
 #include "mem.h"
 

src/packer_c.cpp

@@ -39,7 +39,7 @@
 bool Packer::isValidCompressionMethod(int method)
 {
     if (M_IS_LZMA(method)) {
-#if !defined(WITH_LZMA)
+#if !(WITH_LZMA)
         assert(0 && "Internal error - LZMA not compiled in");
 #else
         return true;

src/packmast.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_PACKMASTER_H
-#define __UPX_PACKMASTER_H
+#define __UPX_PACKMASTER_H 1
 
 class Packer;
 class InputFile;

src/pefile.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_PEFILE_H
-#define __UPX_PEFILE_H
+#define __UPX_PEFILE_H 1
 
 
 /*************************************************************************

src/s_djgpp2.cpp

@@ -28,7 +28,7 @@
 
 #include "conf.h"
 
-#if defined(USE_SCREEN) && defined(__DJGPP__)
+#if (USE_SCREEN) && defined(__DJGPP__)
 
 #include "screen.h"
 
@@ -37,7 +37,7 @@
 #define mask_fg 0x0f
 #define mask_bg 0xf0
 
-/* #define USE_SCROLLBACK */
+/* #define USE_SCROLLBACK 1 */
 
 
 /*************************************************************************
@@ -70,7 +70,7 @@ struct screen_data_t
     unsigned char init_attr;
     unsigned char empty_attr;
     unsigned short empty_cell;
-#ifdef USE_SCROLLBACK
+#if USE_SCROLLBACK
     /* scrollback buffer */
     unsigned short sb_buf[32][256];
     int sb_size;
@@ -89,7 +89,7 @@ static struct
 };
 
 
-#ifdef USE_SCROLLBACK
+#if USE_SCROLLBACK
 static __inline__ void sb_add(screen_t *this, int *val, int inc)
 {
     *val = (*val + inc) & (this->data->sb_size - 1);
@@ -304,7 +304,7 @@ static int init(screen_t *this, int fd)
         return -1;
 
     this->data->mode = -1;
-#ifdef USE_SCROLLBACK
+#if USE_SCROLLBACK
     this->data->sb_size = 32;
     this->data->sb_base = 0;
     this->data->sb_sp = 0;
@@ -404,7 +404,7 @@ static int scrollUp(screen_t *this, int lines)
     if (lines <= 0 || lines > sr)
         return 0;
 
-#ifdef USE_SCROLLBACK
+#if USE_SCROLLBACK
     /* copy to scrollback buffer */
     for (y = 0; y < lines; y++)
     {
@@ -449,7 +449,7 @@ static int scrollDown(screen_t *this, int lines)
     /* copy top lines from scrollback buffer */
     for (y = lines; --y >= 0; )
     {
-#ifdef USE_SCROLLBACK
+#if USE_SCROLLBACK
         const unsigned short *buf = sb_pop(this);
         if (buf == NULL)
             clearLine(this,y);
@@ -556,7 +556,7 @@ screen_t *screen_djgpp2_construct(void)
 }
 
 
-#endif /* defined(USE_SCREEN) && defined(__DJGPP__) */
+#endif /* (USE_SCREEN) && defined(__DJGPP__) */
 
 
 /*

src/s_object.cpp

@@ -28,7 +28,7 @@
 
 #include "conf.h"
 
-#if defined(USE_SCREEN)
+#if (USE_SCREEN)
 
 #define this local_this
 
@@ -92,7 +92,7 @@ screen_t *sobject_construct(const screen_t *c, size_t data_size)
 }
 
 
-#endif /* defined(USE_SCREEN) */
+#endif /* (USE_SCREEN) */
 
 
 /*

src/s_vcsa.cpp

@@ -28,7 +28,7 @@
 
 #include "conf.h"
 
-#if defined(USE_SCREEN) && defined(USE_SCREEN_VCSA)
+#if (USE_SCREEN) && (USE_SCREEN_VCSA)
 
 #include "screen.h"
 
@@ -37,7 +37,7 @@
 #define mask_fg 0x0f
 #define mask_bg 0xf0
 
-/* #define USE_SCROLLBACK */
+/* #define USE_SCROLLBACK 1 */
 
 
 /*************************************************************************
@@ -68,7 +68,7 @@ struct screen_data_t
     unsigned char init_attr;
     unsigned char map[256];
     unsigned short empty_line[256];
-#ifdef USE_SCROLLBACK
+#if USE_SCROLLBACK
     /* scrollback buffer */
     unsigned short sb_buf[32][256];
     int sb_size;
@@ -78,7 +78,7 @@ struct screen_data_t
 };
 
 
-#ifdef USE_SCROLLBACK
+#if USE_SCROLLBACK
 static __inline__ void sb_add(screen_t *this, int *val, int inc)
 {
     *val = (*val + inc) & (this->data->sb_size - 1);
@@ -311,7 +311,7 @@ static int init(screen_t *this, int fd)
     this->data->fd = -1;
     this->data->mode = -1;
     this->data->page = 0;
-#ifdef USE_SCROLLBACK
+#if USE_SCROLLBACK
     this->data->sb_size = 32;
     this->data->sb_base = 0;
     this->data->sb_sp = 0;
@@ -427,7 +427,7 @@ static int scrollUp(screen_t *this, int lines)
     if (lines <= 0 || lines > sr)
         return 0;
 
-#ifdef USE_SCROLLBACK
+#if USE_SCROLLBACK
     /* copy to scrollback buffer */
     for (y = 0; y < lines; y++)
     {
@@ -479,7 +479,7 @@ static int scrollDown(screen_t *this, int lines)
     /* copy top lines from scrollback buffer */
     for (y = lines; --y >= 0; )
     {
-#ifdef USE_SCROLLBACK
+#if USE_SCROLLBACK
         const unsigned short *buf = sb_pop(this);
         if (buf == NULL)
             clearLine(this,y);
@@ -608,7 +608,7 @@ screen_t *screen_vcsa_construct(void)
 }
 
 
-#endif /* defined(USE_SCREEN) && defined(USE_SCREEN_VCSA) */
+#endif /* (USE_SCREEN) && (USE_SCREEN_VCSA) */
 
 
 /*

src/s_win32.cpp

@@ -28,7 +28,7 @@
 
 #include "conf.h"
 
-#if defined(USE_SCREEN_WIN32)
+#if (USE_SCREEN_WIN32)
 
 #include "screen.h"
 
@@ -52,7 +52,7 @@
 #  define timeval win32_timeval  /* struct timeval already in <sys/time.h> */
 #endif
 #include <windows.h>
-#if defined(HAVE_CONIO_H)
+#if (HAVE_CONIO_H)
 #  include <conio.h>
 #endif
 
@@ -449,7 +449,7 @@ static int getScrollCounter(const screen_t *this)
 static int s_kbhit(screen_t *this)
 {
     UNUSED(this);
-#if defined(HAVE_CONIO_H)
+#if (HAVE_CONIO_H)
 # if defined(__RSXNT__)
     return 0;
 # elif defined(__BORLANDC__) || defined(__WATCOMC__)
@@ -526,7 +526,7 @@ screen_t *screen_win32_construct(void)
 }
 
 
-#endif /* defined(USE_SCREEN) && (ACC_OS_WIN32 || ACC_OS_WIN64) */
+#endif /* (USE_SCREEN_WIN32) */
 
 
 /*

src/screen.h

@@ -27,9 +27,9 @@
 
 
 #ifndef __UPX_SCREEN_H
-#define __UPX_SCREEN_H
+#define __UPX_SCREEN_H 1
 
-#if defined(USE_SCREEN)
+#if (USE_SCREEN)
 
 
 /*************************************************************************
@@ -113,7 +113,7 @@ void screen_show_frames(screen_t *);
 #undef LOGU
 #undef LOGS
 
-#if defined(SCREEN_DEBUG)
+#if (SCREEN_DEBUG)
 static void LOG(const char *format, ...)
 {
     static FILE *logfile = NULL;
@@ -129,13 +129,13 @@ static void LOG(const char *format, ...)
     fflush(logfile);
     va_end(args);
 }
-#  define LOGI(x)    LOG(#x " %ld\n", (long)(x))
+#  define LOGI(x)   LOG(#x " %ld\n", (long)(x))
-#  define LOGU(x)    LOG(#x " %lu\n", (long)(x))
+#  define LOGU(x)   LOG(#x " %lu\n", (long)(x))
-#  define LOGS(x)    LOG(#x " %s\n", x)
+#  define LOGS(x)   LOG(#x " %s\n", x)
 #else
-#  define LOGI(x)
+#  define LOGI(x)   /*empty*/
-#  define LOGU(x)
+#  define LOGU(x)   /*empty*/
-#  define LOGS(x)
+#  define LOGS(x)   /*empty*/
 #endif
 
 #endif /* if #0 */

src/snprintf.cpp

@@ -89,7 +89,7 @@
 #  define float     error no_float
 #  define double    error no_float
 #  endif
-#elif 0 || defined(HAVE_LONG_DOUBLE)
+#elif 0 || (HAVE_LONG_DOUBLE)
 #  define LDOUBLE   long double
 #else
 #  define LDOUBLE   double
@@ -263,7 +263,7 @@ static void fmtint(char *buffer, size_t *currlen, size_t maxlen,
 // floating format support
 **************************************************************************/
 
-#if !defined(NO_FLOAT)
+#if !(NO_FLOAT)
 
 static LDOUBLE abs_val(LDOUBLE value)
 {
@@ -490,7 +490,7 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
 }
 
 
-#endif /* !defined(NO_FLOAT) */
+#endif /* !(NO_FLOAT) */
 
 
 /*************************************************************************
@@ -501,7 +501,7 @@ static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args
 {
     char ch;
     LLONG value;
-#if !defined(NO_FLOAT)
+#if !(NO_FLOAT)
     LDOUBLE fvalue;
 #endif
     const char *strvalue;
@@ -665,7 +665,7 @@ static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args
                     value = (long)va_arg (args, unsigned int);
                 fmtint (buffer, &currlen, maxlen, value, 16, min, max, flags);
                 break;
-#if !defined(NO_FLOAT)
+#if !(NO_FLOAT)
             case 'f':
                 if (cflags == DP_C_LDOUBLE)
                     fvalue = va_arg (args, LDOUBLE);
@@ -698,7 +698,7 @@ static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args
             case 'g':
                 assert(0);
                 exit(255);
-#endif /* !defined(NO_FLOAT) */
+#endif /* !(NO_FLOAT) */
             case 'c':
                 dopr_outch (buffer, &currlen, maxlen, va_arg (args, int));
                 break;

src/snprintf.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_SNPRINTF_H
-#define __UPX_SNPRINTF_H
+#define __UPX_SNPRINTF_H 1
 
 #ifdef __cplusplus
 extern "C" {

src/stdcxx.cpp

@@ -26,7 +26,7 @@
  */
 
 
-//#define WANT_STL
+//#define WANT_STL 1
 #include "conf.h"
 #include "stdcxx.h"
 

src/stdcxx.h

@@ -27,7 +27,7 @@
 
 
 #ifndef __UPX_STDCXX_H
-#define __UPX_STDCXX_H
+#define __UPX_STDCXX_H 1
 
 #ifdef __cplusplus
 
@@ -93,9 +93,9 @@ using namespace std;
 #elif (ACC_CC_DMC)
 namespace std { class bad_alloc { }; }
 #elif (ACC_CC_GNUC && ACC_OS_EMX)
-#define std
+#define std /*empty*/
 #elif (ACC_CC_SYMANTECC)
-#define std
+#define std /*empty*/
 class bad_alloc { };
 #endif
 
@@ -107,11 +107,11 @@ class bad_alloc { };
 #ifdef WANT_STL
 
 #if defined(__linux__)
-#  define _NOTHREADS
+#  define _NOTHREADS 1
 #endif
 #if defined(__GNUC__)
 #  define __THROW_BAD_ALLOC     throw bad_alloc()
-#  define __USE_MALLOC
+#  define __USE_MALLOC          1
 #  define enable                upx_stl_enable
 #endif
 #if defined(_MSC_VER)

src/stub/amd64-linux.elf-entry.h

@@ -1,5 +1,5 @@
 /* amd64-linux.elf-entry.h
-   created from amd64-linux.elf-entry.bin, 10412 (0x28ac) bytes
+   created from amd64-linux.elf-entry.bin, 10420 (0x28b4) bytes
 
    This file is part of the UPX executable compressor.
 
@@ -31,14 +31,14 @@
  */
 
 
-#define STUB_AMD64_LINUX_ELF_ENTRY_SIZE    10412
+#define STUB_AMD64_LINUX_ELF_ENTRY_SIZE    10420
-#define STUB_AMD64_LINUX_ELF_ENTRY_ADLER32 0x1f234954
+#define STUB_AMD64_LINUX_ELF_ENTRY_ADLER32 0xf5c24a13
-#define STUB_AMD64_LINUX_ELF_ENTRY_CRC32   0x86a6c65f
+#define STUB_AMD64_LINUX_ELF_ENTRY_CRC32   0xccd1eb0e
 
-unsigned char stub_amd64_linux_elf_entry[10412] = {
+unsigned char stub_amd64_linux_elf_entry[10420] = {
 /* 0x0000 */ 127, 69, 76, 70,  2,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0010 */   1,  0, 62,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-/* 0x0020 */   0,  0,  0,  0,  0,  0,  0,  0,144, 24,  0,  0,  0,  0,  0,  0,
+/* 0x0020 */   0,  0,  0,  0,  0,  0,  0,  0,152, 24,  0,  0,  0,  0,  0,  0,
 /* 0x0030 */   0,  0,  0,  0, 64,  0,  0,  0,  0,  0, 64,  0, 26,  0, 23,  0,
 /* 0x0040 */ 232,  0,  0,  0,  0, 85, 83, 81, 82, 72,  1,254, 86, 72,137,254,
 /* 0x0050 */  72,137,215, 49,219, 49,201, 72,131,205,255,232, 80,  0,  0,  0,
@@ -412,279 +412,280 @@ unsigned char stub_amd64_linux_elf_entry[10412] = {
 /* 0x1750 */   0,  0,  0, 80,104,  0,  0,  0,  0, 81, 65, 87,191,  0,  0,  0,
 /* 0x1760 */   0,106,  7, 90,190,  0,  0,  0,  0,106, 50, 65, 90, 69, 41,192,
 /* 0x1770 */ 106,  9, 88, 15,  5, 57,199, 15,133,  0,  0,  0,  0,190,  0,  0,
-/* 0x1780 */   0,  0,137,250, 41,242,116, 13,  1,213,137,217, 41,241,193,233,
+/* 0x1780 */   0,  0,137,250, 41,242,116, 21,  1,213,  1, 84, 36,  8,  1, 84,
-/* 0x1790 */   3,252,243, 72,165,151, 72,137,222, 80,146,173, 80, 72,137,225,
+/* 0x1790 */  36, 24,137,217, 41,241,193,233,  3,252,243, 72,165,151, 72,137,
-/* 0x17a0 */ 173,151,173, 68, 15,182,192, 72,135,254,255,213, 89,195, 93, 72,
+/* 0x17a0 */ 222, 80,146,173, 80, 72,137,225,173,151,173, 68, 15,182,192, 72,
-/* 0x17b0 */ 141, 69,247, 68,139, 56,186,200,  0,  0,  0, 76, 41,248, 65, 41,
+/* 0x17b0 */ 135,254,255,213, 89,195, 93, 72,141, 69,247, 68,139, 56,186,200,
-/* 0x17c0 */ 215, 72,141, 12, 16,232,  0,  0,  0,  0,102,105,108,101, 32,102,
+/* 0x17c0 */   0,  0,  0, 76, 41,248, 65, 41,215, 72,141, 12, 16,232,  0,  0,
-/* 0x17d0 */ 111,114,109, 97,116, 32,101,108,102, 54, 52, 45,120, 56, 54, 45,
+/* 0x17d0 */   0,  0,102,105,108,101, 32,102,111,114,109, 97,116, 32,101,108,
-/* 0x17e0 */  54, 52, 10, 10, 83,101, 99,116,105,111,110,115, 58, 10, 73,100,
+/* 0x17e0 */ 102, 54, 52, 45,120, 56, 54, 45, 54, 52, 10, 10, 83,101, 99,116,
-/* 0x17f0 */ 120, 32, 78, 97,109,101, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+/* 0x17f0 */ 105,111,110,115, 58, 10, 73,100,120, 32, 78, 97,109,101, 32, 32,
-/* 0x1800 */  83,105,122,101, 32, 32, 32, 32, 32, 32, 86, 77, 65, 32, 32, 32,
+/* 0x1800 */  32, 32, 32, 32, 32, 32, 32, 32, 83,105,122,101, 32, 32, 32, 32,
-/* 0x1810 */  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 76, 77, 65, 32,
+/* 0x1810 */  32, 32, 86, 77, 65, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-/* 0x1820 */  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 70,105,
+/* 0x1820 */  32, 32, 32, 32, 76, 77, 65, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-/* 0x1830 */ 108,101, 32,111,102,102, 32, 32, 65,108,103,110, 32, 32, 70,108,
+/* 0x1830 */  32, 32, 32, 32, 32, 32, 70,105,108,101, 32,111,102,102, 32, 32,
-/* 0x1840 */  97,103,115, 10, 32, 32, 48, 32, 69, 76, 70, 77, 65, 73, 78, 88,
+/* 0x1840 */  65,108,103,110, 32, 32, 70,108, 97,103,115, 10, 32, 32, 48, 32,
-/* 0x1850 */  32, 32, 32, 32, 32, 32, 48, 48, 48, 48, 48, 48, 48,100, 32, 32,
+/* 0x1850 */  69, 76, 70, 77, 65, 73, 78, 88, 32, 32, 32, 32, 32, 32, 48, 48,
-/* 0x1860 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1860 */  48, 48, 48, 48, 48,100, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1870 */  32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1870 */  48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 48, 48,
-/* 0x1880 */  48, 48, 32, 32, 48, 48, 48, 48, 48, 48, 52, 48, 32, 32, 50, 42,
+/* 0x1880 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48,
-/* 0x1890 */  42, 48, 32, 32, 67, 79, 78, 84, 69, 78, 84, 83, 44, 32, 82, 69,
+/* 0x1890 */  48, 48, 52, 48, 32, 32, 50, 42, 42, 48, 32, 32, 67, 79, 78, 84,
-/* 0x18a0 */  76, 79, 67, 44, 32, 82, 69, 65, 68, 79, 78, 76, 89, 10, 32, 32,
+/* 0x18a0 */  69, 78, 84, 83, 44, 32, 82, 69, 76, 79, 67, 44, 32, 82, 69, 65,
-/* 0x18b0 */  49, 32, 78, 82, 86, 95, 72, 69, 65, 68, 32, 32, 32, 32, 32, 32,
+/* 0x18b0 */  68, 79, 78, 76, 89, 10, 32, 32, 49, 32, 78, 82, 86, 95, 72, 69,
-/* 0x18c0 */  48, 48, 48, 48, 48, 48, 54, 54, 32, 32, 48, 48, 48, 48, 48, 48,
+/* 0x18c0 */  65, 68, 32, 32, 32, 32, 32, 32, 48, 48, 48, 48, 48, 48, 54, 54,
-/* 0x18d0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48,
+/* 0x18d0 */  32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x18e0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48,
+/* 0x18e0 */  48, 48, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x18f0 */  48, 48, 48, 48, 52,100, 32, 32, 50, 42, 42, 48, 32, 32, 67, 79,
+/* 0x18f0 */  48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 48, 48, 52,100, 32, 32,
-/* 0x1900 */  78, 84, 69, 78, 84, 83, 44, 32, 82, 69, 65, 68, 79, 78, 76, 89,
+/* 0x1900 */  50, 42, 42, 48, 32, 32, 67, 79, 78, 84, 69, 78, 84, 83, 44, 32,
-/* 0x1910 */  10, 32, 32, 50, 32, 78, 82, 86, 50, 69, 32, 32, 32, 32, 32, 32,
+/* 0x1910 */  82, 69, 65, 68, 79, 78, 76, 89, 10, 32, 32, 50, 32, 78, 82, 86,
-/* 0x1920 */  32, 32, 32, 48, 48, 48, 48, 48, 48, 98, 55, 32, 32, 48, 48, 48,
+/* 0x1920 */  50, 69, 32, 32, 32, 32, 32, 32, 32, 32, 32, 48, 48, 48, 48, 48,
-/* 0x1930 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48,
+/* 0x1930 */  48, 98, 55, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1940 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32,
+/* 0x1940 */  48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1950 */  32, 48, 48, 48, 48, 48, 48, 98, 51, 32, 32, 50, 42, 42, 48, 32,
+/* 0x1950 */  48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 48, 48, 98,
-/* 0x1960 */  32, 67, 79, 78, 84, 69, 78, 84, 83, 44, 32, 82, 69, 76, 79, 67,
+/* 0x1960 */  51, 32, 32, 50, 42, 42, 48, 32, 32, 67, 79, 78, 84, 69, 78, 84,
-/* 0x1970 */  44, 32, 82, 69, 65, 68, 79, 78, 76, 89, 10, 32, 32, 51, 32, 78,
+/* 0x1970 */  83, 44, 32, 82, 69, 76, 79, 67, 44, 32, 82, 69, 65, 68, 79, 78,
-/* 0x1980 */  82, 86, 50, 68, 32, 32, 32, 32, 32, 32, 32, 32, 32, 48, 48, 48,
+/* 0x1980 */  76, 89, 10, 32, 32, 51, 32, 78, 82, 86, 50, 68, 32, 32, 32, 32,
-/* 0x1990 */  48, 48, 48, 57,101, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1990 */  32, 32, 32, 32, 32, 48, 48, 48, 48, 48, 48, 57,101, 32, 32, 48,
-/* 0x19a0 */  48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 48, 48, 48,
+/* 0x19a0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32,
-/* 0x19b0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 48,
+/* 0x19b0 */  32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x19c0 */  49, 54, 97, 32, 32, 50, 42, 42, 48, 32, 32, 67, 79, 78, 84, 69,
+/* 0x19c0 */  48, 32, 32, 48, 48, 48, 48, 48, 49, 54, 97, 32, 32, 50, 42, 42,
-/* 0x19d0 */  78, 84, 83, 44, 32, 82, 69, 76, 79, 67, 44, 32, 82, 69, 65, 68,
+/* 0x19d0 */  48, 32, 32, 67, 79, 78, 84, 69, 78, 84, 83, 44, 32, 82, 69, 76,
-/* 0x19e0 */  79, 78, 76, 89, 10, 32, 32, 52, 32, 78, 82, 86, 50, 66, 32, 32,
+/* 0x19e0 */  79, 67, 44, 32, 82, 69, 65, 68, 79, 78, 76, 89, 10, 32, 32, 52,
-/* 0x19f0 */  32, 32, 32, 32, 32, 32, 32, 48, 48, 48, 48, 48, 48, 57, 48, 32,
+/* 0x19f0 */  32, 78, 82, 86, 50, 66, 32, 32, 32, 32, 32, 32, 32, 32, 32, 48,
-/* 0x1a00 */  32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1a00 */  48, 48, 48, 48, 48, 57, 48, 32, 32, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1a10 */  48, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1a10 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 48,
-/* 0x1a20 */  48, 48, 48, 32, 32, 48, 48, 48, 48, 48, 50, 48, 56, 32, 32, 50,
+/* 0x1a20 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48,
-/* 0x1a30 */  42, 42, 48, 32, 32, 67, 79, 78, 84, 69, 78, 84, 83, 44, 32, 82,
+/* 0x1a30 */  48, 48, 50, 48, 56, 32, 32, 50, 42, 42, 48, 32, 32, 67, 79, 78,
-/* 0x1a40 */  69, 76, 79, 67, 44, 32, 82, 69, 65, 68, 79, 78, 76, 89, 10, 32,
+/* 0x1a40 */  84, 69, 78, 84, 83, 44, 32, 82, 69, 76, 79, 67, 44, 32, 82, 69,
-/* 0x1a50 */  32, 53, 32, 76, 90, 77, 65, 95, 69, 76, 70, 48, 48, 32, 32, 32,
+/* 0x1a50 */  65, 68, 79, 78, 76, 89, 10, 32, 32, 53, 32, 76, 90, 77, 65, 95,
-/* 0x1a60 */  32, 48, 48, 48, 48, 48, 48, 54, 52, 32, 32, 48, 48, 48, 48, 48,
+/* 0x1a60 */  69, 76, 70, 48, 48, 32, 32, 32, 32, 48, 48, 48, 48, 48, 48, 54,
-/* 0x1a70 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48,
+/* 0x1a70 */  52, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1a80 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48,
+/* 0x1a80 */  48, 48, 48, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1a90 */  48, 48, 48, 48, 50, 57, 56, 32, 32, 50, 42, 42, 48, 32, 32, 67,
+/* 0x1a90 */  48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 48, 50, 57, 56, 32,
-/* 0x1aa0 */  79, 78, 84, 69, 78, 84, 83, 44, 32, 82, 69, 76, 79, 67, 44, 32,
+/* 0x1aa0 */  32, 50, 42, 42, 48, 32, 32, 67, 79, 78, 84, 69, 78, 84, 83, 44,
-/* 0x1ab0 */  82, 69, 65, 68, 79, 78, 76, 89, 10, 32, 32, 54, 32, 76, 90, 77,
+/* 0x1ab0 */  32, 82, 69, 76, 79, 67, 44, 32, 82, 69, 65, 68, 79, 78, 76, 89,
-/* 0x1ac0 */  65, 95, 68, 69, 67, 49, 48, 32, 32, 32, 32, 48, 48, 48, 48, 48,
+/* 0x1ac0 */  10, 32, 32, 54, 32, 76, 90, 77, 65, 95, 68, 69, 67, 49, 48, 32,
-/* 0x1ad0 */  57,102, 55, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1ad0 */  32, 32, 32, 48, 48, 48, 48, 48, 57,102, 55, 32, 32, 48, 48, 48,
-/* 0x1ae0 */  48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1ae0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48,
-/* 0x1af0 */  48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 48, 50,102,
+/* 0x1af0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32,
-/* 0x1b00 */  99, 32, 32, 50, 42, 42, 48, 32, 32, 67, 79, 78, 84, 69, 78, 84,
+/* 0x1b00 */  32, 48, 48, 48, 48, 48, 50,102, 99, 32, 32, 50, 42, 42, 48, 32,
-/* 0x1b10 */  83, 44, 32, 82, 69, 65, 68, 79, 78, 76, 89, 10, 32, 32, 55, 32,
+/* 0x1b10 */  32, 67, 79, 78, 84, 69, 78, 84, 83, 44, 32, 82, 69, 65, 68, 79,
-/* 0x1b20 */  76, 90, 77, 65, 95, 68, 69, 67, 50, 48, 32, 32, 32, 32, 48, 48,
+/* 0x1b20 */  78, 76, 89, 10, 32, 32, 55, 32, 76, 90, 77, 65, 95, 68, 69, 67,
-/* 0x1b30 */  48, 48, 48, 57,102, 55, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1b30 */  50, 48, 32, 32, 32, 32, 48, 48, 48, 48, 48, 57,102, 55, 32, 32,
-/* 0x1b40 */  48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 48, 48,
+/* 0x1b40 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1b50 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48,
+/* 0x1b50 */  32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1b60 */  48, 99,102, 51, 32, 32, 50, 42, 42, 48, 32, 32, 67, 79, 78, 84,
+/* 0x1b60 */  48, 48, 32, 32, 48, 48, 48, 48, 48, 99,102, 51, 32, 32, 50, 42,
-/* 0x1b70 */  69, 78, 84, 83, 44, 32, 82, 69, 65, 68, 79, 78, 76, 89, 10, 32,
+/* 0x1b70 */  42, 48, 32, 32, 67, 79, 78, 84, 69, 78, 84, 83, 44, 32, 82, 69,
-/* 0x1b80 */  32, 56, 32, 76, 90, 77, 65, 95, 68, 69, 67, 51, 48, 32, 32, 32,
+/* 0x1b80 */  65, 68, 79, 78, 76, 89, 10, 32, 32, 56, 32, 76, 90, 77, 65, 95,
-/* 0x1b90 */  32, 48, 48, 48, 48, 48, 48, 49, 52, 32, 32, 48, 48, 48, 48, 48,
+/* 0x1b90 */  68, 69, 67, 51, 48, 32, 32, 32, 32, 48, 48, 48, 48, 48, 48, 49,
-/* 0x1ba0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48,
+/* 0x1ba0 */  52, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1bb0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48,
+/* 0x1bb0 */  48, 48, 48, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1bc0 */  48, 48, 48, 49, 54,101, 97, 32, 32, 50, 42, 42, 48, 32, 32, 67,
+/* 0x1bc0 */  48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 49, 54,101, 97, 32,
-/* 0x1bd0 */  79, 78, 84, 69, 78, 84, 83, 44, 32, 82, 69, 65, 68, 79, 78, 76,
+/* 0x1bd0 */  32, 50, 42, 42, 48, 32, 32, 67, 79, 78, 84, 69, 78, 84, 83, 44,
-/* 0x1be0 */  89, 10, 32, 32, 57, 32, 78, 82, 86, 95, 84, 65, 73, 76, 32, 32,
+/* 0x1be0 */  32, 82, 69, 65, 68, 79, 78, 76, 89, 10, 32, 32, 57, 32, 78, 82,
-/* 0x1bf0 */  32, 32, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48,
+/* 0x1bf0 */  86, 95, 84, 65, 73, 76, 32, 32, 32, 32, 32, 32, 48, 48, 48, 48,
-/* 0x1c00 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32,
+/* 0x1c00 */  48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1c10 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1c10 */  48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1c20 */  32, 32, 48, 48, 48, 48, 49, 54,102,101, 32, 32, 50, 42, 42, 48,
+/* 0x1c20 */  48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 49, 54,
-/* 0x1c30 */  32, 32, 67, 79, 78, 84, 69, 78, 84, 83, 44, 32, 82, 69, 65, 68,
+/* 0x1c30 */ 102,101, 32, 32, 50, 42, 42, 48, 32, 32, 67, 79, 78, 84, 69, 78,
-/* 0x1c40 */  79, 78, 76, 89, 10, 32, 49, 48, 32, 69, 76, 70, 77, 65, 73, 78,
+/* 0x1c40 */  84, 83, 44, 32, 82, 69, 65, 68, 79, 78, 76, 89, 10, 32, 49, 48,
-/* 0x1c50 */  89, 32, 32, 32, 32, 32, 32, 48, 48, 48, 48, 48, 48, 51, 97, 32,
+/* 0x1c50 */  32, 69, 76, 70, 77, 65, 73, 78, 89, 32, 32, 32, 32, 32, 32, 48,
-/* 0x1c60 */  32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1c60 */  48, 48, 48, 48, 48, 51, 97, 32, 32, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1c70 */  48, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1c70 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 48,
-/* 0x1c80 */  48, 48, 48, 32, 32, 48, 48, 48, 48, 49, 54,102,101, 32, 32, 50,
+/* 0x1c80 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48,
-/* 0x1c90 */  42, 42, 48, 32, 32, 67, 79, 78, 84, 69, 78, 84, 83, 44, 32, 82,
+/* 0x1c90 */  48, 49, 54,102,101, 32, 32, 50, 42, 42, 48, 32, 32, 67, 79, 78,
-/* 0x1ca0 */  69, 76, 79, 67, 44, 32, 82, 69, 65, 68, 79, 78, 76, 89, 10, 32,
+/* 0x1ca0 */  84, 69, 78, 84, 83, 44, 32, 82, 69, 76, 79, 67, 44, 32, 82, 69,
-/* 0x1cb0 */  49, 49, 32, 69, 76, 70, 77, 65, 73, 78, 90, 32, 32, 32, 32, 32,
+/* 0x1cb0 */  65, 68, 79, 78, 76, 89, 10, 32, 49, 49, 32, 69, 76, 70, 77, 65,
-/* 0x1cc0 */  32, 48, 48, 48, 48, 48, 48, 49, 50, 32, 32, 48, 48, 48, 48, 48,
+/* 0x1cc0 */  73, 78, 90, 32, 32, 32, 32, 32, 32, 48, 48, 48, 48, 48, 48, 49,
-/* 0x1cd0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48,
+/* 0x1cd0 */  50, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1ce0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48,
+/* 0x1ce0 */  48, 48, 48, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1cf0 */  48, 48, 48, 49, 55, 51, 56, 32, 32, 50, 42, 42, 48, 32, 32, 67,
+/* 0x1cf0 */  48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 49, 55, 51, 56, 32,
-/* 0x1d00 */  79, 78, 84, 69, 78, 84, 83, 44, 32, 82, 69, 65, 68, 79, 78, 76,
+/* 0x1d00 */  32, 50, 42, 42, 48, 32, 32, 67, 79, 78, 84, 69, 78, 84, 83, 44,
-/* 0x1d10 */  89, 10, 32, 49, 50, 32, 76, 85, 78, 77, 80, 48, 48, 48, 32, 32,
+/* 0x1d10 */  32, 82, 69, 65, 68, 79, 78, 76, 89, 10, 32, 49, 50, 32, 76, 85,
-/* 0x1d20 */  32, 32, 32, 32, 48, 48, 48, 48, 48, 48, 48, 50, 32, 32, 48, 48,
+/* 0x1d20 */  78, 77, 80, 48, 48, 48, 32, 32, 32, 32, 32, 32, 48, 48, 48, 48,
-/* 0x1d30 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32,
+/* 0x1d30 */  48, 48, 48, 50, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1d40 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1d40 */  48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1d50 */  32, 32, 48, 48, 48, 48, 49, 55, 52, 97, 32, 32, 50, 42, 42, 48,
+/* 0x1d50 */  48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 49, 55,
-/* 0x1d60 */  32, 32, 67, 79, 78, 84, 69, 78, 84, 83, 44, 32, 82, 69, 65, 68,
+/* 0x1d60 */  52, 97, 32, 32, 50, 42, 42, 48, 32, 32, 67, 79, 78, 84, 69, 78,
-/* 0x1d70 */  79, 78, 76, 89, 10, 32, 49, 51, 32, 76, 85, 78, 77, 80, 48, 48,
+/* 0x1d70 */  84, 83, 44, 32, 82, 69, 65, 68, 79, 78, 76, 89, 10, 32, 49, 51,
-/* 0x1d80 */  49, 32, 32, 32, 32, 32, 32, 48, 48, 48, 48, 48, 48, 48, 50, 32,
+/* 0x1d80 */  32, 76, 85, 78, 77, 80, 48, 48, 49, 32, 32, 32, 32, 32, 32, 48,
-/* 0x1d90 */  32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1d90 */  48, 48, 48, 48, 48, 48, 50, 32, 32, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1da0 */  48, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1da0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 48,
-/* 0x1db0 */  48, 48, 48, 32, 32, 48, 48, 48, 48, 49, 55, 52, 99, 32, 32, 50,
+/* 0x1db0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48,
-/* 0x1dc0 */  42, 42, 48, 32, 32, 67, 79, 78, 84, 69, 78, 84, 83, 44, 32, 82,
+/* 0x1dc0 */  48, 49, 55, 52, 99, 32, 32, 50, 42, 42, 48, 32, 32, 67, 79, 78,
-/* 0x1dd0 */  69, 65, 68, 79, 78, 76, 89, 10, 32, 49, 52, 32, 69, 76, 70, 77,
+/* 0x1dd0 */  84, 69, 78, 84, 83, 44, 32, 82, 69, 65, 68, 79, 78, 76, 89, 10,
-/* 0x1de0 */  65, 73, 78, 90,117, 32, 32, 32, 32, 32, 48, 48, 48, 48, 48, 48,
+/* 0x1de0 */  32, 49, 52, 32, 69, 76, 70, 77, 65, 73, 78, 90,117, 32, 32, 32,
-/* 0x1df0 */  55, 99, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1df0 */  32, 32, 48, 48, 48, 48, 48, 48, 56, 52, 32, 32, 48, 48, 48, 48,
-/* 0x1e00 */  48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1e00 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 48, 48,
-/* 0x1e10 */  48, 48, 48, 48, 48, 48, 32, 32, 48, 48, 48, 48, 49, 55, 52,101,
+/* 0x1e10 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32,
-/* 0x1e20 */  32, 32, 50, 42, 42, 48, 32, 32, 67, 79, 78, 84, 69, 78, 84, 83,
+/* 0x1e20 */  48, 48, 48, 48, 49, 55, 52,101, 32, 32, 50, 42, 42, 48, 32, 32,
-/* 0x1e30 */  44, 32, 82, 69, 76, 79, 67, 44, 32, 82, 69, 65, 68, 79, 78, 76,
+/* 0x1e30 */  67, 79, 78, 84, 69, 78, 84, 83, 44, 32, 82, 69, 76, 79, 67, 44,
-/* 0x1e40 */  89, 10, 83, 89, 77, 66, 79, 76, 32, 84, 65, 66, 76, 69, 58, 10,
+/* 0x1e40 */  32, 82, 69, 65, 68, 79, 78, 76, 89, 10, 83, 89, 77, 66, 79, 76,
-/* 0x1e50 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1e50 */  32, 84, 65, 66, 76, 69, 58, 10, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1e60 */  32,108, 32, 32, 32, 32,100, 32, 32, 78, 82, 86, 95, 72, 69, 65,
+/* 0x1e60 */  48, 48, 48, 48, 48, 48, 48, 48, 32,108, 32, 32, 32, 32,100, 32,
-/* 0x1e70 */  68,  9, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1e70 */  32, 78, 82, 86, 95, 72, 69, 65, 68,  9, 48, 48, 48, 48, 48, 48,
-/* 0x1e80 */  48, 48, 32, 78, 82, 86, 95, 72, 69, 65, 68, 10, 48, 48, 48, 48,
+/* 0x1e80 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 78, 82, 86, 95, 72,
-/* 0x1e90 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32,108, 32, 32,
+/* 0x1e90 */  69, 65, 68, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1ea0 */  32, 32,100, 32, 32, 76, 90, 77, 65, 95, 68, 69, 67, 51, 48,  9,
+/* 0x1ea0 */  48, 48, 48, 48, 32,108, 32, 32, 32, 32,100, 32, 32, 76, 90, 77,
-/* 0x1eb0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1eb0 */  65, 95, 68, 69, 67, 51, 48,  9, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1ec0 */  32, 76, 90, 77, 65, 95, 68, 69, 67, 51, 48, 10, 48, 48, 48, 48,
+/* 0x1ec0 */  48, 48, 48, 48, 48, 48, 48, 48, 32, 76, 90, 77, 65, 95, 68, 69,
-/* 0x1ed0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32,108, 32, 32,
+/* 0x1ed0 */  67, 51, 48, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1ee0 */  32, 32,100, 32, 32, 69, 76, 70, 77, 65, 73, 78, 89,  9, 48, 48,
+/* 0x1ee0 */  48, 48, 48, 48, 32,108, 32, 32, 32, 32,100, 32, 32, 69, 76, 70,
-/* 0x1ef0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 69,
+/* 0x1ef0 */  77, 65, 73, 78, 89,  9, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1f00 */  76, 70, 77, 65, 73, 78, 89, 10, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1f00 */  48, 48, 48, 48, 48, 48, 32, 69, 76, 70, 77, 65, 73, 78, 89, 10,
-/* 0x1f10 */  48, 48, 48, 48, 48, 48, 48, 48, 32,108, 32, 32, 32, 32,100, 32,
+/* 0x1f10 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1f20 */  32, 69, 76, 70, 77, 65, 73, 78, 90,  9, 48, 48, 48, 48, 48, 48,
+/* 0x1f20 */  32,108, 32, 32, 32, 32,100, 32, 32, 69, 76, 70, 77, 65, 73, 78,
-/* 0x1f30 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 69, 76, 70, 77, 65,
+/* 0x1f30 */  90,  9, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1f40 */  73, 78, 90, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1f40 */  48, 48, 32, 69, 76, 70, 77, 65, 73, 78, 90, 10, 48, 48, 48, 48,
-/* 0x1f50 */  48, 48, 48, 48, 32,108, 32, 32, 32, 32,100, 32, 32, 69, 76, 70,
+/* 0x1f50 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32,108, 32, 32,
-/* 0x1f60 */  77, 65, 73, 78, 90,117,  9, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1f60 */  32, 32,100, 32, 32, 69, 76, 70, 77, 65, 73, 78, 90,117,  9, 48,
-/* 0x1f70 */  48, 48, 48, 48, 48, 48, 48, 32, 69, 76, 70, 77, 65, 73, 78, 90,
+/* 0x1f70 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32,
-/* 0x1f80 */ 117, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1f80 */  69, 76, 70, 77, 65, 73, 78, 90,117, 10, 48, 48, 48, 48, 48, 48,
-/* 0x1f90 */  48, 48, 32,108, 32, 32, 32, 32,100, 32, 32, 69, 76, 70, 77, 65,
+/* 0x1f90 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32,108, 32, 32, 32, 32,
-/* 0x1fa0 */  73, 78, 88,  9, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1fa0 */ 100, 32, 32, 69, 76, 70, 77, 65, 73, 78, 88,  9, 48, 48, 48, 48,
-/* 0x1fb0 */  48, 48, 48, 48, 32, 69, 76, 70, 77, 65, 73, 78, 88, 10, 48, 48,
+/* 0x1fb0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 69, 76, 70,
-/* 0x1fc0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32,108,
+/* 0x1fc0 */  77, 65, 73, 78, 88, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1fd0 */  32, 32, 32, 32,100, 32, 32, 78, 82, 86, 50, 69,  9, 48, 48, 48,
+/* 0x1fd0 */  48, 48, 48, 48, 48, 48, 32,108, 32, 32, 32, 32,100, 32, 32, 78,
-/* 0x1fe0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 78, 82,
+/* 0x1fe0 */  82, 86, 50, 69,  9, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x1ff0 */  86, 50, 69, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x1ff0 */  48, 48, 48, 48, 48, 32, 78, 82, 86, 50, 69, 10, 48, 48, 48, 48,
-/* 0x2000 */  48, 48, 48, 48, 32,108, 32, 32, 32, 32,100, 32, 32, 78, 82, 86,
+/* 0x2000 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32,108, 32, 32,
-/* 0x2010 */  50, 68,  9, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x2010 */  32, 32,100, 32, 32, 78, 82, 86, 50, 68,  9, 48, 48, 48, 48, 48,
-/* 0x2020 */  48, 48, 48, 32, 78, 82, 86, 50, 68, 10, 48, 48, 48, 48, 48, 48,
+/* 0x2020 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 78, 82, 86, 50,
-/* 0x2030 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32,108, 32, 32, 32, 32,
+/* 0x2030 */  68, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x2040 */ 100, 32, 32, 78, 82, 86, 50, 66,  9, 48, 48, 48, 48, 48, 48, 48,
+/* 0x2040 */  48, 48, 32,108, 32, 32, 32, 32,100, 32, 32, 78, 82, 86, 50, 66,
-/* 0x2050 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 78, 82, 86, 50, 66, 10,
+/* 0x2050 */   9, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x2060 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x2060 */  48, 32, 78, 82, 86, 50, 66, 10, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x2070 */  32,108, 32, 32, 32, 32,100, 32, 32, 76, 90, 77, 65, 95, 69, 76,
+/* 0x2070 */  48, 48, 48, 48, 48, 48, 48, 48, 32,108, 32, 32, 32, 32,100, 32,
-/* 0x2080 */  70, 48, 48,  9, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x2080 */  32, 76, 90, 77, 65, 95, 69, 76, 70, 48, 48,  9, 48, 48, 48, 48,
-/* 0x2090 */  48, 48, 48, 48, 32, 76, 90, 77, 65, 95, 69, 76, 70, 48, 48, 10,
+/* 0x2090 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 76, 90, 77,
-/* 0x20a0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x20a0 */  65, 95, 69, 76, 70, 48, 48, 10, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x20b0 */  32,108, 32, 32, 32, 32,100, 32, 32, 76, 90, 77, 65, 95, 68, 69,
+/* 0x20b0 */  48, 48, 48, 48, 48, 48, 48, 48, 32,108, 32, 32, 32, 32,100, 32,
-/* 0x20c0 */  67, 49, 48,  9, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x20c0 */  32, 76, 90, 77, 65, 95, 68, 69, 67, 49, 48,  9, 48, 48, 48, 48,
-/* 0x20d0 */  48, 48, 48, 48, 32, 76, 90, 77, 65, 95, 68, 69, 67, 49, 48, 10,
+/* 0x20d0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 76, 90, 77,
-/* 0x20e0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x20e0 */  65, 95, 68, 69, 67, 49, 48, 10, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x20f0 */  32,108, 32, 32, 32, 32,100, 32, 32, 76, 90, 77, 65, 95, 68, 69,
+/* 0x20f0 */  48, 48, 48, 48, 48, 48, 48, 48, 32,108, 32, 32, 32, 32,100, 32,
-/* 0x2100 */  67, 50, 48,  9, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x2100 */  32, 76, 90, 77, 65, 95, 68, 69, 67, 50, 48,  9, 48, 48, 48, 48,
-/* 0x2110 */  48, 48, 48, 48, 32, 76, 90, 77, 65, 95, 68, 69, 67, 50, 48, 10,
+/* 0x2110 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 76, 90, 77,
-/* 0x2120 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x2120 */  65, 95, 68, 69, 67, 50, 48, 10, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x2130 */  32,108, 32, 32, 32, 32,100, 32, 32, 78, 82, 86, 95, 84, 65, 73,
+/* 0x2130 */  48, 48, 48, 48, 48, 48, 48, 48, 32,108, 32, 32, 32, 32,100, 32,
-/* 0x2140 */  76,  9, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x2140 */  32, 78, 82, 86, 95, 84, 65, 73, 76,  9, 48, 48, 48, 48, 48, 48,
-/* 0x2150 */  48, 48, 32, 78, 82, 86, 95, 84, 65, 73, 76, 10, 48, 48, 48, 48,
+/* 0x2150 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 78, 82, 86, 95, 84,
-/* 0x2160 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32,108, 32, 32,
+/* 0x2160 */  65, 73, 76, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x2170 */  32, 32,100, 32, 32, 76, 85, 78, 77, 80, 48, 48, 48,  9, 48, 48,
+/* 0x2170 */  48, 48, 48, 48, 32,108, 32, 32, 32, 32,100, 32, 32, 76, 85, 78,
-/* 0x2180 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 76,
+/* 0x2180 */  77, 80, 48, 48, 48,  9, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x2190 */  85, 78, 77, 80, 48, 48, 48, 10, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x2190 */  48, 48, 48, 48, 48, 48, 32, 76, 85, 78, 77, 80, 48, 48, 48, 10,
-/* 0x21a0 */  48, 48, 48, 48, 48, 48, 48, 48, 32,108, 32, 32, 32, 32,100, 32,
+/* 0x21a0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x21b0 */  32, 76, 85, 78, 77, 80, 48, 48, 49,  9, 48, 48, 48, 48, 48, 48,
+/* 0x21b0 */  32,108, 32, 32, 32, 32,100, 32, 32, 76, 85, 78, 77, 80, 48, 48,
-/* 0x21c0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 76, 85, 78, 77, 80,
+/* 0x21c0 */  49,  9, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x21d0 */  48, 48, 49, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x21d0 */  48, 48, 32, 76, 85, 78, 77, 80, 48, 48, 49, 10, 48, 48, 48, 48,
-/* 0x21e0 */  48, 48, 48, 48, 32,103, 32, 32, 32, 32, 32, 32, 32, 69, 76, 70,
+/* 0x21e0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32,103, 32, 32,
-/* 0x21f0 */  77, 65, 73, 78, 88,  9, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x21f0 */  32, 32, 32, 32, 32, 69, 76, 70, 77, 65, 73, 78, 88,  9, 48, 48,
-/* 0x2200 */  48, 48, 48, 48, 48, 48, 32, 95,115,116, 97,114,116, 10, 48, 48,
+/* 0x2200 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 95,
-/* 0x2210 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32,
+/* 0x2210 */ 115,116, 97,114,116, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x2220 */  32, 32, 32, 32, 32, 32, 32, 42, 85, 78, 68, 42,  9, 48, 48, 48,
+/* 0x2220 */  48, 48, 48, 48, 48, 48, 32, 32, 32, 32, 32, 32, 32, 32, 32, 42,
-/* 0x2230 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 74, 77,
+/* 0x2230 */  85, 78, 68, 42,  9, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x2240 */  80, 85, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x2240 */  48, 48, 48, 48, 48, 32, 74, 77, 80, 85, 10, 48, 48, 48, 48, 48,
-/* 0x2250 */  48, 48, 48, 32, 32, 32, 32, 32, 32, 32, 32, 32, 42, 85, 78, 68,
+/* 0x2250 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 32, 32, 32,
-/* 0x2260 */  42,  9, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x2260 */  32, 32, 32, 32, 42, 85, 78, 68, 42,  9, 48, 48, 48, 48, 48, 48,
-/* 0x2270 */  48, 48, 32, 76, 69, 78, 85, 10, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x2270 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 76, 69, 78, 85, 10,
-/* 0x2280 */  48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 32, 32, 32, 32, 32, 32,
+/* 0x2280 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x2290 */  32, 42, 85, 78, 68, 42,  9, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x2290 */  32, 32, 32, 32, 32, 32, 32, 32, 32, 42, 85, 78, 68, 42,  9, 48,
-/* 0x22a0 */  48, 48, 48, 48, 48, 48, 48, 32, 65, 68, 82, 77, 10, 48, 48, 48,
+/* 0x22a0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32,
-/* 0x22b0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 32,
+/* 0x22b0 */  65, 68, 82, 77, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x22c0 */  32, 32, 32, 32, 32, 32, 42, 85, 78, 68, 42,  9, 48, 48, 48, 48,
+/* 0x22c0 */  48, 48, 48, 48, 48, 32, 32, 32, 32, 32, 32, 32, 32, 32, 42, 85,
-/* 0x22d0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 76, 69, 78,
+/* 0x22d0 */  78, 68, 42,  9, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x22e0 */  77, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x22e0 */  48, 48, 48, 48, 32, 76, 69, 78, 77, 10, 48, 48, 48, 48, 48, 48,
-/* 0x22f0 */  48, 48, 32, 32, 32, 32, 32, 32, 32, 32, 32, 42, 85, 78, 68, 42,
+/* 0x22f0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 32, 32, 32, 32, 32,
-/* 0x2300 */   9, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x2300 */  32, 32, 32, 42, 85, 78, 68, 42,  9, 48, 48, 48, 48, 48, 48, 48,
-/* 0x2310 */  48, 32, 65, 68, 82, 67, 10, 10, 82, 69, 76, 79, 67, 65, 84, 73,
+/* 0x2310 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 32, 65, 68, 82, 67, 10, 10,
-/* 0x2320 */  79, 78, 32, 82, 69, 67, 79, 82, 68, 83, 32, 70, 79, 82, 32, 91,
+/* 0x2320 */  82, 69, 76, 79, 67, 65, 84, 73, 79, 78, 32, 82, 69, 67, 79, 82,
-/* 0x2330 */  69, 76, 70, 77, 65, 73, 78, 88, 93, 58, 10, 79, 70, 70, 83, 69,
+/* 0x2330 */  68, 83, 32, 70, 79, 82, 32, 91, 69, 76, 70, 77, 65, 73, 78, 88,
-/* 0x2340 */  84, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 84, 89, 80, 69,
+/* 0x2340 */  93, 58, 10, 79, 70, 70, 83, 69, 84, 32, 32, 32, 32, 32, 32, 32,
-/* 0x2350 */  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 86, 65,
+/* 0x2350 */  32, 32, 32, 32, 84, 89, 80, 69, 32, 32, 32, 32, 32, 32, 32, 32,
-/* 0x2360 */  76, 85, 69, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x2360 */  32, 32, 32, 32, 32, 32, 86, 65, 76, 85, 69, 10, 48, 48, 48, 48,
-/* 0x2370 */  48, 48, 48, 49, 32, 82, 95, 88, 56, 54, 95, 54, 52, 95, 80, 67,
+/* 0x2370 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 49, 32, 82, 95, 88,
-/* 0x2380 */  51, 50, 32, 32, 32, 32, 32, 69, 76, 70, 77, 65, 73, 78, 90,117,
+/* 0x2380 */  56, 54, 95, 54, 52, 95, 80, 67, 51, 50, 32, 32, 32, 32, 32, 69,
-/* 0x2390 */  43, 48,120, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x2390 */  76, 70, 77, 65, 73, 78, 90,117, 43, 48,120, 48, 48, 48, 48, 48,
-/* 0x23a0 */  48, 53, 99, 10, 10, 82, 69, 76, 79, 67, 65, 84, 73, 79, 78, 32,
+/* 0x23a0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 54, 52, 10, 10, 82, 69, 76,
-/* 0x23b0 */  82, 69, 67, 79, 82, 68, 83, 32, 70, 79, 82, 32, 91, 78, 82, 86,
+/* 0x23b0 */  79, 67, 65, 84, 73, 79, 78, 32, 82, 69, 67, 79, 82, 68, 83, 32,
-/* 0x23c0 */  50, 69, 93, 58, 10, 79, 70, 70, 83, 69, 84, 32, 32, 32, 32, 32,
+/* 0x23c0 */  70, 79, 82, 32, 91, 78, 82, 86, 50, 69, 93, 58, 10, 79, 70, 70,
-/* 0x23d0 */  32, 32, 32, 32, 32, 32, 84, 89, 80, 69, 32, 32, 32, 32, 32, 32,
+/* 0x23d0 */  83, 69, 84, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 84, 89,
-/* 0x23e0 */  32, 32, 32, 32, 32, 32, 32, 32, 86, 65, 76, 85, 69, 10, 48, 48,
+/* 0x23e0 */  80, 69, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-/* 0x23f0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 97,101, 32, 82,
+/* 0x23f0 */  86, 65, 76, 85, 69, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x2400 */  95, 88, 56, 54, 95, 54, 52, 95, 80, 67, 51, 50, 32, 32, 32, 32,
+/* 0x2400 */  48, 48, 48, 48, 97,101, 32, 82, 95, 88, 56, 54, 95, 54, 52, 95,
-/* 0x2410 */  32, 78, 82, 86, 95, 72, 69, 65, 68, 43, 48,120, 48, 48, 48, 48,
+/* 0x2410 */  80, 67, 51, 50, 32, 32, 32, 32, 32, 78, 82, 86, 95, 72, 69, 65,
-/* 0x2420 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 50, 49, 10, 48, 48, 48,
+/* 0x2420 */  68, 43, 48,120, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x2430 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 53, 98, 32, 82, 95,
+/* 0x2430 */  48, 48, 50, 49, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x2440 */  88, 56, 54, 95, 54, 52, 95, 80, 67, 51, 50, 32, 32, 32, 32, 32,
+/* 0x2440 */  48, 48, 48, 53, 98, 32, 82, 95, 88, 56, 54, 95, 54, 52, 95, 80,
-/* 0x2450 */  69, 76, 70, 77, 65, 73, 78, 89, 43, 48,120,102,102,102,102,102,
+/* 0x2450 */  67, 51, 50, 32, 32, 32, 32, 32, 69, 76, 70, 77, 65, 73, 78, 89,
-/* 0x2460 */ 102,102,102,102,102,102,102,102,102,102, 99, 10, 10, 82, 69, 76,
+/* 0x2460 */  43, 48,120,102,102,102,102,102,102,102,102,102,102,102,102,102,
-/* 0x2470 */  79, 67, 65, 84, 73, 79, 78, 32, 82, 69, 67, 79, 82, 68, 83, 32,
+/* 0x2470 */ 102,102, 99, 10, 10, 82, 69, 76, 79, 67, 65, 84, 73, 79, 78, 32,
-/* 0x2480 */  70, 79, 82, 32, 91, 78, 82, 86, 50, 68, 93, 58, 10, 79, 70, 70,
+/* 0x2480 */  82, 69, 67, 79, 82, 68, 83, 32, 70, 79, 82, 32, 91, 78, 82, 86,
-/* 0x2490 */  83, 69, 84, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 84, 89,
+/* 0x2490 */  50, 68, 93, 58, 10, 79, 70, 70, 83, 69, 84, 32, 32, 32, 32, 32,
-/* 0x24a0 */  80, 69, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+/* 0x24a0 */  32, 32, 32, 32, 32, 32, 84, 89, 80, 69, 32, 32, 32, 32, 32, 32,
-/* 0x24b0 */  86, 65, 76, 85, 69, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x24b0 */  32, 32, 32, 32, 32, 32, 32, 32, 86, 65, 76, 85, 69, 10, 48, 48,
-/* 0x24c0 */  48, 48, 48, 48, 57, 53, 32, 82, 95, 88, 56, 54, 95, 54, 52, 95,
+/* 0x24c0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 57, 53, 32, 82,
-/* 0x24d0 */  80, 67, 51, 50, 32, 32, 32, 32, 32, 78, 82, 86, 95, 72, 69, 65,
+/* 0x24d0 */  95, 88, 56, 54, 95, 54, 52, 95, 80, 67, 51, 50, 32, 32, 32, 32,
-/* 0x24e0 */  68, 43, 48,120, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x24e0 */  32, 78, 82, 86, 95, 72, 69, 65, 68, 43, 48,120, 48, 48, 48, 48,
-/* 0x24f0 */  48, 48, 50, 49, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x24f0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 50, 49, 10, 48, 48, 48,
-/* 0x2500 */  48, 48, 48, 53, 98, 32, 82, 95, 88, 56, 54, 95, 54, 52, 95, 80,
+/* 0x2500 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 53, 98, 32, 82, 95,
-/* 0x2510 */  67, 51, 50, 32, 32, 32, 32, 32, 69, 76, 70, 77, 65, 73, 78, 89,
+/* 0x2510 */  88, 56, 54, 95, 54, 52, 95, 80, 67, 51, 50, 32, 32, 32, 32, 32,
-/* 0x2520 */  43, 48,120,102,102,102,102,102,102,102,102,102,102,102,102,102,
+/* 0x2520 */  69, 76, 70, 77, 65, 73, 78, 89, 43, 48,120,102,102,102,102,102,
-/* 0x2530 */ 102,102, 99, 10, 10, 82, 69, 76, 79, 67, 65, 84, 73, 79, 78, 32,
+/* 0x2530 */ 102,102,102,102,102,102,102,102,102,102, 99, 10, 10, 82, 69, 76,
-/* 0x2540 */  82, 69, 67, 79, 82, 68, 83, 32, 70, 79, 82, 32, 91, 78, 82, 86,
+/* 0x2540 */  79, 67, 65, 84, 73, 79, 78, 32, 82, 69, 67, 79, 82, 68, 83, 32,
-/* 0x2550 */  50, 66, 93, 58, 10, 79, 70, 70, 83, 69, 84, 32, 32, 32, 32, 32,
+/* 0x2550 */  70, 79, 82, 32, 91, 78, 82, 86, 50, 66, 93, 58, 10, 79, 70, 70,
-/* 0x2560 */  32, 32, 32, 32, 32, 32, 84, 89, 80, 69, 32, 32, 32, 32, 32, 32,
+/* 0x2560 */  83, 69, 84, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 84, 89,
-/* 0x2570 */  32, 32, 32, 32, 32, 32, 32, 32, 86, 65, 76, 85, 69, 10, 48, 48,
+/* 0x2570 */  80, 69, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-/* 0x2580 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 56, 97, 32, 82,
+/* 0x2580 */  86, 65, 76, 85, 69, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x2590 */  95, 88, 56, 54, 95, 54, 52, 95, 80, 67, 51, 50, 32, 32, 32, 32,
+/* 0x2590 */  48, 48, 48, 48, 56, 97, 32, 82, 95, 88, 56, 54, 95, 54, 52, 95,
-/* 0x25a0 */  32, 78, 82, 86, 95, 72, 69, 65, 68, 43, 48,120, 48, 48, 48, 48,
+/* 0x25a0 */  80, 67, 51, 50, 32, 32, 32, 32, 32, 78, 82, 86, 95, 72, 69, 65,
-/* 0x25b0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 50, 49, 10, 48, 48, 48,
+/* 0x25b0 */  68, 43, 48,120, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x25c0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 53, 50, 32, 82, 95,
+/* 0x25c0 */  48, 48, 50, 49, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x25d0 */  88, 56, 54, 95, 54, 52, 95, 80, 67, 51, 50, 32, 32, 32, 32, 32,
+/* 0x25d0 */  48, 48, 48, 53, 50, 32, 82, 95, 88, 56, 54, 95, 54, 52, 95, 80,
-/* 0x25e0 */  69, 76, 70, 77, 65, 73, 78, 89, 43, 48,120,102,102,102,102,102,
+/* 0x25e0 */  67, 51, 50, 32, 32, 32, 32, 32, 69, 76, 70, 77, 65, 73, 78, 89,
-/* 0x25f0 */ 102,102,102,102,102,102,102,102,102,102, 99, 10, 10, 82, 69, 76,
+/* 0x25f0 */  43, 48,120,102,102,102,102,102,102,102,102,102,102,102,102,102,
-/* 0x2600 */  79, 67, 65, 84, 73, 79, 78, 32, 82, 69, 67, 79, 82, 68, 83, 32,
+/* 0x2600 */ 102,102, 99, 10, 10, 82, 69, 76, 79, 67, 65, 84, 73, 79, 78, 32,
-/* 0x2610 */  70, 79, 82, 32, 91, 76, 90, 77, 65, 95, 69, 76, 70, 48, 48, 93,
+/* 0x2610 */  82, 69, 67, 79, 82, 68, 83, 32, 70, 79, 82, 32, 91, 76, 90, 77,
-/* 0x2620 */  58, 10, 79, 70, 70, 83, 69, 84, 32, 32, 32, 32, 32, 32, 32, 32,
+/* 0x2620 */  65, 95, 69, 76, 70, 48, 48, 93, 58, 10, 79, 70, 70, 83, 69, 84,
-/* 0x2630 */  32, 32, 32, 84, 89, 80, 69, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+/* 0x2630 */  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 84, 89, 80, 69, 32,
-/* 0x2640 */  32, 32, 32, 32, 32, 86, 65, 76, 85, 69, 10, 48, 48, 48, 48, 48,
+/* 0x2640 */  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 86, 65, 76,
-/* 0x2650 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 54, 32, 82, 95, 88, 56,
+/* 0x2650 */  85, 69, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x2660 */  54, 95, 54, 52, 95, 80, 67, 51, 50, 32, 32, 32, 32, 32, 76, 90,
+/* 0x2660 */  48, 48, 54, 32, 82, 95, 88, 56, 54, 95, 54, 52, 95, 80, 67, 51,
-/* 0x2670 */  77, 65, 95, 68, 69, 67, 51, 48, 43, 48,120, 48, 48, 48, 48, 48,
+/* 0x2670 */  50, 32, 32, 32, 32, 32, 76, 90, 77, 65, 95, 68, 69, 67, 51, 48,
-/* 0x2680 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 49, 48, 10, 10, 82, 69, 76,
+/* 0x2680 */  43, 48,120, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x2690 */  79, 67, 65, 84, 73, 79, 78, 32, 82, 69, 67, 79, 82, 68, 83, 32,
+/* 0x2690 */  48, 49, 48, 10, 10, 82, 69, 76, 79, 67, 65, 84, 73, 79, 78, 32,
-/* 0x26a0 */  70, 79, 82, 32, 91, 69, 76, 70, 77, 65, 73, 78, 89, 93, 58, 10,
+/* 0x26a0 */  82, 69, 67, 79, 82, 68, 83, 32, 70, 79, 82, 32, 91, 69, 76, 70,
-/* 0x26b0 */  79, 70, 70, 83, 69, 84, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+/* 0x26b0 */  77, 65, 73, 78, 89, 93, 58, 10, 79, 70, 70, 83, 69, 84, 32, 32,
-/* 0x26c0 */  32, 84, 89, 80, 69, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+/* 0x26c0 */  32, 32, 32, 32, 32, 32, 32, 32, 32, 84, 89, 80, 69, 32, 32, 32,
-/* 0x26d0 */  32, 32, 32, 86, 65, 76, 85, 69, 10, 48, 48, 48, 48, 48, 48, 48,
+/* 0x26d0 */  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 86, 65, 76, 85, 69,
-/* 0x26e0 */  48, 48, 48, 48, 48, 48, 48, 49, 56, 32, 82, 95, 88, 56, 54, 95,
+/* 0x26e0 */  10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 49,
-/* 0x26f0 */  54, 52, 95, 80, 67, 51, 50, 32, 32, 32, 32, 32, 69, 76, 70, 77,
+/* 0x26f0 */  56, 32, 82, 95, 88, 56, 54, 95, 54, 52, 95, 80, 67, 51, 50, 32,
-/* 0x2700 */  65, 73, 78, 90, 43, 48,120,102,102,102,102,102,102,102,102,102,
+/* 0x2700 */  32, 32, 32, 32, 69, 76, 70, 77, 65, 73, 78, 90, 43, 48,120,102,
-/* 0x2710 */ 102,102,102,102,102,102, 99, 10, 10, 82, 69, 76, 79, 67, 65, 84,
+/* 0x2710 */ 102,102,102,102,102,102,102,102,102,102,102,102,102,102, 99, 10,
-/* 0x2720 */  73, 79, 78, 32, 82, 69, 67, 79, 82, 68, 83, 32, 70, 79, 82, 32,
+/* 0x2720 */  10, 82, 69, 76, 79, 67, 65, 84, 73, 79, 78, 32, 82, 69, 67, 79,
-/* 0x2730 */  91, 69, 76, 70, 77, 65, 73, 78, 90,117, 93, 58, 10, 79, 70, 70,
+/* 0x2730 */  82, 68, 83, 32, 70, 79, 82, 32, 91, 69, 76, 70, 77, 65, 73, 78,
-/* 0x2740 */  83, 69, 84, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 84, 89,
+/* 0x2740 */  90,117, 93, 58, 10, 79, 70, 70, 83, 69, 84, 32, 32, 32, 32, 32,
-/* 0x2750 */  80, 69, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+/* 0x2750 */  32, 32, 32, 32, 32, 32, 84, 89, 80, 69, 32, 32, 32, 32, 32, 32,
-/* 0x2760 */  86, 65, 76, 85, 69, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x2760 */  32, 32, 32, 32, 32, 32, 32, 32, 86, 65, 76, 85, 69, 10, 48, 48,
-/* 0x2770 */  48, 48, 48, 48, 48, 49, 32, 82, 95, 88, 56, 54, 95, 54, 52, 95,
+/* 0x2770 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 49, 32, 82,
-/* 0x2780 */  51, 50, 32, 32, 32, 32, 32, 32, 32, 74, 77, 80, 85, 10, 48, 48,
+/* 0x2780 */  95, 88, 56, 54, 95, 54, 52, 95, 51, 50, 32, 32, 32, 32, 32, 32,
-/* 0x2790 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 55, 32, 82,
+/* 0x2790 */  32, 74, 77, 80, 85, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x27a0 */  95, 88, 56, 54, 95, 54, 52, 95, 51, 50, 32, 32, 32, 32, 32, 32,
+/* 0x27a0 */  48, 48, 48, 48, 48, 55, 32, 82, 95, 88, 56, 54, 95, 54, 52, 95,
-/* 0x27b0 */  32, 76, 69, 78, 85, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x27b0 */  51, 50, 32, 32, 32, 32, 32, 32, 32, 76, 69, 78, 85, 10, 48, 48,
-/* 0x27c0 */  48, 48, 48, 48, 48,102, 32, 82, 95, 88, 56, 54, 95, 54, 52, 95,
+/* 0x27c0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,102, 32, 82,
-/* 0x27d0 */  51, 50, 32, 32, 32, 32, 32, 32, 32, 65, 68, 82, 77, 10, 48, 48,
+/* 0x27d0 */  95, 88, 56, 54, 95, 54, 52, 95, 51, 50, 32, 32, 32, 32, 32, 32,
-/* 0x27e0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 49, 55, 32, 82,
+/* 0x27e0 */  32, 65, 68, 82, 77, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x27f0 */  95, 88, 56, 54, 95, 54, 52, 95, 51, 50, 32, 32, 32, 32, 32, 32,
+/* 0x27f0 */  48, 48, 48, 48, 49, 55, 32, 82, 95, 88, 56, 54, 95, 54, 52, 95,
-/* 0x2800 */  32, 76, 69, 78, 77, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x2800 */  51, 50, 32, 32, 32, 32, 32, 32, 32, 76, 69, 78, 77, 10, 48, 48,
-/* 0x2810 */  48, 48, 48, 48, 51, 48, 32, 82, 95, 88, 56, 54, 95, 54, 52, 95,
+/* 0x2810 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 51, 48, 32, 82,
-/* 0x2820 */  51, 50, 32, 32, 32, 32, 32, 32, 32, 65, 68, 82, 67, 10, 48, 48,
+/* 0x2820 */  95, 88, 56, 54, 95, 54, 52, 95, 51, 50, 32, 32, 32, 32, 32, 32,
-/* 0x2830 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 55, 56, 32, 82,
+/* 0x2830 */  32, 65, 68, 82, 67, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x2840 */  95, 88, 56, 54, 95, 54, 52, 95, 80, 67, 51, 50, 32, 32, 32, 32,
+/* 0x2840 */  48, 48, 48, 48, 56, 48, 32, 82, 95, 88, 56, 54, 95, 54, 52, 95,
-/* 0x2850 */  32, 69, 76, 70, 77, 65, 73, 78, 90, 43, 48,120, 48, 48, 48, 48,
+/* 0x2850 */  80, 67, 51, 50, 32, 32, 32, 32, 32, 69, 76, 70, 77, 65, 73, 78,
-/* 0x2860 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,100, 10, 48, 48, 48,
+/* 0x2860 */  90, 43, 48,120, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x2870 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 50, 98, 32, 82, 95,
+/* 0x2870 */  48, 48, 48,100, 10, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-/* 0x2880 */  88, 56, 54, 95, 54, 52, 95, 80, 67, 51, 50, 32, 32, 32, 32, 32,
+/* 0x2880 */  48, 48, 48, 50, 98, 32, 82, 95, 88, 56, 54, 95, 54, 52, 95, 80,
-/* 0x2890 */  69, 76, 70, 77, 65, 73, 78, 89, 43, 48,120, 48, 48, 48, 48, 48,
+/* 0x2890 */  67, 51, 50, 32, 32, 32, 32, 32, 69, 76, 70, 77, 65, 73, 78, 89,
-/* 0x28a0 */  48, 48, 48, 48, 48, 48, 48, 48, 48, 48,100, 10
+/* 0x28a0 */  43, 48,120, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+/* 0x28b0 */  48, 48,100, 10
 };

src/stub/arm-linux.elf-fold.h

@@ -1,5 +1,5 @@
 /* arm-linux.elf-fold.h
-   created from arm-linux.elf-fold.bin, 2136 (0x858) bytes
+   created from arm-linux.elf-fold.bin, 2104 (0x838) bytes
 
    This file is part of the UPX executable compressor.
 
@@ -31,17 +31,17 @@
  */
 
 
-#define STUB_ARM_LINUX_ELF_FOLD_SIZE    2136
+#define STUB_ARM_LINUX_ELF_FOLD_SIZE    2104
-#define STUB_ARM_LINUX_ELF_FOLD_ADLER32 0x76e26245
+#define STUB_ARM_LINUX_ELF_FOLD_ADLER32 0x76ce5ab4
-#define STUB_ARM_LINUX_ELF_FOLD_CRC32   0x325250a9
+#define STUB_ARM_LINUX_ELF_FOLD_CRC32   0x0bbbca49
 
-unsigned char stub_arm_linux_elf_fold[2136] = {
+unsigned char stub_arm_linux_elf_fold[2104] = {
 /* 0x0000 */ 127, 69, 76, 70,  1,  1,  1, 97,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0010 */   2,  0, 40,  0,  1,  0,  0,  0,128,128,  0,  0, 52,  0,  0,  0,
 /* 0x0020 */   0,  0,  0,  0,  2,  0,  0,  0, 52,  0, 32,  0,  2,  0,  0,  0,
 /* 0x0030 */   0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,128,  0,  0,
-/* 0x0040 */   0,128,  0,  0, 88,  8,  0,  0, 88,  8,  0,  0,  5,  0,  0,  0,
+/* 0x0040 */   0,128,  0,  0, 56,  8,  0,  0, 56,  8,  0,  0,  5,  0,  0,  0,
-/* 0x0050 */   0,128,  0,  0,  1,  0,  0,  0, 88,  8,  0,  0,  0,  0,  0,  0,
+/* 0x0050 */   0,128,  0,  0,  1,  0,  0,  0, 56,  8,  0,  0,  0,  0,  0,  0,
 /* 0x0060 */   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0070 */   0,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0080 */  16, 48,157,229,  3, 49,141,224, 24, 48,131,226,  4,  0,147,228,
@@ -49,7 +49,7 @@ unsigned char stub_arm_linux_elf_fold[2136] = {
 /* 0x00a0 */   0,  0, 80,227,252,255,255, 26,  8, 32,141,229, 10,220, 77,226,
 /* 0x00b0 */   9, 64,160,225,  4,144,154,229, 13,128,160,225,  0,112,154,229,
 /* 0x00c0 */  44, 96,143,226, 12,144,137,226,  0,176,160,227,248, 15, 45,233,
-/* 0x00d0 */  15,  0,189,232,133,  1,  0,235,  0,224,160,225, 20,208,141,226,
+/* 0x00d0 */  15,  0,189,232,125,  1,  0,235,  0,224,160,225, 20,208,141,226,
 /* 0x00e0 */  10,220,141,226, 15,  0,189,232,  3,  0,128,224,  3, 16, 65,224,
 /* 0x00f0 */   4,240, 18,229,255, 48,  3,226, 80,  0, 83,227, 14,240,160, 17,
 /* 0x0100 */  33, 17,176,225,  0,  0, 80, 19, 14,240,160,  1,  1, 16, 65,226,
@@ -63,111 +63,109 @@ unsigned char stub_arm_linux_elf_fold[2136] = {
 /* 0x0180 */   8, 80,157,229,  4, 64, 45,229,  8, 64,157,229, 37, 86,160,225,
 /* 0x0190 */ 192,  0,144,239,  4, 64,157,228,  4, 80,157,228, 14,240,160,225,
 /* 0x01a0 */   0,  0, 80,227, 14,240,160,  1,  0, 48,144,229,  1,  0, 83,225,
-/* 0x01b0 */   6,  0,  0, 10,  1,  0, 83,227,  0, 48,160, 19,  1, 48,160,  3,
+/* 0x01b0 */   8,  0,128, 18,251,255,255, 26,  4, 32,128,229, 14,240,160,225,
-/* 0x01c0 */   0,  0, 81,227,  0, 48,160,  3,  0,  0, 83,227,  1,  0,  0, 10,
+/* 0x01c0 */   0, 48,144,229,  2,  0, 83,225,  4, 48,144,229,  4,224, 45,229,
-/* 0x01d0 */   6,  0,128,232, 14,240,160,225,  8,  0,128,226,241,255,255,234,
+/* 0x01d0 */   3,192,160, 33,  2,224,160,225,  2, 32,160, 33,  3,  0,  0, 42,
-/* 0x01e0 */   0, 48,144,229,  2,  0, 83,225,  4, 48,144,229,  4,224, 45,229,
+/* 0x01e0 */ 127,  0,160,227,213,255,255,235,  1, 48, 92,229,  1, 48, 65,229,
-/* 0x01f0 */   3,192,160, 33,  2,224,160,225,  2, 32,160, 33,  3,  0,  0, 42,
+/* 0x01f0 */   1, 32, 66,226,  1,  0,114,227,  1,192,140,226,  1, 16,129,226,
-/* 0x0200 */ 127,  0,160,227,205,255,255,235,  1, 48, 92,229,  1, 48, 65,229,
+/* 0x0200 */ 248,255,255, 26,  4, 32,144,229,  0, 48,144,229, 14, 32,130,224,
-/* 0x0210 */   1, 32, 66,226,  1,  0,114,227,  1,192,140,226,  1, 16,129,226,
+/* 0x0210 */   3, 48,110,224,  0, 48,128,229,  4, 32,128,229,  4,240,157,228,
-/* 0x0220 */ 248,255,255, 26,  4, 32,144,229,  0, 48,144,229, 14, 32,130,224,
+/* 0x0220 */ 240, 64, 45,233,  0, 80,160,225, 20,208, 77,226,  1, 64,160,225,
-/* 0x0230 */   3, 48,110,224,  0, 48,128,229,  4, 32,128,229,  4,240,157,228,
+/* 0x0230 */   2,112,160,225,  3, 96,160,225, 68,  0,  0,234,  4, 16,141,226,
-/* 0x0240 */ 240, 64, 45,233,  0, 80,160,225, 20,208, 77,226,  1, 64,160,225,
+/* 0x0240 */   5,  0,160,225, 12, 32,160,227,220,255,255,235,  4,192,157,229,
-/* 0x0250 */   2,112,160,225,  3, 96,160,225, 68,  0,  0,234,  4, 16,141,226,
+/* 0x0250 */   0,  0, 92,227,  8, 16,157,229,  6,  0,  0, 26,  0, 49,159,229,
-/* 0x0260 */   5,  0,160,225, 12, 32,160,227,220,255,255,235,  4,192,157,229,
+/* 0x0260 */   3,  0, 81,225,  5,  0,  0, 26,  0, 48,149,229,  0,  0, 83,227,
-/* 0x0270 */   0,  0, 92,227,  8, 16,157,229,  6,  0,  0, 26,  0, 49,159,229,
+/* 0x0270 */   2,  0,  0, 26, 56,  0,  0,234,  0,  0, 81,227,  1,  0,  0, 26,
-/* 0x0280 */   3,  0, 81,225,  5,  0,  0, 26,  0, 48,149,229,  0,  0, 83,227,
+/* 0x0280 */ 127,  0,160,227,173,255,255,235, 12,  0, 81,225,251,255,255,138,
-/* 0x0290 */   2,  0,  0, 26, 56,  0,  0,234,  0,  0, 81,227,  1,  0,  0, 26,
+/* 0x0290 */   0, 48,148,229,  3,  0, 92,225,248,255,255,138, 12,  0, 81,225,
-/* 0x02a0 */ 127,  0,160,227,165,255,255,235, 12,  0, 81,225,251,255,255,138,
+/* 0x02a0 */  33,  0,  0, 42, 16,192,141,229, 12,192,157,229,  4,  0,149,229,
-/* 0x02b0 */   0, 48,148,229,  3,  0, 92,225,248,255,255,138, 12,  0, 81,225,
+/* 0x02b0 */   4, 32,148,229, 16, 48,141,226,  0,192,141,229, 15,224,160,225,
-/* 0x02c0 */  33,  0,  0, 42, 16,192,141,229, 12,192,157,229,  4,  0,149,229,
+/* 0x02c0 */   7,240,160,225,  0,  0, 80,227,236,255,255, 26, 16, 16,157,229,
-/* 0x02d0 */   4, 32,148,229, 16, 48,141,226,  0,192,141,229, 15,224,160,225,
+/* 0x02d0 */   4, 48,157,229,  3,  0, 81,225,232,255,255, 26, 13, 32,221,229,
-/* 0x02e0 */   7,240,160,225,  0,  0, 80,227,236,255,255, 26, 16, 16,157,229,
+/* 0x02e0 */   0,  0, 82,227,  0,  0, 86, 19,  9,  0,  0, 10,  2, 12, 81,227,
-/* 0x02f0 */   4, 48,157,229,  3,  0, 81,225,232,255,255, 26, 13, 32,221,229,
+/* 0x02f0 */   2,  0,  0,138,  0, 48,148,229,  1,  0, 83,225,  4,  0,  0, 26,
-/* 0x0300 */   0,  0, 82,227,  0,  0, 86, 19,  9,  0,  0, 10,  2, 12, 81,227,
+/* 0x0300 */   2, 48,160,225,  4,  0,148,229, 14, 32,221,229, 15,224,160,225,
-/* 0x0310 */   2,  0,  0,138,  0, 48,148,229,  1,  0, 83,225,  4,  0,  0, 26,
+/* 0x0310 */   6,240,160,225,  8, 48,157,229,  6,  0,149,232,  3, 32,130,224,
-/* 0x0320 */   2, 48,160,225,  4,  0,148,229, 14, 32,221,229, 15,224,160,225,
+/* 0x0320 */   1, 16, 99,224,  6,  0,133,232,  3,  0,  0,234,  1, 32,160,225,
-/* 0x0330 */   6,240,160,225,  8, 48,157,229,  6,  0,149,232,  3, 32,130,224,
+/* 0x0330 */   5,  0,160,225,  4, 16,148,229,160,255,255,235,  4, 48,157,229,
-/* 0x0340 */   1, 16, 99,224,  6,  0,133,232,  3,  0,  0,234,  1, 32,160,225,
+/* 0x0340 */   6,  0,148,232,  3, 32,130,224,  1, 16, 99,224,  6,  0,132,232,
-/* 0x0350 */   5,  0,160,225,  4, 16,148,229,160,255,255,235,  4, 48,157,229,
+/* 0x0350 */   0, 48,148,229,  0,  0, 83,227,183,255,255, 26, 20,208,141,226,
-/* 0x0360 */   6,  0,148,232,  3, 32,130,224,  1, 16, 99,224,  6,  0,132,232,
+/* 0x0360 */ 240,128,189,232, 85, 80, 88, 33,240, 79, 45,233,  1,160,160,225,
-/* 0x0370 */   0, 48,148,229,  0,  0, 83,227,183,255,255, 26, 20,208,141,226,
+/* 0x0370 */ 176,193,218,225, 28, 16,145,229,188,226,218,225, 48,208, 77,226,
-/* 0x0380 */ 240,128,189,232, 85, 80, 88, 33,240, 79, 45,233,  1,160,160,225,
+/* 0x0380 */   2,  0, 92,227,  1, 96,138,224, 16,  0,141,229, 50,192,160,  3,
-/* 0x0390 */ 176,193,218,225, 28, 16,145,229,188,226,218,225, 48,208, 77,226,
+/* 0x0390 */  34,192,160, 19,  1,224, 78,226,  6, 16,160,225,  0,  0,224,227,
-/* 0x03a0 */   2,  0, 92,227,  1, 96,138,224, 16,  0,141,229, 50,192,160,  3,
+/* 0x03a0 */   0, 80,160,227, 12, 32,141,229,  8, 48,141,229, 11,  0,  0,234,
-/* 0x03b0 */  34,192,160, 19,  1,224, 78,226,  6, 16,160,225,  0,  0,224,227,
+/* 0x03b0 */   0, 48,145,229,  1,  0, 83,227,  6,  0,  0, 26,  8, 32,145,229,
-/* 0x03c0 */   0, 80,160,227, 12, 32,141,229,  8, 48,141,229, 11,  0,  0,234,
+/* 0x03c0 */  20, 48,145,229,  3, 48,130,224,  3,  0, 85,225,  3, 80,160, 49,
-/* 0x03d0 */   0, 48,145,229,  1,  0, 83,227,  6,  0,  0, 26,  8, 32,145,229,
+/* 0x03d0 */   2,  0, 80,225,  2,  0,160, 33, 32, 16,129,226,  1,224, 78,226,
-/* 0x03e0 */  20, 48,145,229,  3, 48,130,224,  3,  0, 85,225,  3, 80,160, 49,
+/* 0x03e0 */   0,  0, 94,227,241,255,255,170,255, 78,192,227, 15, 64,196,227,
-/* 0x03f0 */   2,  0, 80,225,  2,  0,160, 33, 32, 16,129,226,  1,224, 78,226,
+/* 0x03f0 */   5, 48,100,224,255, 62,131,226, 15, 48,131,226,255, 62,195,227,
-/* 0x0400 */   0,  0, 94,227,241,255,255,170,255, 78,192,227, 15, 64,196,227,
+/* 0x0400 */  16,224, 28,226, 15, 48,195,227, 36, 48,141,229, 28, 64,141, 21,
-/* 0x0410 */   5, 48,100,224,255, 62,131,226, 15, 48,131,226,255, 62,195,227,
+/* 0x0410 */   7,  0,  0, 26, 12, 48,160,225, 14, 32,160,225,  0,192,224,227,
-/* 0x0420 */  16,224, 28,226, 15, 48,195,227, 36, 48,141,229, 28, 64,141, 21,
+/* 0x0420 */   4,  0,160,225, 36, 16,157,229,  0, 80,141,232, 82,255,255,235,
-/* 0x0430 */   7,  0,  0, 26, 12, 48,160,225, 14, 32,160,225,  0,192,224,227,
+/* 0x0430 */  28,  0,141,229, 28, 16,157,229, 52, 48,160,227,  1,176,100,224,
-/* 0x0440 */   4,  0,160,225, 36, 16,157,229,  0, 80,141,232, 74,255,255,235,
+/* 0x0440 */ 155,  3,  3,224,  0, 32,160,227, 32, 80,134,226, 32, 48,141,229,
-/* 0x0450 */  28,  0,141,229, 28, 16,157,229, 52, 48,160,227,  1,176,100,224,
+/* 0x0450 */  24, 32,141,229,127,  0,  0,234, 12, 48,157,229,  0,  0, 83,227,
-/* 0x0460 */ 155,  3,  3,224,  0, 32,160,227, 32, 80,134,226, 32, 48,141,229,
+/* 0x0460 */   8,  0,  0, 10, 32, 48, 21,229,  6,  0, 83,227,  5,  0,  0, 26,
-/* 0x0470 */  24, 32,141,229,127,  0,  0,234, 12, 48,157,229,  0,  0, 83,227,
+/* 0x0470 */  24, 32, 21,229,  8,  0,157,229,  2, 32,139,224,  3, 16,160,227,
-/* 0x0480 */   8,  0,  0, 10, 32, 48, 21,229,  6,  0, 83,227,  5,  0,  0, 26,
+/* 0x0480 */  70,255,255,235,111,  0,  0,234, 32, 48, 21,229,  1,  0, 83,227,
-/* 0x0490 */  24, 32, 21,229,  8,  0,157,229,  2, 32,139,224,  3, 16,160,227,
+/* 0x0490 */ 108,  0,  0, 26,  8, 48, 21,229, 36, 34,159,229,  7, 48,  3,226,
-/* 0x04a0 */  62,255,255,235,111,  0,  0,234, 32, 48, 21,229,  1,  0, 83,227,
+/* 0x04a0 */   3, 49,160,225, 50, 35,160,225, 24, 48, 21,229,  3,144,139,224,
-/* 0x04b0 */ 108,  0,  0, 26,  8, 48, 21,229, 36, 34,159,229,  7, 48,  3,226,
+/* 0x04b0 */  12, 48,157,229, 16,224, 21,229,  9, 26,160,225,  0,  0, 83,227,
-/* 0x04c0 */   3, 49,160,225, 50, 35,160,225, 24, 48, 21,229,  3,144,139,224,
+/* 0x04c0 */  33, 26,160,225, 28,192, 21,229,  7, 96,  2,226, 12, 32, 21,229,
-/* 0x04d0 */  12, 48,157,229, 16,224, 21,229,  9, 26,160,225,  0,  0, 83,227,
+/* 0x04d0 */   9,128, 97,224, 16, 64,157,  5,  1,112,142,224, 20, 32,141,229,
-/* 0x04e0 */  33, 26,160,225, 28,192, 21,229,  7, 96,  2,226, 12, 32, 21,229,
+/* 0x04e0 */   0, 64,224, 19, 12,192, 97,224,  6, 32,160,  1, 18, 48,160,  3,
-/* 0x04f0 */   9,128, 97,224, 16, 64,157,  5,  1,112,142,224, 20, 32,141,229,
+/* 0x04f0 */   2, 32,134, 19, 50, 48,160, 19,  8,  0,160,225,  7, 16,160,225,
-/* 0x0500 */   0, 64,224, 19, 12,192, 97,224,  6, 32,160,  1, 18, 48,160,  3,
+/* 0x0500 */  40,224,141,229, 16, 16,141,232, 44,144,141,229, 26,255,255,235,
-/* 0x0510 */   2, 32,134, 19, 50, 48,160, 19,  8,  0,160,225,  7, 16,160,225,
+/* 0x0510 */   0,  0, 88,225, 56,  0,  0, 26, 12, 48,157,229,  0,  0, 83,227,
-/* 0x0520 */  40,224,141,229, 16, 16,141,232, 44,144,141,229, 18,255,255,235,
+/* 0x0520 */   6,  0,  0, 10, 88, 16,157,229,  4, 48, 22,226,  1, 48,160, 17,
-/* 0x0530 */   0,  0, 88,225, 56,  0,  0, 26, 12, 48,157,229,  0,  0, 83,227,
+/* 0x0530 */  12,  0,157,229, 40, 16,141,226, 16, 32,157,229, 55,255,255,235,
-/* 0x0540 */   6,  0,  0, 10, 88, 16,157,229,  4, 48, 22,226,  1, 48,160, 17,
+/* 0x0540 */   0, 48,103,226,  3, 74,160,225,  2,  0, 22,227, 36, 74,160,225,
-/* 0x0550 */  12,  0,157,229, 40, 16,141,226, 16, 32,157,229, 55,255,255,235,
+/* 0x0550 */   7,  0,  0, 10,  0,  0, 84,227,  5,  0,  0, 10,  7, 16,136,224,
-/* 0x0560 */   0, 48,103,226,  3, 74,160,225,  2,  0, 22,227, 36, 74,160,225,
+/* 0x0560 */   4, 32,160,225,  0, 48,160,227,  1, 32, 82,226,  1, 48,193,228,
-/* 0x0570 */   7,  0,  0, 10,  0,  0, 84,227,  5,  0,  0, 10,  7, 16,136,224,
+/* 0x0570 */ 251,255,255, 26, 12, 32,157,229,  0,  0, 82,227, 32,  0,  0, 10,
-/* 0x0580 */   4, 32,160,225,  0, 48,160,227,  1, 32, 82,226,  1, 48,193,228,
+/* 0x0580 */  32, 48, 21,229,  1,  0, 83,227, 21,  0,  0, 26,  8, 48, 21,229,
-/* 0x0590 */ 251,255,255, 26, 12, 32,157,229,  0,  0, 82,227, 32,  0,  0, 10,
+/* 0x0590 */   1,  0, 19,227, 18,  0,  0, 10, 12, 32, 21,229, 16, 48, 21,229,
-/* 0x05a0 */  32, 48, 21,229,  1,  0, 83,227, 21,  0,  0, 26,  8, 48, 21,229,
+/* 0x05a0 */   3,  0, 82,225, 24, 16, 21,229, 62,  0,  0, 26,  1, 48,130,224,
-/* 0x05b0 */   1,  0, 19,227, 18,  0,  0, 10, 12, 32, 21,229, 16, 48, 21,229,
+/* 0x05b0 */  11, 32,131,224,  0, 48, 98,226,  3, 58,160,225, 35, 58,160,225,
-/* 0x05c0 */   3,  0, 82,225, 24, 16, 21,229, 62,  0,  0, 26,  1, 48,130,224,
+/* 0x05c0 */   7,  0, 83,227, 55,  0,  0,154,248, 48,159,229,  0, 48,130,229,
-/* 0x05d0 */  11, 32,131,224,  0, 48, 98,226,  3, 58,160,225, 35, 58,160,225,
+/* 0x05d0 */ 244, 48,159,229,  8,  0,157,229,  4, 48,130,229,  0, 16,160,227,
-/* 0x05e0 */   7,  0, 83,227, 55,  0,  0,154,248, 48,159,229,  0, 48,130,229,
+/* 0x05e0 */ 238,254,255,235,  8,  0,160,225,  7, 16,160,225,  6, 32,160,225,
-/* 0x05f0 */ 244, 48,159,229,  8,  0,157,229,  4, 48,130,229,  0, 16,160,227,
+/* 0x05f0 */ 223,254,255,235,  0,  0, 80,227,  1,  0,  0, 10,127,  0,160,227,
-/* 0x0600 */ 230,254,255,235,  8,  0,160,225,  7, 16,160,225,  6, 32,160,225,
+/* 0x0600 */ 206,254,255,235, 20, 32,157,229,  4, 48,135,224,  2, 16,137,224,
-/* 0x0610 */ 215,254,255,235,  0,  0, 80,227,  1,  0,  0, 10,127,  0,160,227,
+/* 0x0610 */   3, 64,136,224,  1,  0, 84,225, 10,  0,  0, 42,  0,192,224,227,
-/* 0x0620 */ 198,254,255,235, 20, 32,157,229,  4, 48,135,224,  2, 16,137,224,
+/* 0x0620 */   0,192,141,229,  1, 16,100,224,  1,192,140,226,  6, 32,160,225,
-/* 0x0630 */   3, 64,136,224,  1,  0, 84,225, 10,  0,  0, 42,  0,192,224,227,
+/* 0x0630 */   4,  0,160,225, 50, 48,160,227,  4,192,141,229,206,254,255,235,
-/* 0x0640 */   0,192,141,229,  1, 16,100,224,  1,192,140,226,  6, 32,160,225,
+/* 0x0640 */   0,  0, 84,225,236,255,255, 26, 24, 48,157,229,  1, 48,131,226,
-/* 0x0650 */   4,  0,160,225, 50, 48,160,227,  4,192,141,229,198,254,255,235,
+/* 0x0650 */  24, 48,141,229, 32, 80,133,226,188, 50,218,225, 24, 16,157,229,
-/* 0x0660 */   0,  0, 84,225,236,255,255, 26, 24, 48,157,229,  1, 48,131,226,
+/* 0x0660 */   3,  0, 81,225,123,255,255,186, 12, 32,157,229,  0,  0, 82,227,
-/* 0x0670 */  24, 48,141,229, 32, 80,133,226,188, 50,218,225, 24, 16,157,229,
+/* 0x0670 */   5,  0,  0, 10,176, 49,218,225,  3,  0, 83,227, 28, 48,157, 21,
-/* 0x0680 */   3,  0, 81,225,123,255,255,186, 12, 32,157,229,  0,  0, 82,227,
+/* 0x0680 */  36, 16,157, 21,  1,  0,131, 16,181,254,255, 27, 84, 32,157,229,
-/* 0x0690 */   5,  0,  0, 10,176, 49,218,225,  3,  0, 83,227, 28, 48,157, 21,
+/* 0x0690 */   0,  0, 82,227,  0,176,130, 21, 24,  0,154,229,  0,  0,139,224,
-/* 0x06a0 */  36, 16,157, 21,  1,  0,131, 16,173,254,255, 27, 84, 32,157,229,
+/* 0x06a0 */  48,208,141,226,240,143,189,232, 28, 48, 21,229,  0,  0, 83,227,
-/* 0x06b0 */   0,  0, 82,227,  0,176,130, 21, 24,  0,154,229,  0,  0,139,224,
+/* 0x06b0 */  32, 32,157,  5,  2, 48,129,  0,  8, 32,131,  2,193,255,255, 10,
-/* 0x06c0 */  48,208,141,226,240,143,189,232, 28, 48, 21,229,  0,  0, 83,227,
+/* 0x06c0 */ 199,255,255,234, 64, 98, 81,115, 91,  0,144,239, 14,240,160,225,
-/* 0x06d0 */  32, 32,157,  5,  2, 48,129,  0,  8, 32,131,  2,193,255,255, 10,
+/* 0x06d0 */ 240, 71, 45,233, 12,208, 77,226, 52, 96,141,226,  0,144,160,225,
-/* 0x06e0 */ 199,255,255,234, 64, 98, 81,115, 91,  0,144,239, 14,240,160,225,
+/* 0x06e0 */   1, 80,160,225,  3,128,160,225,  6,  0,160,225,  0, 48,160,227,
-/* 0x06f0 */ 240, 71, 45,233, 12,208, 77,226, 52, 96,141,226,  0,144,160,225,
+/* 0x06f0 */  44, 16,141,226, 48,160,157,229,  2,112,160,225, 52, 64,157,229,
-/* 0x0700 */   1, 80,160,225,  3,128,160,225,  6,  0,160,225,  0, 48,160,227,
+/* 0x0700 */ 198,254,255,235, 56, 48,157,229,  5, 16,160,227,  3, 48,100,224,
-/* 0x0710 */  44, 16,141,226, 48,160,157,229,  2,112,160,225, 52, 64,157,229,
+/* 0x0710 */ 188, 34,218,225,  9,  0,160,225, 56, 48,141,229, 52, 80,141,229,
-/* 0x0720 */ 198,254,255,235, 56, 48,157,229,  5, 16,160,227,  3, 48,100,224,
+/* 0x0720 */ 158,254,255,235,  9,  0,160,225,  4, 16,160,227,186, 34,218,225,
-/* 0x0730 */ 188, 34,218,225,  9,  0,160,225, 56, 48,141,229, 52, 80,141,229,
+/* 0x0730 */ 154,254,255,235, 52, 64,138,226, 60, 32,157,229,  8, 48,148,229,
-/* 0x0740 */ 150,254,255,235,  9,  0,160,225,  4, 16,160,227,186, 34,218,225,
+/* 0x0740 */  52, 32,130,226,  3, 32,130,224,  9,  0,160,225,  3, 16,160,227,
-/* 0x0750 */ 146,254,255,235, 52, 64,138,226, 60, 32,157,229,  8, 48,148,229,
+/* 0x0750 */ 146,254,255,235,  8,192,141,226,  6, 32,160,225, 10, 16,160,225,
-/* 0x0760 */  52, 32,130,226,  3, 32,130,224,  9,  0,160,225,  3, 16,160,227,
+/* 0x0760 */   9, 48,160,225,  7,  0,160,225,  0,192,141,229,  4,128,141,229,
-/* 0x0770 */ 138,254,255,235,  8,192,141,226,  6, 32,160,225, 10, 16,160,225,
+/* 0x0770 */ 252,254,255,235,  0, 80,160,225,  9, 16,160,227,  5, 32,160,225,
-/* 0x0780 */   9, 48,160,225,  7,  0,160,225,  0,192,141,229,  4,128,141,229,
+/* 0x0780 */   9,  0,160,225,133,254,255,235,188, 18,218,225,  0, 32,160,227,
-/* 0x0790 */ 252,254,255,235,  0, 80,160,225,  9, 16,160,227,  5, 32,160,225,
+/* 0x0790 */  35,  0,  0,234,  0, 48,148,229,  3,  0, 83,227, 30,  0,  0, 26,
-/* 0x07a0 */   9,  0,160,225,125,254,255,235,188, 18,218,225,  0, 32,160,227,
+/* 0x07a0 */   8, 48,148,229,  8,  0,157,229,  0, 16,160,227,  0,  0,131,224,
-/* 0x07b0 */  35,  0,  0,234,  0, 48,148,229,  3,  0, 83,227, 30,  0,  0, 26,
+/* 0x07b0 */   1, 32,160,225,102,254,255,235,  0, 64, 80,226,  4,  0,  0,186,
-/* 0x07c0 */   8, 48,148,229,  8,  0,157,229,  0, 16,160,227,  0,  0,131,224,
+/* 0x07c0 */  10, 16,160,225,  2, 44,160,227, 93,254,255,235,  2, 12, 80,227,
-/* 0x07d0 */   1, 32,160,225, 94,254,255,235,  0, 64, 80,226,  4,  0,  0,186,
+/* 0x07d0 */   1,  0,  0, 10,127,  0,160,227, 88,254,255,235,  0,224,160,227,
-/* 0x07e0 */  10, 16,160,225,  2, 44,160,227, 85,254,255,235,  2, 12, 80,227,
+/* 0x07e0 */  14, 32,160,225,  8,192,141,226, 10, 16,160,225,  9, 48,160,225,
-/* 0x07f0 */   1,  0,  0, 10,127,  0,160,227, 80,254,255,235,  0,224,160,227,
+/* 0x07f0 */   4,  0,160,225,  0, 80,141,232,218,254,255,235,  7, 16,160,227,
-/* 0x0800 */  14, 32,160,225,  8,192,141,226, 10, 16,160,225,  9, 48,160,225,
+/* 0x0800 */   0, 80,160,225,  8, 32,157,229,  9,  0,160,225, 99,254,255,235,
-/* 0x0810 */   4,  0,160,225,  0, 80,141,232,218,254,255,235,  7, 16,160,227,
+/* 0x0810 */   4,  0,160,225, 80,254,255,235,  3,  0,  0,234, 32, 64,132,226,
-/* 0x0820 */   0, 80,160,225,  8, 32,157,229,  9,  0,160,225, 91,254,255,235,
+/* 0x0820 */   1, 32,130,226,  1,  0, 82,225,217,255,255,186,  5,  0,160,225,
-/* 0x0830 */   4,  0,160,225, 72,254,255,235,  3,  0,  0,234, 32, 64,132,226,
+/* 0x0830 */  12,208,141,226,240,135,189,232
-/* 0x0840 */   1, 32,130,226,  1,  0, 82,225,217,255,255,186,  5,  0,160,225,
-/* 0x0850 */  12,208,141,226,240,135,189,232
 };

src/stub/armeb-linux.elf-fold.h

@@ -1,5 +1,5 @@
 /* armeb-linux.elf-fold.h
-   created from armeb-linux.elf-fold.bin, 2136 (0x858) bytes
+   created from armeb-linux.elf-fold.bin, 2104 (0x838) bytes
 
    This file is part of the UPX executable compressor.
 
@@ -31,17 +31,17 @@
  */
 
 
-#define STUB_ARMEB_LINUX_ELF_FOLD_SIZE    2136
+#define STUB_ARMEB_LINUX_ELF_FOLD_SIZE    2104
-#define STUB_ARMEB_LINUX_ELF_FOLD_ADLER32 0x9d156247
+#define STUB_ARMEB_LINUX_ELF_FOLD_ADLER32 0x8c625ab6
-#define STUB_ARMEB_LINUX_ELF_FOLD_CRC32   0x192a533e
+#define STUB_ARMEB_LINUX_ELF_FOLD_CRC32   0x43c18337
 
-unsigned char stub_armeb_linux_elf_fold[2136] = {
+unsigned char stub_armeb_linux_elf_fold[2104] = {
 /* 0x0000 */ 127, 69, 76, 70,  1,  2,  1, 97,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0010 */   0,  2,  0, 40,  0,  0,  0,  1,  0,  0,128,128,  0,  0,  0, 52,
 /* 0x0020 */   0,  0,  0,  0,  0,  0,  0,  2,  0, 52,  0, 32,  0,  2,  0,  0,
 /* 0x0030 */   0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,128,  0,
-/* 0x0040 */   0,  0,128,  0,  0,  0,  8, 88,  0,  0,  8, 88,  0,  0,  0,  5,
+/* 0x0040 */   0,  0,128,  0,  0,  0,  8, 56,  0,  0,  8, 56,  0,  0,  0,  5,
-/* 0x0050 */   0,  0,128,  0,  0,  0,  0,  1,  0,  0,  8, 88,  0,  0,  0,  0,
+/* 0x0050 */   0,  0,128,  0,  0,  0,  0,  1,  0,  0,  8, 56,  0,  0,  0,  0,
 /* 0x0060 */   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0070 */   0,  0,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0080 */ 229,157, 48, 16,224,141, 49,  3,226,131, 48, 24,228,147,  0,  4,
@@ -49,7 +49,7 @@ unsigned char stub_armeb_linux_elf_fold[2136] = {
 /* 0x00a0 */ 227, 80,  0,  0, 26,255,255,252,229,141, 32,  8,226, 77,220, 10,
 /* 0x00b0 */ 225,160, 64,  9,229,154,144,  4,225,160,128, 13,229,154,112,  0,
 /* 0x00c0 */ 226,143, 96, 44,226,137,144, 12,227,160,176,  0,233, 45, 15,248,
-/* 0x00d0 */ 232,189,  0, 15,235,  0,  1,133,225,160,224,  0,226,141,208, 20,
+/* 0x00d0 */ 232,189,  0, 15,235,  0,  1,125,225,160,224,  0,226,141,208, 20,
 /* 0x00e0 */ 226,141,220, 10,232,189,  0, 15,224,128,  0,  3,224, 65, 16,  3,
 /* 0x00f0 */ 229, 18,240,  4,226,  3, 48,255,227, 83,  0, 81, 17,160,240, 14,
 /* 0x0100 */ 225,176, 17, 33, 19, 80,  0,  0,  1,160,240, 14,226, 65, 16,  1,
@@ -63,111 +63,109 @@ unsigned char stub_armeb_linux_elf_fold[2136] = {
 /* 0x0180 */ 229,157, 80,  8,229, 45, 64,  4,229,157, 64,  8,225,160, 86, 37,
 /* 0x0190 */ 239,144,  0,192,228,157, 64,  4,228,157, 80,  4,225,160,240, 14,
 /* 0x01a0 */ 227, 80,  0,  0,  1,160,240, 14,229,144, 48,  0,225, 83,  0,  1,
-/* 0x01b0 */  10,  0,  0,  6,227, 83,  0,  1, 19,160, 48,  0,  3,160, 48,  1,
+/* 0x01b0 */  18,128,  0,  8, 26,255,255,251,229,128, 32,  4,225,160,240, 14,
-/* 0x01c0 */ 227, 81,  0,  0,  3,160, 48,  0,227, 83,  0,  0, 10,  0,  0,  1,
+/* 0x01c0 */ 229,144, 48,  0,225, 83,  0,  2,229,144, 48,  4,229, 45,224,  4,
-/* 0x01d0 */ 232,128,  0,  6,225,160,240, 14,226,128,  0,  8,234,255,255,241,
+/* 0x01d0 */  33,160,192,  3,225,160,224,  2, 33,160, 32,  2, 42,  0,  0,  3,
-/* 0x01e0 */ 229,144, 48,  0,225, 83,  0,  2,229,144, 48,  4,229, 45,224,  4,
+/* 0x01e0 */ 227,160,  0,127,235,255,255,213,229, 92, 48,  1,229, 65, 48,  1,
-/* 0x01f0 */  33,160,192,  3,225,160,224,  2, 33,160, 32,  2, 42,  0,  0,  3,
+/* 0x01f0 */ 226, 66, 32,  1,227,114,  0,  1,226,140,192,  1,226,129, 16,  1,
-/* 0x0200 */ 227,160,  0,127,235,255,255,205,229, 92, 48,  1,229, 65, 48,  1,
+/* 0x0200 */  26,255,255,248,229,144, 32,  4,229,144, 48,  0,224,130, 32, 14,
-/* 0x0210 */ 226, 66, 32,  1,227,114,  0,  1,226,140,192,  1,226,129, 16,  1,
+/* 0x0210 */ 224,110, 48,  3,229,128, 48,  0,229,128, 32,  4,228,157,240,  4,
-/* 0x0220 */  26,255,255,248,229,144, 32,  4,229,144, 48,  0,224,130, 32, 14,
+/* 0x0220 */ 233, 45, 64,240,225,160, 80,  0,226, 77,208, 20,225,160, 64,  1,
-/* 0x0230 */ 224,110, 48,  3,229,128, 48,  0,229,128, 32,  4,228,157,240,  4,
+/* 0x0230 */ 225,160,112,  2,225,160, 96,  3,234,  0,  0, 68,226,141, 16,  4,
-/* 0x0240 */ 233, 45, 64,240,225,160, 80,  0,226, 77,208, 20,225,160, 64,  1,
+/* 0x0240 */ 225,160,  0,  5,227,160, 32, 12,235,255,255,220,229,157,192,  4,
-/* 0x0250 */ 225,160,112,  2,225,160, 96,  3,234,  0,  0, 68,226,141, 16,  4,
+/* 0x0250 */ 227, 92,  0,  0,229,157, 16,  8, 26,  0,  0,  6,229,159, 49,  0,
-/* 0x0260 */ 225,160,  0,  5,227,160, 32, 12,235,255,255,220,229,157,192,  4,
+/* 0x0260 */ 225, 81,  0,  3, 26,  0,  0,  5,229,149, 48,  0,227, 83,  0,  0,
-/* 0x0270 */ 227, 92,  0,  0,229,157, 16,  8, 26,  0,  0,  6,229,159, 49,  0,
+/* 0x0270 */  26,  0,  0,  2,234,  0,  0, 56,227, 81,  0,  0, 26,  0,  0,  1,
-/* 0x0280 */ 225, 81,  0,  3, 26,  0,  0,  5,229,149, 48,  0,227, 83,  0,  0,
+/* 0x0280 */ 227,160,  0,127,235,255,255,173,225, 81,  0, 12,138,255,255,251,
-/* 0x0290 */  26,  0,  0,  2,234,  0,  0, 56,227, 81,  0,  0, 26,  0,  0,  1,
+/* 0x0290 */ 229,148, 48,  0,225, 92,  0,  3,138,255,255,248,225, 81,  0, 12,
-/* 0x02a0 */ 227,160,  0,127,235,255,255,165,225, 81,  0, 12,138,255,255,251,
+/* 0x02a0 */  42,  0,  0, 33,229,141,192, 16,229,157,192, 12,229,149,  0,  4,
-/* 0x02b0 */ 229,148, 48,  0,225, 92,  0,  3,138,255,255,248,225, 81,  0, 12,
+/* 0x02b0 */ 229,148, 32,  4,226,141, 48, 16,229,141,192,  0,225,160,224, 15,
-/* 0x02c0 */  42,  0,  0, 33,229,141,192, 16,229,157,192, 12,229,149,  0,  4,
+/* 0x02c0 */ 225,160,240,  7,227, 80,  0,  0, 26,255,255,236,229,157, 16, 16,
-/* 0x02d0 */ 229,148, 32,  4,226,141, 48, 16,229,141,192,  0,225,160,224, 15,
+/* 0x02d0 */ 229,157, 48,  4,225, 81,  0,  3, 26,255,255,232,229,221, 32, 13,
-/* 0x02e0 */ 225,160,240,  7,227, 80,  0,  0, 26,255,255,236,229,157, 16, 16,
+/* 0x02e0 */ 227, 82,  0,  0, 19, 86,  0,  0, 10,  0,  0,  9,227, 81, 12,  2,
-/* 0x02f0 */ 229,157, 48,  4,225, 81,  0,  3, 26,255,255,232,229,221, 32, 13,
+/* 0x02f0 */ 138,  0,  0,  2,229,148, 48,  0,225, 83,  0,  1, 26,  0,  0,  4,
-/* 0x0300 */ 227, 82,  0,  0, 19, 86,  0,  0, 10,  0,  0,  9,227, 81, 12,  2,
+/* 0x0300 */ 225,160, 48,  2,229,148,  0,  4,229,221, 32, 14,225,160,224, 15,
-/* 0x0310 */ 138,  0,  0,  2,229,148, 48,  0,225, 83,  0,  1, 26,  0,  0,  4,
+/* 0x0310 */ 225,160,240,  6,229,157, 48,  8,232,149,  0,  6,224,130, 32,  3,
-/* 0x0320 */ 225,160, 48,  2,229,148,  0,  4,229,221, 32, 14,225,160,224, 15,
+/* 0x0320 */ 224, 99, 16,  1,232,133,  0,  6,234,  0,  0,  3,225,160, 32,  1,
-/* 0x0330 */ 225,160,240,  6,229,157, 48,  8,232,149,  0,  6,224,130, 32,  3,
+/* 0x0330 */ 225,160,  0,  5,229,148, 16,  4,235,255,255,160,229,157, 48,  4,
-/* 0x0340 */ 224, 99, 16,  1,232,133,  0,  6,234,  0,  0,  3,225,160, 32,  1,
+/* 0x0340 */ 232,148,  0,  6,224,130, 32,  3,224, 99, 16,  1,232,132,  0,  6,
-/* 0x0350 */ 225,160,  0,  5,229,148, 16,  4,235,255,255,160,229,157, 48,  4,
+/* 0x0350 */ 229,148, 48,  0,227, 83,  0,  0, 26,255,255,183,226,141,208, 20,
-/* 0x0360 */ 232,148,  0,  6,224,130, 32,  3,224, 99, 16,  1,232,132,  0,  6,
+/* 0x0360 */ 232,189,128,240, 33, 88, 80, 85,233, 45, 79,240,225,160,160,  1,
-/* 0x0370 */ 229,148, 48,  0,227, 83,  0,  0, 26,255,255,183,226,141,208, 20,
+/* 0x0370 */ 225,218,193,176,229,145, 16, 28,225,218,226,188,226, 77,208, 48,
-/* 0x0380 */ 232,189,128,240, 33, 88, 80, 85,233, 45, 79,240,225,160,160,  1,
+/* 0x0380 */ 227, 92,  0,  2,224,138, 96,  1,229,141,  0, 16,  3,160,192, 50,
-/* 0x0390 */ 225,218,193,176,229,145, 16, 28,225,218,226,188,226, 77,208, 48,
+/* 0x0390 */  19,160,192, 34,226, 78,224,  1,225,160, 16,  6,227,224,  0,  0,
-/* 0x03a0 */ 227, 92,  0,  2,224,138, 96,  1,229,141,  0, 16,  3,160,192, 50,
+/* 0x03a0 */ 227,160, 80,  0,229,141, 32, 12,229,141, 48,  8,234,  0,  0, 11,
-/* 0x03b0 */  19,160,192, 34,226, 78,224,  1,225,160, 16,  6,227,224,  0,  0,
+/* 0x03b0 */ 229,145, 48,  0,227, 83,  0,  1, 26,  0,  0,  6,229,145, 32,  8,
-/* 0x03c0 */ 227,160, 80,  0,229,141, 32, 12,229,141, 48,  8,234,  0,  0, 11,
+/* 0x03c0 */ 229,145, 48, 20,224,130, 48,  3,225, 85,  0,  3, 49,160, 80,  3,
-/* 0x03d0 */ 229,145, 48,  0,227, 83,  0,  1, 26,  0,  0,  6,229,145, 32,  8,
+/* 0x03d0 */ 225, 80,  0,  2, 33,160,  0,  2,226,129, 16, 32,226, 78,224,  1,
-/* 0x03e0 */ 229,145, 48, 20,224,130, 48,  3,225, 85,  0,  3, 49,160, 80,  3,
+/* 0x03e0 */ 227, 94,  0,  0,170,255,255,241,227,192, 78,255,227,196, 64, 15,
-/* 0x03f0 */ 225, 80,  0,  2, 33,160,  0,  2,226,129, 16, 32,226, 78,224,  1,
+/* 0x03f0 */ 224,100, 48,  5,226,131, 62,255,226,131, 48, 15,227,195, 62,255,
-/* 0x0400 */ 227, 94,  0,  0,170,255,255,241,227,192, 78,255,227,196, 64, 15,
+/* 0x0400 */ 226, 28,224, 16,227,195, 48, 15,229,141, 48, 36, 21,141, 64, 28,
-/* 0x0410 */ 224,100, 48,  5,226,131, 62,255,226,131, 48, 15,227,195, 62,255,
+/* 0x0410 */  26,  0,  0,  7,225,160, 48, 12,225,160, 32, 14,227,224,192,  0,
-/* 0x0420 */ 226, 28,224, 16,227,195, 48, 15,229,141, 48, 36, 21,141, 64, 28,
+/* 0x0420 */ 225,160,  0,  4,229,157, 16, 36,232,141, 80,  0,235,255,255, 82,
-/* 0x0430 */  26,  0,  0,  7,225,160, 48, 12,225,160, 32, 14,227,224,192,  0,
+/* 0x0430 */ 229,141,  0, 28,229,157, 16, 28,227,160, 48, 52,224,100,176,  1,
-/* 0x0440 */ 225,160,  0,  4,229,157, 16, 36,232,141, 80,  0,235,255,255, 74,
+/* 0x0440 */ 224,  3,  3,155,227,160, 32,  0,226,134, 80, 32,229,141, 48, 32,
-/* 0x0450 */ 229,141,  0, 28,229,157, 16, 28,227,160, 48, 52,224,100,176,  1,
+/* 0x0450 */ 229,141, 32, 24,234,  0,  0,127,229,157, 48, 12,227, 83,  0,  0,
-/* 0x0460 */ 224,  3,  3,155,227,160, 32,  0,226,134, 80, 32,229,141, 48, 32,
+/* 0x0460 */  10,  0,  0,  8,229, 21, 48, 32,227, 83,  0,  6, 26,  0,  0,  5,
-/* 0x0470 */ 229,141, 32, 24,234,  0,  0,127,229,157, 48, 12,227, 83,  0,  0,
+/* 0x0470 */ 229, 21, 32, 24,229,157,  0,  8,224,139, 32,  2,227,160, 16,  3,
-/* 0x0480 */  10,  0,  0,  8,229, 21, 48, 32,227, 83,  0,  6, 26,  0,  0,  5,
+/* 0x0480 */ 235,255,255, 70,234,  0,  0,111,229, 21, 48, 32,227, 83,  0,  1,
-/* 0x0490 */ 229, 21, 32, 24,229,157,  0,  8,224,139, 32,  2,227,160, 16,  3,
+/* 0x0490 */  26,  0,  0,108,229, 21, 48,  8,229,159, 34, 36,226,  3, 48,  7,
-/* 0x04a0 */ 235,255,255, 62,234,  0,  0,111,229, 21, 48, 32,227, 83,  0,  1,
+/* 0x04a0 */ 225,160, 49,  3,225,160, 35, 50,229, 21, 48, 24,224,139,144,  3,
-/* 0x04b0 */  26,  0,  0,108,229, 21, 48,  8,229,159, 34, 36,226,  3, 48,  7,
+/* 0x04b0 */ 229,157, 48, 12,229, 21,224, 16,225,160, 26,  9,227, 83,  0,  0,
-/* 0x04c0 */ 225,160, 49,  3,225,160, 35, 50,229, 21, 48, 24,224,139,144,  3,
+/* 0x04c0 */ 225,160, 26, 33,229, 21,192, 28,226,  2, 96,  7,229, 21, 32, 12,
-/* 0x04d0 */ 229,157, 48, 12,229, 21,224, 16,225,160, 26,  9,227, 83,  0,  0,
+/* 0x04d0 */ 224, 97,128,  9,  5,157, 64, 16,224,142,112,  1,229,141, 32, 20,
-/* 0x04e0 */ 225,160, 26, 33,229, 21,192, 28,226,  2, 96,  7,229, 21, 32, 12,
+/* 0x04e0 */  19,224, 64,  0,224, 97,192, 12,  1,160, 32,  6,  3,160, 48, 18,
-/* 0x04f0 */ 224, 97,128,  9,  5,157, 64, 16,224,142,112,  1,229,141, 32, 20,
+/* 0x04f0 */  19,134, 32,  2, 19,160, 48, 50,225,160,  0,  8,225,160, 16,  7,
-/* 0x0500 */  19,224, 64,  0,224, 97,192, 12,  1,160, 32,  6,  3,160, 48, 18,
+/* 0x0500 */ 229,141,224, 40,232,141, 16, 16,229,141,144, 44,235,255,255, 26,
-/* 0x0510 */  19,134, 32,  2, 19,160, 48, 50,225,160,  0,  8,225,160, 16,  7,
+/* 0x0510 */ 225, 88,  0,  0, 26,  0,  0, 56,229,157, 48, 12,227, 83,  0,  0,
-/* 0x0520 */ 229,141,224, 40,232,141, 16, 16,229,141,144, 44,235,255,255, 18,
+/* 0x0520 */  10,  0,  0,  6,229,157, 16, 88,226, 22, 48,  4, 17,160, 48,  1,
-/* 0x0530 */ 225, 88,  0,  0, 26,  0,  0, 56,229,157, 48, 12,227, 83,  0,  0,
+/* 0x0530 */ 229,157,  0, 12,226,141, 16, 40,229,157, 32, 16,235,255,255, 55,
-/* 0x0540 */  10,  0,  0,  6,229,157, 16, 88,226, 22, 48,  4, 17,160, 48,  1,
+/* 0x0540 */ 226,103, 48,  0,225,160, 74,  3,227, 22,  0,  2,225,160, 74, 36,
-/* 0x0550 */ 229,157,  0, 12,226,141, 16, 40,229,157, 32, 16,235,255,255, 55,
+/* 0x0550 */  10,  0,  0,  7,227, 84,  0,  0, 10,  0,  0,  5,224,136, 16,  7,
-/* 0x0560 */ 226,103, 48,  0,225,160, 74,  3,227, 22,  0,  2,225,160, 74, 36,
+/* 0x0560 */ 225,160, 32,  4,227,160, 48,  0,226, 82, 32,  1,228,193, 48,  1,
-/* 0x0570 */  10,  0,  0,  7,227, 84,  0,  0, 10,  0,  0,  5,224,136, 16,  7,
+/* 0x0570 */  26,255,255,251,229,157, 32, 12,227, 82,  0,  0, 10,  0,  0, 32,
-/* 0x0580 */ 225,160, 32,  4,227,160, 48,  0,226, 82, 32,  1,228,193, 48,  1,
+/* 0x0580 */ 229, 21, 48, 32,227, 83,  0,  1, 26,  0,  0, 21,229, 21, 48,  8,
-/* 0x0590 */  26,255,255,251,229,157, 32, 12,227, 82,  0,  0, 10,  0,  0, 32,
+/* 0x0590 */ 227, 19,  0,  1, 10,  0,  0, 18,229, 21, 32, 12,229, 21, 48, 16,
-/* 0x05a0 */ 229, 21, 48, 32,227, 83,  0,  1, 26,  0,  0, 21,229, 21, 48,  8,
+/* 0x05a0 */ 225, 82,  0,  3,229, 21, 16, 24, 26,  0,  0, 62,224,130, 48,  1,
-/* 0x05b0 */ 227, 19,  0,  1, 10,  0,  0, 18,229, 21, 32, 12,229, 21, 48, 16,
+/* 0x05b0 */ 224,131, 32, 11,226, 98, 48,  0,225,160, 58,  3,225,160, 58, 35,
-/* 0x05c0 */ 225, 82,  0,  3,229, 21, 16, 24, 26,  0,  0, 62,224,130, 48,  1,
+/* 0x05c0 */ 227, 83,  0,  7,154,  0,  0, 55,229,159, 48,248,229,130, 48,  0,
-/* 0x05d0 */ 224,131, 32, 11,226, 98, 48,  0,225,160, 58,  3,225,160, 58, 35,
+/* 0x05d0 */ 229,159, 48,244,229,157,  0,  8,229,130, 48,  4,227,160, 16,  0,
-/* 0x05e0 */ 227, 83,  0,  7,154,  0,  0, 55,229,159, 48,248,229,130, 48,  0,
+/* 0x05e0 */ 235,255,254,238,225,160,  0,  8,225,160, 16,  7,225,160, 32,  6,
-/* 0x05f0 */ 229,159, 48,244,229,157,  0,  8,229,130, 48,  4,227,160, 16,  0,
+/* 0x05f0 */ 235,255,254,223,227, 80,  0,  0, 10,  0,  0,  1,227,160,  0,127,
-/* 0x0600 */ 235,255,254,230,225,160,  0,  8,225,160, 16,  7,225,160, 32,  6,
+/* 0x0600 */ 235,255,254,206,229,157, 32, 20,224,135, 48,  4,224,137, 16,  2,
-/* 0x0610 */ 235,255,254,215,227, 80,  0,  0, 10,  0,  0,  1,227,160,  0,127,
+/* 0x0610 */ 224,136, 64,  3,225, 84,  0,  1, 42,  0,  0, 10,227,224,192,  0,
-/* 0x0620 */ 235,255,254,198,229,157, 32, 20,224,135, 48,  4,224,137, 16,  2,
+/* 0x0620 */ 229,141,192,  0,224,100, 16,  1,226,140,192,  1,225,160, 32,  6,
-/* 0x0630 */ 224,136, 64,  3,225, 84,  0,  1, 42,  0,  0, 10,227,224,192,  0,
+/* 0x0630 */ 225,160,  0,  4,227,160, 48, 50,229,141,192,  4,235,255,254,206,
-/* 0x0640 */ 229,141,192,  0,224,100, 16,  1,226,140,192,  1,225,160, 32,  6,
+/* 0x0640 */ 225, 84,  0,  0, 26,255,255,236,229,157, 48, 24,226,131, 48,  1,
-/* 0x0650 */ 225,160,  0,  4,227,160, 48, 50,229,141,192,  4,235,255,254,198,
+/* 0x0650 */ 229,141, 48, 24,226,133, 80, 32,225,218, 50,188,229,157, 16, 24,
-/* 0x0660 */ 225, 84,  0,  0, 26,255,255,236,229,157, 48, 24,226,131, 48,  1,
+/* 0x0660 */ 225, 81,  0,  3,186,255,255,123,229,157, 32, 12,227, 82,  0,  0,
-/* 0x0670 */ 229,141, 48, 24,226,133, 80, 32,225,218, 50,188,229,157, 16, 24,
+/* 0x0670 */  10,  0,  0,  5,225,218, 49,176,227, 83,  0,  3, 21,157, 48, 28,
-/* 0x0680 */ 225, 81,  0,  3,186,255,255,123,229,157, 32, 12,227, 82,  0,  0,
+/* 0x0680 */  21,157, 16, 36, 16,131,  0,  1, 27,255,254,181,229,157, 32, 84,
-/* 0x0690 */  10,  0,  0,  5,225,218, 49,176,227, 83,  0,  3, 21,157, 48, 28,
+/* 0x0690 */ 227, 82,  0,  0, 21,130,176,  0,229,154,  0, 24,224,139,  0,  0,
-/* 0x06a0 */  21,157, 16, 36, 16,131,  0,  1, 27,255,254,173,229,157, 32, 84,
+/* 0x06a0 */ 226,141,208, 48,232,189,143,240,229, 21, 48, 28,227, 83,  0,  0,
-/* 0x06b0 */ 227, 82,  0,  0, 21,130,176,  0,229,154,  0, 24,224,139,  0,  0,
+/* 0x06b0 */   5,157, 32, 32,  0,129, 48,  2,  2,131, 32,  8, 10,255,255,193,
-/* 0x06c0 */ 226,141,208, 48,232,189,143,240,229, 21, 48, 28,227, 83,  0,  0,
+/* 0x06c0 */ 234,255,255,199,115, 81, 98, 64,239,144,  0, 91,225,160,240, 14,
-/* 0x06d0 */   5,157, 32, 32,  0,129, 48,  2,  2,131, 32,  8, 10,255,255,193,
+/* 0x06d0 */ 233, 45, 71,240,226, 77,208, 12,226,141, 96, 52,225,160,144,  0,
-/* 0x06e0 */ 234,255,255,199,115, 81, 98, 64,239,144,  0, 91,225,160,240, 14,
+/* 0x06e0 */ 225,160, 80,  1,225,160,128,  3,225,160,  0,  6,227,160, 48,  0,
-/* 0x06f0 */ 233, 45, 71,240,226, 77,208, 12,226,141, 96, 52,225,160,144,  0,
+/* 0x06f0 */ 226,141, 16, 44,229,157,160, 48,225,160,112,  2,229,157, 64, 52,
-/* 0x0700 */ 225,160, 80,  1,225,160,128,  3,225,160,  0,  6,227,160, 48,  0,
+/* 0x0700 */ 235,255,254,198,229,157, 48, 56,227,160, 16,  5,224,100, 48,  3,
-/* 0x0710 */ 226,141, 16, 44,229,157,160, 48,225,160,112,  2,229,157, 64, 52,
+/* 0x0710 */ 225,218, 34,188,225,160,  0,  9,229,141, 48, 56,229,141, 80, 52,
-/* 0x0720 */ 235,255,254,198,229,157, 48, 56,227,160, 16,  5,224,100, 48,  3,
+/* 0x0720 */ 235,255,254,158,225,160,  0,  9,227,160, 16,  4,225,218, 34,186,
-/* 0x0730 */ 225,218, 34,188,225,160,  0,  9,229,141, 48, 56,229,141, 80, 52,
+/* 0x0730 */ 235,255,254,154,226,138, 64, 52,229,157, 32, 60,229,148, 48,  8,
-/* 0x0740 */ 235,255,254,150,225,160,  0,  9,227,160, 16,  4,225,218, 34,186,
+/* 0x0740 */ 226,130, 32, 52,224,130, 32,  3,225,160,  0,  9,227,160, 16,  3,
-/* 0x0750 */ 235,255,254,146,226,138, 64, 52,229,157, 32, 60,229,148, 48,  8,
+/* 0x0750 */ 235,255,254,146,226,141,192,  8,225,160, 32,  6,225,160, 16, 10,
-/* 0x0760 */ 226,130, 32, 52,224,130, 32,  3,225,160,  0,  9,227,160, 16,  3,
+/* 0x0760 */ 225,160, 48,  9,225,160,  0,  7,229,141,192,  0,229,141,128,  4,
-/* 0x0770 */ 235,255,254,138,226,141,192,  8,225,160, 32,  6,225,160, 16, 10,
+/* 0x0770 */ 235,255,254,252,225,160, 80,  0,227,160, 16,  9,225,160, 32,  5,
-/* 0x0780 */ 225,160, 48,  9,225,160,  0,  7,229,141,192,  0,229,141,128,  4,
+/* 0x0780 */ 225,160,  0,  9,235,255,254,133,225,218, 18,188,227,160, 32,  0,
-/* 0x0790 */ 235,255,254,252,225,160, 80,  0,227,160, 16,  9,225,160, 32,  5,
+/* 0x0790 */ 234,  0,  0, 35,229,148, 48,  0,227, 83,  0,  3, 26,  0,  0, 30,
-/* 0x07a0 */ 225,160,  0,  9,235,255,254,125,225,218, 18,188,227,160, 32,  0,
+/* 0x07a0 */ 229,148, 48,  8,229,157,  0,  8,227,160, 16,  0,224,131,  0,  0,
-/* 0x07b0 */ 234,  0,  0, 35,229,148, 48,  0,227, 83,  0,  3, 26,  0,  0, 30,
+/* 0x07b0 */ 225,160, 32,  1,235,255,254,102,226, 80, 64,  0,186,  0,  0,  4,
-/* 0x07c0 */ 229,148, 48,  8,229,157,  0,  8,227,160, 16,  0,224,131,  0,  0,
+/* 0x07c0 */ 225,160, 16, 10,227,160, 44,  2,235,255,254, 93,227, 80, 12,  2,
-/* 0x07d0 */ 225,160, 32,  1,235,255,254, 94,226, 80, 64,  0,186,  0,  0,  4,
+/* 0x07d0 */  10,  0,  0,  1,227,160,  0,127,235,255,254, 88,227,160,224,  0,
-/* 0x07e0 */ 225,160, 16, 10,227,160, 44,  2,235,255,254, 85,227, 80, 12,  2,
+/* 0x07e0 */ 225,160, 32, 14,226,141,192,  8,225,160, 16, 10,225,160, 48,  9,
-/* 0x07f0 */  10,  0,  0,  1,227,160,  0,127,235,255,254, 80,227,160,224,  0,
+/* 0x07f0 */ 225,160,  0,  4,232,141, 80,  0,235,255,254,218,227,160, 16,  7,
-/* 0x0800 */ 225,160, 32, 14,226,141,192,  8,225,160, 16, 10,225,160, 48,  9,
+/* 0x0800 */ 225,160, 80,  0,229,157, 32,  8,225,160,  0,  9,235,255,254, 99,
-/* 0x0810 */ 225,160,  0,  4,232,141, 80,  0,235,255,254,218,227,160, 16,  7,
+/* 0x0810 */ 225,160,  0,  4,235,255,254, 80,234,  0,  0,  3,226,132, 64, 32,
-/* 0x0820 */ 225,160, 80,  0,229,157, 32,  8,225,160,  0,  9,235,255,254, 91,
+/* 0x0820 */ 226,130, 32,  1,225, 82,  0,  1,186,255,255,217,225,160,  0,  5,
-/* 0x0830 */ 225,160,  0,  4,235,255,254, 72,234,  0,  0,  3,226,132, 64, 32,
+/* 0x0830 */ 226,141,208, 12,232,189,135,240
-/* 0x0840 */ 226,130, 32,  1,225, 82,  0,  1,186,255,255,217,225,160,  0,  5,
-/* 0x0850 */ 226,141,208, 12,232,189,135,240
 };

src/stub/armel-eabi-linux.elf-fold.h

@@ -1,5 +1,5 @@
 /* armel-eabi-linux.elf-fold.h
-   created from armel-eabi-linux.elf-fold.bin, 2240 (0x8c0) bytes
+   created from armel-eabi-linux.elf-fold.bin, 2208 (0x8a0) bytes
 
    This file is part of the UPX executable compressor.
 
@@ -31,17 +31,17 @@
  */
 
 
-#define STUB_ARMEL_EABI_LINUX_ELF_FOLD_SIZE    2240
+#define STUB_ARMEL_EABI_LINUX_ELF_FOLD_SIZE    2208
-#define STUB_ARMEL_EABI_LINUX_ELF_FOLD_ADLER32 0x67da943d
+#define STUB_ARMEL_EABI_LINUX_ELF_FOLD_ADLER32 0xe2518cac
-#define STUB_ARMEL_EABI_LINUX_ELF_FOLD_CRC32   0x88b18e44
+#define STUB_ARMEL_EABI_LINUX_ELF_FOLD_CRC32   0xed9c9f8a
 
-unsigned char stub_armel_eabi_linux_elf_fold[2240] = {
+unsigned char stub_armel_eabi_linux_elf_fold[2208] = {
 /* 0x0000 */ 127, 69, 76, 70,  1,  1,  1, 97,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0010 */   2,  0, 40,  0,  1,  0,  0,  0,128,128,  0,  0, 52,  0,  0,  0,
 /* 0x0020 */   0,  0,  0,  0,  2,  0,  0,  0, 52,  0, 32,  0,  2,  0,  0,  0,
 /* 0x0030 */   0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,128,  0,  0,
-/* 0x0040 */   0,128,  0,  0,192,  8,  0,  0,192,  8,  0,  0,  5,  0,  0,  0,
+/* 0x0040 */   0,128,  0,  0,160,  8,  0,  0,160,  8,  0,  0,  5,  0,  0,  0,
-/* 0x0050 */   0,128,  0,  0,  1,  0,  0,  0,192,  8,  0,  0,  0,  0,  0,  0,
+/* 0x0050 */   0,128,  0,  0,  1,  0,  0,  0,160,  8,  0,  0,  0,  0,  0,  0,
 /* 0x0060 */   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0070 */   0,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0080 */  16, 48,157,229,  3, 49,141,224, 24, 48,131,226,  4,  0,147,228,
@@ -49,7 +49,7 @@ unsigned char stub_armel_eabi_linux_elf_fold[2240] = {
 /* 0x00a0 */   0,  0, 80,227,252,255,255, 26,  8, 32,141,229, 10,220, 77,226,
 /* 0x00b0 */   9, 64,160,225,  4,144,154,229, 13,128,160,225,  0,112,154,229,
 /* 0x00c0 */  44, 96,143,226, 12,144,137,226,  0,176,160,227,248, 15, 45,233,
-/* 0x00d0 */  15,  0,189,232,159,  1,  0,235,  0,224,160,225, 20,208,141,226,
+/* 0x00d0 */  15,  0,189,232,151,  1,  0,235,  0,224,160,225, 20,208,141,226,
 /* 0x00e0 */  10,220,141,226, 15,  0,189,232,  3,  0,128,224,  3, 16, 65,224,
 /* 0x00f0 */   4,240, 18,229,255, 48,  3,226, 80,  0, 83,227, 14,240,160, 17,
 /* 0x0100 */  33, 17,176,225,  0,  0, 80, 19, 14,240,160,  1,  1, 16, 65,226,
@@ -69,111 +69,109 @@ unsigned char stub_armel_eabi_linux_elf_fold[2240] = {
 /* 0x01e0 */   8, 80,157,229,  4, 64, 45,229,  8, 64,157,229, 37, 86,160,225,
 /* 0x01f0 */   7,192,160,225,192,112,160,227,  0,  0,  0,239, 12,112,160,225,
 /* 0x0200 */   4, 64,157,228,  4, 80,157,228, 14,240,160,225,  0,  0, 80,227,
-/* 0x0210 */  30,255, 47,  1,  0, 48,144,229,  1,  0, 83,225,  6,  0,  0, 10,
+/* 0x0210 */  30,255, 47,  1,  0, 48,144,229,  1,  0, 83,225,  8,  0,128, 18,
-/* 0x0220 */   1,  0, 83,227,  0, 48,160, 19,  1, 48,160,  3,  0,  0, 81,227,
+/* 0x0220 */ 251,255,255, 26,  4, 32,128,229, 30,255, 47,225,  0, 48,144,229,
-/* 0x0230 */   0, 48,160,  3,  0,  0, 83,227,  1,  0,  0, 10,  6,  0,128,232,
+/* 0x0230 */   4,224, 45,229,  2,  0, 83,225,  4, 48,144,229,  2,224,160,225,
-/* 0x0240 */  30,255, 47,225,  8,  0,128,226,241,255,255,234,  0, 48,144,229,
+/* 0x0240 */   3,192,160, 33,  2, 32,160, 33,  3,  0,  0, 42,127,  0,160,227,
-/* 0x0250 */   4,224, 45,229,  2,  0, 83,225,  4, 48,144,229,  2,224,160,225,
+/* 0x0250 */ 186,255,255,235,  1, 48, 92,229,  1, 48, 65,229,  1, 32, 66,226,
-/* 0x0260 */   3,192,160, 33,  2, 32,160, 33,  3,  0,  0, 42,127,  0,160,227,
+/* 0x0260 */   1,  0,114,227,  1,192,140,226,  1, 16,129,226,248,255,255, 26,
-/* 0x0270 */ 178,255,255,235,  1, 48, 92,229,  1, 48, 65,229,  1, 32, 66,226,
+/* 0x0270 */   4, 32,144,229,  0, 48,144,229, 14, 32,130,224,  3, 48,110,224,
-/* 0x0280 */   1,  0,114,227,  1,192,140,226,  1, 16,129,226,248,255,255, 26,
+/* 0x0280 */   0, 48,128,229,  4, 32,128,229,  4,240,157,228,240, 64, 45,233,
-/* 0x0290 */   4, 32,144,229,  0, 48,144,229, 14, 32,130,224,  3, 48,110,224,
+/* 0x0290 */   0, 80,160,225, 20,208, 77,226,  1, 64,160,225,  2,112,160,225,
-/* 0x02a0 */   0, 48,128,229,  4, 32,128,229,  4,240,157,228,240, 64, 45,233,
+/* 0x02a0 */   3, 96,160,225, 66,  0,  0,234,  4, 16,141,226,  5,  0,160,225,
-/* 0x02b0 */   0, 80,160,225, 20,208, 77,226,  1, 64,160,225,  2,112,160,225,
+/* 0x02b0 */  12, 32,160,227,220,255,255,235,  4,192,157,229,  8, 16,157,229,
-/* 0x02c0 */   3, 96,160,225, 66,  0,  0,234,  4, 16,141,226,  5,  0,160,225,
+/* 0x02c0 */   0,  0, 92,227,  6,  0,  0, 26,248, 48,159,229,  3,  0, 81,225,
-/* 0x02d0 */  12, 32,160,227,220,255,255,235,  4,192,157,229,  8, 16,157,229,
+/* 0x02d0 */   5,  0,  0, 26,  0, 48,149,229,  0,  0, 83,227,  2,  0,  0, 26,
-/* 0x02e0 */   0,  0, 92,227,  6,  0,  0, 26,248, 48,159,229,  3,  0, 81,225,
+/* 0x02e0 */  54,  0,  0,234,  0,  0, 81,227,  1,  0,  0, 26,127,  0,160,227,
-/* 0x02f0 */   5,  0,  0, 26,  0, 48,149,229,  0,  0, 83,227,  2,  0,  0, 26,
+/* 0x02f0 */ 146,255,255,235, 12,  0, 81,225,251,255,255,138,  0, 48,148,229,
-/* 0x0300 */  54,  0,  0,234,  0,  0, 81,227,  1,  0,  0, 26,127,  0,160,227,
+/* 0x0300 */   3,  0, 92,225,248,255,255,138, 12,  0, 81,225, 31,  0,  0, 42,
-/* 0x0310 */ 138,255,255,235, 12,  0, 81,225,251,255,255,138,  0, 48,148,229,
+/* 0x0310 */  16,192,141,229, 12,192,157,229,  4,  0,149,229,  4, 32,148,229,
-/* 0x0320 */   3,  0, 92,225,248,255,255,138, 12,  0, 81,225, 31,  0,  0, 42,
+/* 0x0320 */  16, 48,141,226,  0,192,141,229, 55,255, 47,225,  0,  0, 80,227,
-/* 0x0330 */  16,192,141,229, 12,192,157,229,  4,  0,149,229,  4, 32,148,229,
+/* 0x0330 */ 237,255,255, 26, 16, 16,157,229,  4, 48,157,229,  3,  0, 81,225,
-/* 0x0340 */  16, 48,141,226,  0,192,141,229, 55,255, 47,225,  0,  0, 80,227,
+/* 0x0340 */ 233,255,255, 26, 13, 32,221,229,  0,  0, 82,227,  0,  0, 86, 19,
-/* 0x0350 */ 237,255,255, 26, 16, 16,157,229,  4, 48,157,229,  3,  0, 81,225,
+/* 0x0350 */   8,  0,  0, 10,  2, 12, 81,227,  2,  0,  0,138,  0, 48,148,229,
-/* 0x0360 */ 233,255,255, 26, 13, 32,221,229,  0,  0, 82,227,  0,  0, 86, 19,
+/* 0x0360 */   1,  0, 83,225,  3,  0,  0, 26,  2, 48,160,225,  4,  0,148,229,
-/* 0x0370 */   8,  0,  0, 10,  2, 12, 81,227,  2,  0,  0,138,  0, 48,148,229,
+/* 0x0370 */  14, 32,221,229, 54,255, 47,225,  8, 48,157,229,  6,  0,149,232,
-/* 0x0380 */   1,  0, 83,225,  3,  0,  0, 26,  2, 48,160,225,  4,  0,148,229,
+/* 0x0380 */   3, 32,130,224,  1, 16, 99,224,  6,  0,133,232,  3,  0,  0,234,
-/* 0x0390 */  14, 32,221,229, 54,255, 47,225,  8, 48,157,229,  6,  0,149,232,
+/* 0x0390 */   1, 32,160,225,  5,  0,160,225,  4, 16,148,229,162,255,255,235,
-/* 0x03a0 */   3, 32,130,224,  1, 16, 99,224,  6,  0,133,232,  3,  0,  0,234,
+/* 0x03a0 */   4, 48,157,229,  6,  0,148,232,  3, 32,130,224,  1, 16, 99,224,
-/* 0x03b0 */   1, 32,160,225,  5,  0,160,225,  4, 16,148,229,162,255,255,235,
+/* 0x03b0 */   6,  0,132,232,  0, 48,148,229,  0,  0, 83,227,185,255,255, 26,
-/* 0x03c0 */   4, 48,157,229,  6,  0,148,232,  3, 32,130,224,  1, 16, 99,224,
+/* 0x03c0 */  20,208,141,226,240,128,189,232, 85, 80, 88, 33,240, 79, 45,233,
-/* 0x03d0 */   6,  0,132,232,  0, 48,148,229,  0,  0, 83,227,185,255,255, 26,
+/* 0x03d0 */   1,160,160,225,176,193,218,225, 28, 16,145,229,188,226,218,225,
-/* 0x03e0 */  20,208,141,226,240,128,189,232, 85, 80, 88, 33,240, 79, 45,233,
+/* 0x03e0 */  48,208, 77,226,  2,  0, 92,227,  1, 96,138,224, 16,  0,141,229,
-/* 0x03f0 */   1,160,160,225,176,193,218,225, 28, 16,145,229,188,226,218,225,
+/* 0x03f0 */  50,192,160,  3, 34,192,160, 19,  1,224, 78,226,  6, 16,160,225,
-/* 0x0400 */  48,208, 77,226,  2,  0, 92,227,  1, 96,138,224, 16,  0,141,229,
+/* 0x0400 */   0,  0,224,227,  0, 80,160,227, 12, 32,141,229,  8, 48,141,229,
-/* 0x0410 */  50,192,160,  3, 34,192,160, 19,  1,224, 78,226,  6, 16,160,225,
+/* 0x0410 */  11,  0,  0,234,  0, 48,145,229,  1,  0, 83,227,  6,  0,  0, 26,
-/* 0x0420 */   0,  0,224,227,  0, 80,160,227, 12, 32,141,229,  8, 48,141,229,
+/* 0x0420 */   8, 48,145,229, 20, 32,145,229,  3,  0, 80,225,  3,  0,160, 33,
-/* 0x0430 */  11,  0,  0,234,  0, 48,145,229,  1,  0, 83,227,  6,  0,  0, 26,
+/* 0x0430 */   2, 48,131,224,  3,  0, 85,225,  3, 80,160, 49, 32, 16,129,226,
-/* 0x0440 */   8, 48,145,229, 20, 32,145,229,  3,  0, 80,225,  3,  0,160, 33,
+/* 0x0440 */   1,224, 78,226,  0,  0, 94,227,241,255,255,170,255, 78,192,227,
-/* 0x0450 */   2, 48,131,224,  3,  0, 85,225,  3, 80,160, 49, 32, 16,129,226,
+/* 0x0450 */  15, 64,196,227,  5, 48,100,224,255, 62,131,226, 15, 48,131,226,
-/* 0x0460 */   1,224, 78,226,  0,  0, 94,227,241,255,255,170,255, 78,192,227,
+/* 0x0460 */ 255, 62,195,227, 16,224, 28,226, 15, 48,195,227, 36, 48,141,229,
-/* 0x0470 */  15, 64,196,227,  5, 48,100,224,255, 62,131,226, 15, 48,131,226,
+/* 0x0470 */  28, 64,141, 21,  7,  0,  0, 26, 12, 48,160,225, 14, 32,160,225,
-/* 0x0480 */ 255, 62,195,227, 16,224, 28,226, 15, 48,195,227, 36, 48,141,229,
+/* 0x0480 */   0,192,224,227,  4,  0,160,225, 36, 16,157,229,  0, 80,141,232,
-/* 0x0490 */  28, 64,141, 21,  7,  0,  0, 26, 12, 48,160,225, 14, 32,160,225,
+/* 0x0490 */  81,255,255,235, 28,  0,141,229, 28, 16,157,229, 52, 48,160,227,
-/* 0x04a0 */   0,192,224,227,  4,  0,160,225, 36, 16,157,229,  0, 80,141,232,
+/* 0x04a0 */   1,176,100,224,155,  3,  3,224,  0, 32,160,227, 32, 80,134,226,
-/* 0x04b0 */  73,255,255,235, 28,  0,141,229, 28, 16,157,229, 52, 48,160,227,
+/* 0x04b0 */  32, 48,141,229, 24, 32,141,229,127,  0,  0,234, 12, 48,157,229,
-/* 0x04c0 */   1,176,100,224,155,  3,  3,224,  0, 32,160,227, 32, 80,134,226,
+/* 0x04c0 */   0,  0, 83,227,  8,  0,  0, 10, 32, 48, 21,229,  6,  0, 83,227,
-/* 0x04d0 */  32, 48,141,229, 24, 32,141,229,127,  0,  0,234, 12, 48,157,229,
+/* 0x04d0 */   5,  0,  0, 26, 24, 32, 21,229,  8,  0,157,229,  2, 32,139,224,
-/* 0x04e0 */   0,  0, 83,227,  8,  0,  0, 10, 32, 48, 21,229,  6,  0, 83,227,
+/* 0x04e0 */   3, 16,160,227, 72,255,255,235,111,  0,  0,234, 32, 48, 21,229,
-/* 0x04f0 */   5,  0,  0, 26, 24, 32, 21,229,  8,  0,157,229,  2, 32,139,224,
+/* 0x04f0 */   1,  0, 83,227,108,  0,  0, 26,  8, 48, 21,229, 40, 34,159,229,
-/* 0x0500 */   3, 16,160,227, 64,255,255,235,111,  0,  0,234, 32, 48, 21,229,
+/* 0x0500 */   7, 48,  3,226,  3, 49,160,225, 50, 35,160,225, 24, 48, 21,229,
-/* 0x0510 */   1,  0, 83,227,108,  0,  0, 26,  8, 48, 21,229, 40, 34,159,229,
+/* 0x0510 */  16,224, 21,229,  3,144,139,224, 12, 48,157,229,  9, 26,160,225,
-/* 0x0520 */   7, 48,  3,226,  3, 49,160,225, 50, 35,160,225, 24, 48, 21,229,
+/* 0x0520 */   0,  0, 83,227, 33, 26,160,225, 28,192, 21,229,  7, 96,  2,226,
-/* 0x0530 */  16,224, 21,229,  3,144,139,224, 12, 48,157,229,  9, 26,160,225,
+/* 0x0530 */  12, 32, 21,229,  9,128, 97,224, 16, 64,157,  5,  1,112,142,224,
-/* 0x0540 */   0,  0, 83,227, 33, 26,160,225, 28,192, 21,229,  7, 96,  2,226,
+/* 0x0540 */  20, 32,141,229,  0, 64,224, 19, 12,192, 97,224,  6, 32,160,  1,
-/* 0x0550 */  12, 32, 21,229,  9,128, 97,224, 16, 64,157,  5,  1,112,142,224,
+/* 0x0550 */  18, 48,160,  3,  2, 32,134, 19, 50, 48,160, 19,  8,  0,160,225,
-/* 0x0560 */  20, 32,141,229,  0, 64,224, 19, 12,192, 97,224,  6, 32,160,  1,
+/* 0x0560 */   7, 16,160,225, 40,224,141,229, 16, 16,141,232, 44,144,141,229,
-/* 0x0570 */  18, 48,160,  3,  2, 32,134, 19, 50, 48,160, 19,  8,  0,160,225,
+/* 0x0570 */  25,255,255,235,  0,  0, 88,225, 56,  0,  0, 26, 12, 48,157,229,
-/* 0x0580 */   7, 16,160,225, 40,224,141,229, 16, 16,141,232, 44,144,141,229,
+/* 0x0580 */   0,  0, 83,227,  6,  0,  0, 10, 88, 16,157,229,  4, 48, 22,226,
-/* 0x0590 */  17,255,255,235,  0,  0, 88,225, 56,  0,  0, 26, 12, 48,157,229,
+/* 0x0590 */   1, 48,160, 17, 12,  0,157,229, 40, 16,141,226, 16, 32,157,229,
-/* 0x05a0 */   0,  0, 83,227,  6,  0,  0, 10, 88, 16,157,229,  4, 48, 22,226,
+/* 0x05a0 */  57,255,255,235,  0, 48,103,226,  3, 74,160,225,  2,  0, 22,227,
-/* 0x05b0 */   1, 48,160, 17, 12,  0,157,229, 40, 16,141,226, 16, 32,157,229,
+/* 0x05b0 */  36, 74,160,225,  7,  0,  0, 10,  0,  0, 84,227,  5,  0,  0, 10,
-/* 0x05c0 */  57,255,255,235,  0, 48,103,226,  3, 74,160,225,  2,  0, 22,227,
+/* 0x05c0 */   7, 16,136,224,  4, 32,160,225,  0, 48,160,227,  1, 32, 82,226,
-/* 0x05d0 */  36, 74,160,225,  7,  0,  0, 10,  0,  0, 84,227,  5,  0,  0, 10,
+/* 0x05d0 */   1, 48,193,228,251,255,255, 26, 12, 32,157,229,  0,  0, 82,227,
-/* 0x05e0 */   7, 16,136,224,  4, 32,160,225,  0, 48,160,227,  1, 32, 82,226,
+/* 0x05e0 */  32,  0,  0, 10, 32, 48, 21,229,  1,  0, 83,227, 21,  0,  0, 26,
-/* 0x05f0 */   1, 48,193,228,251,255,255, 26, 12, 32,157,229,  0,  0, 82,227,
+/* 0x05f0 */   8, 48, 21,229,  1,  0, 19,227, 18,  0,  0, 10, 12, 32, 21,229,
-/* 0x0600 */  32,  0,  0, 10, 32, 48, 21,229,  1,  0, 83,227, 21,  0,  0, 26,
+/* 0x0600 */  16, 48, 21,229, 24, 16, 21,229,  3,  0, 82,225, 63,  0,  0, 26,
-/* 0x0610 */   8, 48, 21,229,  1,  0, 19,227, 18,  0,  0, 10, 12, 32, 21,229,
+/* 0x0610 */   1, 48,130,224, 11, 32,131,224,  0, 48, 98,226,  3, 58,160,225,
-/* 0x0620 */  16, 48, 21,229, 24, 16, 21,229,  3,  0, 82,225, 63,  0,  0, 26,
+/* 0x0620 */  35, 58,160,225,  7,  0, 83,227, 56,  0,  0,154,252, 48,159,229,
-/* 0x0630 */   1, 48,130,224, 11, 32,131,224,  0, 48, 98,226,  3, 58,160,225,
+/* 0x0630 */   8,  0,157,229,  0, 48,130,229,244, 48,159,229,  0, 16,160,227,
-/* 0x0640 */  35, 58,160,225,  7,  0, 83,227, 56,  0,  0,154,252, 48,159,229,
+/* 0x0640 */   4, 48,130,229,240,254,255,235,  8,  0,160,225,  7, 16,160,225,
-/* 0x0650 */   8,  0,157,229,  0, 48,130,229,244, 48,159,229,  0, 16,160,227,
+/* 0x0650 */   6, 32,160,225,219,254,255,235,  0,  0, 80,227,  1,  0,  0, 10,
-/* 0x0660 */   4, 48,130,229,232,254,255,235,  8,  0,160,225,  7, 16,160,225,
+/* 0x0660 */ 127,  0,160,227,181,254,255,235, 20, 32,157,229,  4, 48,135,224,
-/* 0x0670 */   6, 32,160,225,211,254,255,235,  0,  0, 80,227,  1,  0,  0, 10,
+/* 0x0670 */   2, 16,137,224,  3, 64,136,224,  1,  0, 84,225, 10,  0,  0, 42,
-/* 0x0680 */ 127,  0,160,227,173,254,255,235, 20, 32,157,229,  4, 48,135,224,
+/* 0x0680 */   0,192,224,227,  0,192,141,229,  1, 16,100,224,  1,192,140,226,
-/* 0x0690 */   2, 16,137,224,  3, 64,136,224,  1,  0, 84,225, 10,  0,  0, 42,
+/* 0x0690 */   6, 32,160,225,  4,  0,160,225, 50, 48,160,227,  4,192,141,229,
-/* 0x06a0 */   0,192,224,227,  0,192,141,229,  1, 16,100,224,  1,192,140,226,
+/* 0x06a0 */ 205,254,255,235,  0,  0, 84,225,236,255,255, 26, 24, 48,157,229,
-/* 0x06b0 */   6, 32,160,225,  4,  0,160,225, 50, 48,160,227,  4,192,141,229,
+/* 0x06b0 */  32, 80,133,226,  1, 48,131,226, 24, 48,141,229,188, 50,218,225,
-/* 0x06c0 */ 197,254,255,235,  0,  0, 84,225,236,255,255, 26, 24, 48,157,229,
+/* 0x06c0 */  24, 16,157,229,  3,  0, 81,225,123,255,255,186, 12, 32,157,229,
-/* 0x06d0 */  32, 80,133,226,  1, 48,131,226, 24, 48,141,229,188, 50,218,225,
+/* 0x06d0 */   0,  0, 82,227,  6,  0,  0, 10,176, 49,218,225,  3,  0, 83,227,
-/* 0x06e0 */  24, 16,157,229,  3,  0, 81,225,123,255,255,186, 12, 32,157,229,
+/* 0x06e0 */   3,  0,  0, 10, 28, 48,157,229, 36, 16,157,229,  1,  0,131,224,
-/* 0x06f0 */   0,  0, 82,227,  6,  0,  0, 10,176, 49,218,225,  3,  0, 83,227,
+/* 0x06f0 */ 170,254,255,235, 84, 32,157,229,  0,  0, 82,227,  0,176,130, 21,
-/* 0x0700 */   3,  0,  0, 10, 28, 48,157,229, 36, 16,157,229,  1,  0,131,224,
+/* 0x0700 */  24,  0,154,229,  0,  0,139,224, 48,208,141,226,240,143,189,232,
-/* 0x0710 */ 162,254,255,235, 84, 32,157,229,  0,  0, 82,227,  0,176,130, 21,
+/* 0x0710 */  28, 48, 21,229,  0,  0, 83,227, 32, 32,157,  5,  2, 48,129,  0,
-/* 0x0720 */  24,  0,154,229,  0,  0,139,224, 48,208,141,226,240,143,189,232,
+/* 0x0720 */   8, 32,131,  2,192,255,255, 10,198,255,255,234, 64, 98, 81,115,
-/* 0x0730 */  28, 48, 21,229,  0,  0, 83,227, 32, 32,157,  5,  2, 48,129,  0,
+/* 0x0730 */  91,  0,144,239, 14,240,160,225,240, 71, 45,233, 12,208, 77,226,
-/* 0x0740 */   8, 32,131,  2,192,255,255, 10,198,255,255,234, 64, 98, 81,115,
+/* 0x0740 */  52, 96,141,226,  0,144,160,225,  1, 80,160,225,  3,128,160,225,
-/* 0x0750 */  91,  0,144,239, 14,240,160,225,240, 71, 45,233, 12,208, 77,226,
+/* 0x0750 */   6,  0,160,225,  0, 48,160,227, 44, 16,141,226, 48,160,157,229,
-/* 0x0760 */  52, 96,141,226,  0,144,160,225,  1, 80,160,225,  3,128,160,225,
+/* 0x0760 */   2,112,160,225, 52, 64,157,229,199,254,255,235, 56, 48,157,229,
-/* 0x0770 */   6,  0,160,225,  0, 48,160,227, 44, 16,141,226, 48,160,157,229,
+/* 0x0770 */   5, 16,160,227,  3, 48,100,224,188, 34,218,225,  9,  0,160,225,
-/* 0x0780 */   2,112,160,225, 52, 64,157,229,199,254,255,235, 56, 48,157,229,
+/* 0x0780 */  56, 48,141,229, 52, 80,141,229,159,254,255,235,  9,  0,160,225,
-/* 0x0790 */   5, 16,160,227,  3, 48,100,224,188, 34,218,225,  9,  0,160,225,
+/* 0x0790 */   4, 16,160,227,186, 34,218,225,155,254,255,235, 52, 64,138,226,
-/* 0x07a0 */  56, 48,141,229, 52, 80,141,229,151,254,255,235,  9,  0,160,225,
+/* 0x07a0 */  60, 32,157,229,  8, 48,148,229, 52, 32,130,226,  3, 32,130,224,
-/* 0x07b0 */   4, 16,160,227,186, 34,218,225,147,254,255,235, 52, 64,138,226,
+/* 0x07b0 */   9,  0,160,225,  3, 16,160,227,147,254,255,235,  8,192,141,226,
-/* 0x07c0 */  60, 32,157,229,  8, 48,148,229, 52, 32,130,226,  3, 32,130,224,
+/* 0x07c0 */   6, 32,160,225, 10, 16,160,225,  9, 48,160,225,  7,  0,160,225,
-/* 0x07d0 */   9,  0,160,225,  3, 16,160,227,139,254,255,235,  8,192,141,226,
+/* 0x07d0 */   0,192,141,229,  4,128,141,229,251,254,255,235,  0, 80,160,225,
-/* 0x07e0 */   6, 32,160,225, 10, 16,160,225,  9, 48,160,225,  7,  0,160,225,
+/* 0x07e0 */   9, 16,160,227,  5, 32,160,225,  9,  0,160,225,134,254,255,235,
-/* 0x07f0 */   0,192,141,229,  4,128,141,229,251,254,255,235,  0, 80,160,225,
+/* 0x07f0 */ 188, 18,218,225,  0, 32,160,227, 35,  0,  0,234,  0, 48,148,229,
-/* 0x0800 */   9, 16,160,227,  5, 32,160,225,  9,  0,160,225,126,254,255,235,
+/* 0x0800 */   3,  0, 83,227, 30,  0,  0, 26,  8, 48,148,229,  8,  0,157,229,
-/* 0x0810 */ 188, 18,218,225,  0, 32,160,227, 35,  0,  0,234,  0, 48,148,229,
+/* 0x0810 */   0, 16,160,227,  0,  0,131,224,  1, 32,160,225, 85,254,255,235,
-/* 0x0820 */   3,  0, 83,227, 30,  0,  0, 26,  8, 48,148,229,  8,  0,157,229,
+/* 0x0820 */   0, 64, 80,226,  4,  0,  0,186, 10, 16,160,225,  2, 44,160,227,
-/* 0x0830 */   0, 16,160,227,  0,  0,131,224,  1, 32,160,225, 77,254,255,235,
+/* 0x0830 */  70,254,255,235,  2, 12, 80,227,  1,  0,  0, 10,127,  0,160,227,
-/* 0x0840 */   0, 64, 80,226,  4,  0,  0,186, 10, 16,160,225,  2, 44,160,227,
+/* 0x0840 */  62,254,255,235,  0,224,160,227, 14, 32,160,225,  8,192,141,226,
-/* 0x0850 */  62,254,255,235,  2, 12, 80,227,  1,  0,  0, 10,127,  0,160,227,
+/* 0x0850 */  10, 16,160,225,  9, 48,160,225,  4,  0,160,225,  0, 80,141,232,
-/* 0x0860 */  54,254,255,235,  0,224,160,227, 14, 32,160,225,  8,192,141,226,
+/* 0x0860 */ 217,254,255,235,  7, 16,160,227,  0, 80,160,225,  8, 32,157,229,
-/* 0x0870 */  10, 16,160,225,  9, 48,160,225,  4,  0,160,225,  0, 80,141,232,
+/* 0x0870 */   9,  0,160,225,100,254,255,235,  4,  0,160,225, 66,254,255,235,
-/* 0x0880 */ 217,254,255,235,  7, 16,160,227,  0, 80,160,225,  8, 32,157,229,
+/* 0x0880 */   3,  0,  0,234, 32, 64,132,226,  1, 32,130,226,  1,  0, 82,225,
-/* 0x0890 */   9,  0,160,225, 92,254,255,235,  4,  0,160,225, 58,254,255,235,
+/* 0x0890 */ 217,255,255,186,  5,  0,160,225, 12,208,141,226,240,135,189,232
-/* 0x08a0 */   3,  0,  0,234, 32, 64,132,226,  1, 32,130,226,  1,  0, 82,225,
-/* 0x08b0 */ 217,255,255,186,  5,  0,160,225, 12,208,141,226,240,135,189,232
 };

src/stub/i386-bsd.elf-fold.h

@@ -1,5 +1,5 @@
 /* i386-bsd.elf-fold.h
-   created from i386-bsd.elf-fold.bin, 1789 (0x6fd) bytes
+   created from i386-bsd.elf-fold.bin, 1805 (0x70d) bytes
 
    This file is part of the UPX executable compressor.
 
@@ -31,121 +31,122 @@
  */
 
 
-#define STUB_I386_BSD_ELF_FOLD_SIZE    1789
+#define STUB_I386_BSD_ELF_FOLD_SIZE    1805
-#define STUB_I386_BSD_ELF_FOLD_ADLER32 0x2438ff63
+#define STUB_I386_BSD_ELF_FOLD_ADLER32 0x98f4060d
-#define STUB_I386_BSD_ELF_FOLD_CRC32   0x4ac57dab
+#define STUB_I386_BSD_ELF_FOLD_CRC32   0xb1990cc8
 
-unsigned char stub_i386_bsd_elf_fold[1789] = {
+unsigned char stub_i386_bsd_elf_fold[1805] = {
 /* 0x0000 */ 127, 69, 76, 70,  1,  1,  1,  9,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0010 */   2,  0,  3,  0,  1,  0,  0,  0,128, 16,192,  0, 52,  0,  0,  0,
 /* 0x0020 */   0,  0,  0,  0,  0,  0,  0,  0, 52,  0, 32,  0,  2,  0,  0,  0,
 /* 0x0030 */   0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0, 16,192,  0,
-/* 0x0040 */   0, 16,192,  0,253,  6,  0,  0,  0,  7,  0,  0,  5,  0,  0,  0,
+/* 0x0040 */   0, 16,192,  0, 13,  7,  0,  0, 16,  7,  0,  0,  5,  0,  0,  0,
-/* 0x0050 */   0, 16,  0,  0,  1,  0,  0,  0,253,  6,  0,  0,  0,  0,  0,  0,
+/* 0x0050 */   0, 16,  0,  0,  1,  0,  0,  0, 13,  7,  0,  0,  0,  0,  0,  0,
 /* 0x0060 */   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0070 */   0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-/* 0x0080 */  41,201,186,248,  2,  0,  0,137,230,137,231,232,131,  0,  0,  0,
+/* 0x0080 */  41,201,186,248,  2,  0,  0,137,230,137,231,232,137,  0,  0,  0,
 /* 0x0090 */ 137,230,209,234, 25,192, 41,193,141, 36,196,133,210,117,243,137,
-/* 0x00a0 */ 231,232,109,  0,  0,  0,129,236,  0, 10,  0,  0, 83,139, 83, 72,
+/* 0x00a0 */ 231,232,115,  0,  0,  0,129,236,  0, 10,  0,  0, 83,139, 83, 72,
 /* 0x00b0 */ 141,148, 26,255, 31,  0,  0,129,226,  0,240,255,255, 82, 41,192,
 /* 0x00c0 */ 102,131,123, 16,  3,117,  1,146, 80,139,115, 24,141,131,140,  0,
 /* 0x00d0 */   0,  0, 41,198,139, 24,139, 72,  4,131,193, 12,141, 84, 36, 12,
-/* 0x00e0 */  96, 71,232,111,  4,  0,  0,131,196, 36, 89, 91,129,196,  0, 10,
+/* 0x00e0 */  96, 71,232,129,  4,  0,  0,131,196, 36, 89, 91,129,196,  0, 10,
-/* 0x00f0 */   0,  0, 80,106,  0,137,229, 41,217, 41,192, 81, 83, 80, 79, 60,
+/* 0x00f0 */   0,  0, 90,193,226, 12,  1,211, 80,106,  0,137,229, 41,217, 41,
-/* 0x0100 */ 175,175,117,252,255, 55, 49,255, 49,246, 49,210, 49,201, 49,219,
+/* 0x0100 */ 192, 81, 83, 80, 79, 60,175,175,117,252,255, 55, 49,255, 49,246,
-/* 0x0110 */ 176, 73,195,173,171,173,171,133,192,117,250,173,171,133,192,117,
+/* 0x0110 */  49,210, 49,201, 49,219,176, 73,195,173,171,173,171,133,192,117,
-/* 0x0120 */ 250, 87,173,171,131,248, 32,115,  3, 15,179,194,133,192,173,171,
+/* 0x0120 */ 250,173,171,133,192,117,250, 87,173,171,131,248, 32,115,  3, 15,
-/* 0x0130 */ 117,240,131,239,  8,  1,201, 64,243,171, 72,171,171, 95,195,  0,
+/* 0x0130 */ 179,194,133,192,173,171,117,240,131,239,  8,  1,201, 64,243,171,
-/* 0x0140 */  85,137,229, 87, 86,137,206, 83,137,195, 57,  8,139,120,  4,115,
+/* 0x0140 */  72,171,171, 95,195,  0,  0,  0, 85,137,229, 87, 86,137,206, 83,
-/* 0x0150 */   7,106,127,232, 93,  5,  0,  0,133,201,116,  8,138,  7, 71,136,
+/* 0x0150 */ 137,195, 57,  8,139,120,  4,115,  7,106,127,232,101,  5,  0,  0,
-/* 0x0160 */   2, 66,226,248,  1,115,  4, 41, 51,141,101,244, 91, 94, 95,201,
+/* 0x0160 */ 133,201,116,  8,138,  7, 71,136,  2, 66,226,248,  1,115,  4, 41,
-/* 0x0170 */ 195, 85,137,229, 87, 86,137,198, 83,137,211,131,236, 24,139, 69,
+/* 0x0170 */  51,141,101,244, 91, 94, 95,201,195, 85,137,229, 87, 86,137,198,
-/* 0x0180 */   8,139,125, 12,137, 69,220,131, 58,  0, 15,132,182,  0,  0,  0,
+/* 0x0180 */  83,137,211,131,236, 24,139, 69,  8,139,125, 12,137, 69,220,131,
-/* 0x0190 */ 141, 85,228,185, 12,  0,  0,  0,137,240,232,161,255,255,255,139,
+/* 0x0190 */  58,  0, 15,132,182,  0,  0,  0,141, 85,228,185, 12,  0,  0,  0,
-/* 0x01a0 */  69,228,139, 77,232,133,192,117, 19,129,249, 85, 80, 88, 33,117,
+/* 0x01a0 */ 137,240,232,161,255,255,255,139, 69,228,139, 77,232,133,192,117,
-/* 0x01b0 */  15,131, 62,  0, 15,132,140,  0,  0,  0,235,  4,133,201,117,  7,
+/* 0x01b0 */  19,129,249, 85, 80, 88, 33,117, 15,131, 62,  0, 15,132,140,  0,
-/* 0x01c0 */ 106,127,232,238,  4,  0,  0, 57,193,119,245, 59,  3,119,241, 57,
+/* 0x01c0 */   0,  0,235,  4,133,201,117,  7,106,127,232,246,  4,  0,  0, 57,
-/* 0x01d0 */ 193,115, 86,137, 69,224,141, 69,224,255,117,236, 80,255,115,  4,
+/* 0x01d0 */ 193,119,245, 59,  3,119,241, 57,193,115, 86,137, 69,224,141, 69,
-/* 0x01e0 */  81,255,118,  4,255, 85,220,131,196, 20,133,192,117,210,139, 85,
+/* 0x01e0 */ 224,255,117,236, 80,255,115,  4, 81,255,118,  4,255, 85,220,131,
-/* 0x01f0 */ 224, 59, 85,228,117,202,138, 69,237,132,192,116, 34,133,255,116,
+/* 0x01f0 */ 196, 20,133,192,117,210,139, 85,224, 59, 85,228,117,202,138, 69,
-/* 0x0200 */  30,129,250,  0,  2,  0,  0,119,  4, 57, 19,117, 18, 15,182,192,
+/* 0x0200 */ 237,132,192,116, 34,133,255,116, 30,129,250,  0,  2,  0,  0,119,
-/* 0x0210 */  80, 15,182, 69,238, 80, 82,255,115,  4,255,215,131,196, 16,139,
+/* 0x0210 */   4, 57, 19,117, 18, 15,182,192, 80, 15,182, 69,238, 80, 82,255,
-/* 0x0220 */  69,232,  1, 70,  4, 41,  6,235, 10,139, 83,  4,137,240,232, 13,
+/* 0x0220 */ 115,  4,255,215,131,196, 16,139, 69,232,  1, 70,  4, 41,  6,235,
-/* 0x0230 */ 255,255,255,139, 85,228,139,  3,  1, 83,  4, 41,208,133,192,137,
+/* 0x0230 */  10,139, 83,  4,137,240,232, 13,255,255,255,139, 85,228,139,  3,
-/* 0x0240 */   3,233, 68,255,255,255,141,101,244, 91, 94, 95,201,195,133,192,
+/* 0x0240 */   1, 83,  4, 41,208,133,192,137,  3,233, 68,255,255,255,141,101,
-/* 0x0250 */  83,137,211,116, 29,168,  1,117, 25,139, 16, 57,218,116,  7, 74,
+/* 0x0250 */ 244, 91, 94, 95,201,195,133,192, 83,137,211,116, 29,168,  1,117,
-/* 0x0260 */ 117, 11,133,219,116,  7,137, 24,137, 72,  4,235,  5,131,192,  8,
+/* 0x0260 */  25,139, 16, 57,218,116,  7, 74,117, 11,133,219,116,  7,137, 24,
-/* 0x0270 */ 235,231, 91,195, 85,137,229, 87, 86, 83,131,236, 60,137, 85,224,
+/* 0x0270 */ 137, 72,  4,235,  5,131,192,  8,235,231, 91,195, 85,137,229, 87,
-/* 0x0280 */ 137, 69,228,139, 85, 12,139, 69,  8,199, 69,204,255,255,255,255,
+/* 0x0280 */  86, 83,131,236, 60,137, 69,228,139, 69,  8,137, 85,224,139,125,
-/* 0x0290 */ 137, 85,216,139,125,224,139, 85,224,137, 69,220,139, 69, 20,  3,
+/* 0x0290 */ 224,199, 69,204,255,255,255,255,139, 85, 12,137, 69,220,139, 69,
-/* 0x02a0 */ 127, 28,137, 69,212, 49,192,102,131,122, 16,  2, 15,183, 74, 44,
+/* 0x02a0 */ 224,139, 77, 20,137, 85,216,  3,127, 28,139, 85,224,137, 77,212,
-/* 0x02b0 */ 137,251, 15,148,192, 49,246,193,224,  4,137,202,  5,  2, 16,  0,
+/* 0x02b0 */ 102,131,120, 16,  2, 15,183, 74, 44,137,251, 15,148,192, 49,246,
-/* 0x02c0 */   0, 74,120, 30,131, 59,  1,117, 20,139, 83,  8, 59, 85,204,115,
+/* 0x02c0 */  15,182,192,137,202,193,224,  4,  5,  2, 16,  0,  0, 74,120, 30,
-/* 0x02d0 */   3,137, 85,204,  3, 83, 20, 57,214,115,  2,137,214,131,195, 32,
+/* 0x02d0 */ 131, 59,  1,117, 20,139, 83,  8, 59, 85,204,115,  3,137, 85,204,
-/* 0x02e0 */ 226,226,139, 93,204,106,  0,106,255,129,227,  0,240,255,255, 80,
+/* 0x02e0 */   3, 83, 20, 57,214,115,  2,137,214,131,195, 32,226,226,139, 93,
-/* 0x02f0 */  41,222,106,  0,129,198,255, 15,  0,  0,129,230,  0,240,255,255,
+/* 0x02f0 */ 204,106,  0,106,255,129,227,  0,240,255,255, 80, 41,222,106,  0,
-/* 0x0300 */  86, 83,232,137,  3,  0,  0,131,196, 24,141, 52, 48, 41,216,137,
+/* 0x0300 */ 129,198,255, 15,  0,  0,129,230,  0,240,255,255, 86, 83,232,141,
-/* 0x0310 */  69,208,139, 69,224,137,117,240,102,131,120, 44,  0,199, 69,200,
+/* 0x0310 */   3,  0,  0,139, 77,224,141, 52, 48,131,196, 24, 41,216,102,131,
-/* 0x0320 */   0,  0,  0,  0, 15,132,226,  1,  0,  0,139,  7,131,248,  6,117,
+/* 0x0320 */ 121, 44,  0,137,117,240,137, 69,208,199, 69,200,  0,  0,  0,  0,
-/* 0x0330 */  34,131,125,220,  0, 15,132,187,  1,  0,  0,139, 77,208,186,  3,
+/* 0x0330 */  15,132,232,  1,  0,  0,139,  7,131,248,  6,117, 34,131,125,220,
-/* 0x0340 */   0,  0,  0,  3, 79,  8,139, 69,216,232,  0,255,255,255,233,163,
+/* 0x0340 */   0, 15,132,193,  1,  0,  0,139, 77,208,186,  3,  0,  0,  0,  3,
-/* 0x0350 */   1,  0,  0, 72, 15,133,156,  1,  0,  0,139, 69,208,199, 69,196,
+/* 0x0350 */  79,  8,139, 69,216,232,252,254,255,255,233,169,  1,  0,  0, 72,
-/* 0x0360 */  64, 98, 81,115,  3, 71,  8,139, 87, 20,139, 79, 24,  1,194,137,
+/* 0x0360 */  15,133,162,  1,  0,  0,139, 79, 24,199, 69,196, 64, 98, 81,115,
-/* 0x0370 */  69,236,137, 85,188,137,194,129,226,255, 15,  0,  0,131,225,  7,
+/* 0x0370 */ 139, 69,208,131,225,  7,  3, 71,  8,193,225,  2,139, 87, 16,211,
-/* 0x0380 */  41,208,193,225,  2,137, 69,192,139, 71,  4,211,109,196, 41,208,
+/* 0x0380 */ 109,196,139, 79, 20,137,198,131,101,196,  7,  1,193,137, 85,232,
-/* 0x0390 */ 131,101,196,  7,131,125,220,  0,139, 79, 16, 80,139, 69,228,137,
+/* 0x0390 */ 137, 77,188,137,193,129,225,255, 15,  0,  0,137, 69,236,  1,202,
-/* 0x03a0 */  77,232,141, 52, 17,116,  3,131,200,255,131,125,220,  1, 80, 25,
+/* 0x03a0 */  41,206,131,125,220,  0,137, 85,192,116, 41,106,  0,139, 69,196,
-/* 0x03b0 */ 192, 37,  0,240,255,255,  5, 18, 16,  0,  0,131,125,220,  0, 80,
+/* 0x03b0 */ 106,255,104, 18, 16,  0,  0,131,200,  2, 80,137,208,131,192,  3,
-/* 0x03c0 */ 139, 69,196,116,  3,131,200,  2,131,125,220,  0, 80,137,240,116,
+/* 0x03c0 */  80, 86,232,217,  2,  0,  0,131,196, 24, 57,198, 15,133,225,  0,
-/* 0x03d0 */   3,141, 70,  3, 80,255,117,192,232,179,  2,  0,  0,131,196, 24,
+/* 0x03d0 */   0,  0,235, 36,139, 71,  4, 41,200, 80,255,117,228,106, 18,255,
-/* 0x03e0 */  57, 69,192, 15,133,185,  0,  0,  0,131,125,220,  0,116, 28,246,
+/* 0x03e0 */ 117,196,255,117,192, 86,232,181,  2,  0,  0,131,196, 24, 57,198,
-/* 0x03f0 */  69,196,  4,139, 69,212,117,  2, 49,192, 80,139, 69,220,255,117,
+/* 0x03f0 */  15,133,189,  0,  0,  0,235, 34,131,125,220,  0,116, 28,246, 69,
-/* 0x0400 */ 228,141, 85,232,232,104,253,255,255, 88, 90,137,240,247,216, 37,
+/* 0x0400 */ 196,  4,139, 69,212,117,  2, 49,192, 80,139, 69,220,255,117,228,
-/* 0x0410 */ 255, 15,  0,  0,246, 69,196,  2,137, 69,184,116, 20,139, 69,192,
+/* 0x0410 */ 141, 85,232,232, 97,253,255,255, 88, 90,139, 69,192,247,216, 37,
-/* 0x0420 */   1,240,131,125,184,  0,116,  9,139, 77,184,198,  0,  0, 64,226,
+/* 0x0420 */ 255, 15,  0,  0,246, 69,196,  2,137, 69,184,116, 21,131,125,184,
-/* 0x0430 */ 250,131,125,220,  0,116,114,131, 63,  1,117, 83,246, 71, 24,  1,
+/* 0x0430 */   0,139, 85,192,141,  4, 22,116,  9,139, 77,184,198,  0,  0, 64,
-/* 0x0440 */ 116, 77,139, 87, 20,139, 95,  8,141, 12, 26,  3, 77,208, 59, 87,
+/* 0x0440 */ 226,250,131,125,220,  0,116,114,131, 63,  1,117, 83,246, 71, 24,
-/* 0x0450 */  16,117, 14,137,200,247,216, 37,255, 15,  0,  0,131,248,  3,119,
+/* 0x0450 */   1,116, 77,139, 87, 20,139, 95,  8,141, 12, 26,  3, 77,208, 59,
-/* 0x0460 */  14,107, 69,208, 52,131,127,  4,  0,141, 76,  3, 12,117, 15,139,
+/* 0x0460 */  87, 16,117, 14,137,200,247,216, 37,255, 15,  0,  0,131,248,  3,
-/* 0x0470 */   1, 61,205,128,201,195,116,  6,199,  1,205,128,201,195,133,201,
+/* 0x0470 */ 119, 14,107, 69,208, 52,131,127,  4,  0,141, 76,  3, 12,117, 15,
-/* 0x0480 */ 116, 13,139, 69,216, 49,210,131,224,254,232,191,253,255,255,255,
+/* 0x0480 */ 139,  1, 61,205,128,201,195,116,  6,199,  1,205,128,201,195,133,
-/* 0x0490 */ 117,196, 86,255,117,192,232, 54,  2,  0,  0,131,196, 12,133,192,
+/* 0x0490 */ 201,116, 13,139, 69,216, 49,210,131,224,254,232,182,253,255,255,
-/* 0x04a0 */ 116,  7,106,127,232, 12,  2,  0,  0,139, 85,184,139, 93,192,141,
+/* 0x04a0 */ 255,117,196,255,117,192, 86,232, 53,  2,  0,  0,131,196, 12,133,
-/* 0x04b0 */   4, 22,  1,195, 59, 93,188,115, 33,106,  0,106,255,104, 18, 16,
+/* 0x04b0 */ 192,116,  7,106,127,232, 11,  2,  0,  0,139, 69,192,  3, 69,184,
-/* 0x04c0 */   0,  0,255,117,196, 41, 93,188,255,117,188, 83,232,191,  1,  0,
+/* 0x04c0 */ 141, 28,  6, 59, 93,188,115, 33,106,  0,106,255,104, 18, 16,  0,
-/* 0x04d0 */   0,131,196, 24, 57,195,116, 30,235,200,131,125,220,  0,116, 22,
+/* 0x04d0 */   0,255,117,196, 41, 93,188,255,117,188, 83,232,192,  1,  0,  0,
-/* 0x04e0 */ 141, 70,  3, 37,255, 15,  0,  0,131,248,  3,119,  9, 80, 83,232,
+/* 0x04e0 */ 131,196, 24, 57,195,116, 33,235,202,131,125,220,  0,116, 25,139,
-/* 0x04f0 */ 217,  1,  0,  0, 89, 91,139, 85,224,131,199, 32,255, 69,200, 15,
+/* 0x04f0 */  69,192,131,192,  3, 37,255, 15,  0,  0,131,248,  3,119,  9, 80,
-/* 0x0500 */ 183, 66, 44, 57, 69,200, 15,140, 30,254,255,255,131,125,220,  0,
+/* 0x0500 */  83,232,215,  1,  0,  0, 89, 91,139, 77,224,131,199, 32,255, 69,
-/* 0x0510 */ 117, 15,255,117,228,232,175,  1,  0,  0, 90,133,192,116, 21,235,
+/* 0x0510 */ 200, 15,183, 65, 44, 57, 69,200, 15,140, 24,254,255,255,131,125,
-/* 0x0520 */ 129,139, 69,224,102,131,120, 16,  3,116,  9,255,117,240,232,129,
+/* 0x0520 */ 220,  0,117, 15,255,117,228,232,173,  1,  0,  0, 90,133,192,116,
-/* 0x0530 */   1,  0,  0, 88,131,125, 16,  0,116,  8,139, 69,208,139, 85, 16,
+/* 0x0530 */  21,235,128,139, 69,224,102,131,120, 16,  3,116,  9,255,117,240,
-/* 0x0540 */ 137,  2,139, 85,224,139, 82, 24,  1, 85,208,139, 69,208,141,101,
+/* 0x0540 */ 232,127,  1,  0,  0, 88,131,125, 16,  0,116,  8,139, 77,208,139,
-/* 0x0550 */ 244, 91, 94, 95,201,195, 85,137,229, 87, 86, 83,131,236, 16,141,
+/* 0x0550 */  85, 16,137, 10,139, 69,224,139, 64, 24,  1, 69,208,139, 69,208,
-/* 0x0560 */  85, 24,139, 69,  8,106,  0,139,125, 28,137, 69,236,139, 69, 16,
+/* 0x0560 */ 141,101,244, 91, 94, 95,201,195, 85,137,229, 87, 86, 83,131,236,
-/* 0x0570 */ 139, 93, 32,141,119, 52,137, 69,232,131,192,  2,255,117,232,137,
+/* 0x0570 */  16,141, 85, 24,139, 69,  8,106,  0,139,125, 28,137, 69,236,139,
-/* 0x0580 */  69,228,141, 69, 32,232,231,251,255,255,139, 69, 12,185,  0, 16,
+/* 0x0580 */  69, 16,139, 93, 32,141,119, 52,137, 69,232,131,192,  2,255,117,
-/* 0x0590 */   0,  0,186,  6,  0,  0,  0,137, 69, 32,139, 69,236, 41, 93, 36,
+/* 0x0590 */ 232,137, 69,228,141, 69, 32,232,221,251,255,255,139, 69, 12,185,
-/* 0x05a0 */ 232,169,252,255,255, 15,183, 79, 44,139, 69,236,186,  5,  0,  0,
+/* 0x05a0 */   0, 16,  0,  0,186,  6,  0,  0,  0,137, 69, 32,139, 69,236, 41,
-/* 0x05b0 */   0,232,152,252,255,255, 15,183, 79, 42,139, 69,236,186,  4,  0,
+/* 0x05b0 */  93, 36,232,159,252,255,255, 15,183, 79, 44,139, 69,236,186,  5,
-/* 0x05c0 */   0,  0,232,135,252,255,255,139, 77, 40,  3, 78,  8,186,  3,  0,
+/* 0x05c0 */   0,  0,  0,232,142,252,255,255, 15,183, 79, 42,139, 69,236,186,
-/* 0x05d0 */   0,  0,139, 69,236,131,193, 52,232,113,252,255,255,141, 69,240,
+/* 0x05d0 */   4,  0,  0,  0,232,125,252,255,255,139, 77, 40,  3, 78,  8,186,
-/* 0x05e0 */ 255,117,228,137,250, 80,141, 69, 32,255,117,236, 80,139, 69,232,
+/* 0x05e0 */   3,  0,  0,  0,139, 69,236,131,193, 52,232,103,252,255,255,141,
-/* 0x05f0 */ 232,127,252,255,255,186,  9,  0,  0,  0,137,193,137,195,139, 69,
+/* 0x05f0 */  69,240,255,117,228,137,250, 80,141, 69, 32,255,117,236, 80,139,
-/* 0x0600 */ 236,232, 72,252,255,255,102,139, 79, 44,131,196, 24, 49,210,102,
+/* 0x0600 */  69,232,232,117,252,255,255,186,  9,  0,  0,  0,137,193,137,195,
-/* 0x0610 */ 133,201,116,112,131, 62,  3,117, 96,106,  0,139, 69,240,106,  0,
+/* 0x0610 */ 139, 69,236,232, 62,252,255,255,102,139, 79, 44,131,196, 24, 49,
-/* 0x0620 */   3, 70,  8, 80,232,156,  0,  0,  0,131,196, 12,133,192,137,195,
+/* 0x0620 */ 210,102,133,201,116,112,131, 62,  3,117, 96,106,  0,139, 69,240,
-/* 0x0630 */ 120, 22,104,  0,  2,  0,  0, 87, 80,232,127,  0,  0,  0,131,196,
+/* 0x0630 */ 106,  0,  3, 70,  8, 80,232,154,  0,  0,  0,131,196, 12,133,192,
-/* 0x0640 */  12, 61,  0,  2,  0,  0,116,  7,106,127,232,102,  0,  0,  0,141,
+/* 0x0640 */ 137,195,120, 22,104,  0,  2,  0,  0, 87, 80,232,125,  0,  0,  0,
-/* 0x0650 */  69,240,137,250,106,  0, 80,137,216,106,  0,106,  0,232, 18,252,
+/* 0x0650 */ 131,196, 12, 61,  0,  2,  0,  0,116,  7,106,127,232,100,  0,  0,
-/* 0x0660 */ 255,255,139, 77,240,137,195,139, 69,236,186,  7,  0,  0,  0,232,
+/* 0x0660 */   0,141, 69,240,137,250,106,  0, 80,137,216,106,  0,106,  0,232,
-/* 0x0670 */ 218,251,255,255,131,196, 16,235, 11, 66, 15,183,193,131,198, 32,
+/* 0x0670 */   8,252,255,255,139, 77,240,137,195,139, 69,236,186,  7,  0,  0,
-/* 0x0680 */  57,194,124,144,141,101,244,137,216, 91, 94, 95,201,195,  0,  0,
+/* 0x0680 */   0,232,208,251,255,255,131,196, 16,235, 11, 66, 15,183,193,131,
-/* 0x0690 */  85,137,229, 49,192, 80,255,117, 28, 80,255,117, 24,255,117, 20,
+/* 0x0690 */ 198, 32, 57,194,124,144,141,101,244,137,216, 91, 94, 95,201,195,
-/* 0x06a0 */ 255,117, 16,255,117, 12,255,117,  8, 80,176,197, 80, 80,176,198,
+/* 0x06a0 */  85,137,229, 49,192, 80,255,117, 28, 80,255,117, 24,255,117, 20,
-/* 0x06b0 */ 205,128,201,195,195,176,  1, 15,182,192,205,128,195,176,  3,235,
+/* 0x06b0 */ 255,117, 16,255,117, 12,255,117,  8, 80,176,197, 80, 80,176,198,
-/* 0x06c0 */ 246,176,  4,235,242,176,  5,235,238,176,  6,235,234,176, 73,235,
+/* 0x06c0 */ 205,128,201,195,195,176,  1, 15,182,192,205,128,195,176,  3,235,
-/* 0x06d0 */ 230,176, 74,235,226,176, 33,235,222,176, 20,235,218,176, 92,235,
+/* 0x06d0 */ 246,176,  4,235,242,176,  5,235,238,176,  6,235,234,176, 73,235,
-/* 0x06e0 */ 214,176, 59,235,210,176,  2,235,206,176,130,235,202,176,116,235,
+/* 0x06e0 */ 230,176, 74,235,226,176, 33,235,222,176, 20,235,218,176, 92,235,
-/* 0x06f0 */ 198,176,240,235,194,176, 10,235,190,176,  7,235,186
+/* 0x06f0 */ 214,176, 59,235,210,176,  2,235,206,176,130,235,202,176,116,235,
+/* 0x0700 */ 198,176,240,235,194,176, 10,235,190,176,  7,235,186
 };

src/stub/i386-linux.elf-fold.h

@@ -1,5 +1,5 @@
 /* i386-linux.elf-fold.h
-   created from i386-linux.elf-fold.bin, 1742 (0x6ce) bytes
+   created from i386-linux.elf-fold.bin, 1725 (0x6bd) bytes
 
    This file is part of the UPX executable compressor.
 
@@ -31,17 +31,17 @@
  */
 
 
-#define STUB_I386_LINUX_ELF_FOLD_SIZE    1742
+#define STUB_I386_LINUX_ELF_FOLD_SIZE    1725
-#define STUB_I386_LINUX_ELF_FOLD_ADLER32 0xe994ee47
+#define STUB_I386_LINUX_ELF_FOLD_ADLER32 0xe6cfe425
-#define STUB_I386_LINUX_ELF_FOLD_CRC32   0x54750d83
+#define STUB_I386_LINUX_ELF_FOLD_CRC32   0xced73b90
 
-unsigned char stub_i386_linux_elf_fold[1742] = {
+unsigned char stub_i386_linux_elf_fold[1725] = {
 /* 0x0000 */ 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0010 */   2,  0,  3,  0,  1,  0,  0,  0,128, 16,192,  0, 52,  0,  0,  0,
 /* 0x0020 */   0,  0,  0,  0,  0,  0,  0,  0, 52,  0, 32,  0,  2,  0,  0,  0,
 /* 0x0030 */   0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0, 16,192,  0,
-/* 0x0040 */   0, 16,192,  0,206,  6,  0,  0,208,  6,  0,  0,  5,  0,  0,  0,
+/* 0x0040 */   0, 16,192,  0,189,  6,  0,  0,192,  6,  0,  0,  5,  0,  0,  0,
-/* 0x0050 */   0, 16,  0,  0,  1,  0,  0,  0,206,  6,  0,  0,  0,  0,  0,  0,
+/* 0x0050 */   0, 16,  0,  0,  1,  0,  0,  0,189,  6,  0,  0,  0,  0,  0,  0,
 /* 0x0060 */   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0070 */   0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0080 */  87, 83, 41,201,186,120,  2,  0,  0,137,230,137,231, 41,219,232,
@@ -53,7 +53,7 @@ unsigned char stub_i386_linux_elf_fold[1742] = {
 /* 0x00e0 */   4,198,  4,  1,  0, 91, 94,129,236,  0, 10,  0,  0, 83,139, 83,
 /* 0x00f0 */  72,141,148, 26,255, 31,  0,  0,129,226,  0,240,255,255, 82, 41,
 /* 0x0100 */ 192,102,131,123, 16,  3,117,  1,146, 80,141,131,140,  0,  0,  0,
-/* 0x0110 */ 139, 24,139, 72,  4,131,193, 12,141, 84, 36, 12, 96, 71,232,117,
+/* 0x0110 */ 139, 24,139, 72,  4,131,193, 12,141, 84, 36, 12, 96, 71,232,100,
 /* 0x0120 */   4,  0,  0,131,196, 36, 89, 91,129,196,  0, 10,  0,  0, 90,193,
 /* 0x0130 */ 226, 12,  1,211, 80, 79, 41,192, 60,175,175,117,252, 80, 80, 80,
 /* 0x0140 */  80, 80, 80, 80, 80, 41,217,176, 91,255, 39,173,171,173,171,173,
@@ -77,72 +77,71 @@ unsigned char stub_i386_linux_elf_fold[1742] = {
 /* 0x0260 */  15,182, 69,238, 80, 82,255,115,  4,255,215,131,196, 16,139, 69,
 /* 0x0270 */ 232,  1, 70,  4, 41,  6,235, 10,139, 83,  4,137,240,232, 14,255,
 /* 0x0280 */ 255,255,139, 85,228,139,  3,  1, 83,  4, 41,208,133,192,137,  3,
-/* 0x0290 */ 233, 65,255,255,255,141,101,244, 91, 94, 95,201,195,133,192, 83,
+/* 0x0290 */ 233, 65,255,255,255,141,101,244, 91, 94, 95,201,195,133,192,116,
-/* 0x02a0 */ 137,211,116, 26,168,  1,117, 22,139, 16, 57,218,116,  7, 74,117,
+/* 0x02a0 */  13,168,  1,117,  9, 57, 16,116,  7,131,192,  8,235,247, 49,192,
-/* 0x02b0 */   8,133,219,116,  4,137, 24,235,  7,131,192,  8,235,234, 49,192,
+/* 0x02b0 */ 133,192,116,  3,137, 72,  4,195, 85,137,229, 87, 86, 83,131,236,
-/* 0x02c0 */ 133,192,116,  3,137, 72,  4, 91,195, 85,137,229, 87, 86, 83,131,
+/* 0x02c0 */  68,137, 69,228,139, 69,  8,137, 85,224,139, 93,224,139, 85, 12,
-/* 0x02d0 */ 236, 68,137, 69,228,139, 69,  8,137, 85,224,139, 93,224,139, 85,
+/* 0x02d0 */ 137, 69,220,139, 69,224,139, 77, 20,137, 85,216,  3, 91, 28,139,
-/* 0x02e0 */  12,137, 69,220,139, 69,224,139, 77, 20,137, 85,216,  3, 91, 28,
+/* 0x02e0 */  85,224,137, 77,212,102,131,120, 16,  2, 15,183, 74, 44,137, 93,
-/* 0x02f0 */ 139, 85,224,137, 77,212,102,131,120, 16,  2, 15,183, 74, 44,137,
+/* 0x02f0 */ 208, 15,148,192,131,206,255, 15,182,192,137,202,193,224,  4, 49,
-/* 0x0300 */  93,208, 15,148,192,131,206,255, 15,182,192,137,202,193,224,  4,
+/* 0x0300 */ 255,131,192, 34, 74,120, 28,131, 59,  1,117, 18,139, 83,  8, 57,
-/* 0x0310 */  49,255,131,192, 34, 74,120, 28,131, 59,  1,117, 18,139, 83,  8,
+/* 0x0310 */ 242,115,  2,137,214,  3, 83, 20, 57,215,115,  2,137,215,131,195,
-/* 0x0320 */  57,242,115,  2,137,214,  3, 83, 20, 57,215,115,  2,137,215,131,
+/* 0x0320 */  32,226,228,129,230,  0,240,255,255, 41,247,137,242,141,159,255,
-/* 0x0330 */ 195, 32,226,228,129,230,  0,240,255,255, 41,247,137,242,141,159,
+/* 0x0330 */  15,  0,  0,129,227,  0,240,255,255,168, 16,117, 19,106,  0,106,
-/* 0x0340 */ 255, 15,  0,  0,129,227,  0,240,255,255,168, 16,117, 19,106,  0,
+/* 0x0340 */ 255, 80,106,  0, 83, 86,232, 56,254,255,255,131,196, 24,137,194,
-/* 0x0350 */ 106,255, 80,106,  0, 83, 86,232, 39,254,255,255,131,196, 24,137,
+/* 0x0350 */ 139, 77,224,141,  4, 26, 41,242,199, 69,200,  0,  0,  0,  0,102,
-/* 0x0360 */ 194,139, 77,224,141,  4, 26, 41,242,199, 69,200,  0,  0,  0,  0,
+/* 0x0360 */ 131,121, 44,  0,137, 69,240,137, 85,204, 15,132,221,  1,  0,  0,
-/* 0x0370 */ 102,131,121, 44,  0,137, 69,240,137, 85,204, 15,132,221,  1,  0,
+/* 0x0370 */ 131,125,220,  0,116, 32,139, 93,208,131, 59,  6,117, 24,139, 77,
-/* 0x0380 */   0,131,125,220,  0,116, 32,139, 93,208,131, 59,  6,117, 24,139,
+/* 0x0380 */ 204,186,  3,  0,  0,  0,  3, 75,  8,139, 69,216,232, 12,255,255,
-/* 0x0390 */  77,204,186,  3,  0,  0,  0,  3, 75,  8,139, 69,216,232,251,254,
+/* 0x0390 */ 255,233,160,  1,  0,  0,139, 69,208,131, 56,  1, 15,133,148,  1,
-/* 0x03a0 */ 255,255,233,160,  1,  0,  0,139, 69,208,131, 56,  1, 15,133,148,
+/* 0x03a0 */   0,  0,139, 72, 24,199, 69,196, 64, 98, 81,115,139, 85,208,131,
-/* 0x03b0 */   1,  0,  0,139, 72, 24,199, 69,196, 64, 98, 81,115,139, 85,208,
+/* 0x03b0 */ 225,  7,193,225,  2,139, 90, 20,211,109,196,139, 72, 16,139, 69,
-/* 0x03c0 */ 131,225,  7,193,225,  2,139, 90, 20,211,109,196,139, 72, 16,139,
+/* 0x03c0 */ 204,  3, 66,  8,137, 77,232,131,101,196,  7,137,194,  1,195,129,
-/* 0x03d0 */  69,204,  3, 66,  8,137, 77,232,131,101,196,  7,137,194,  1,195,
+/* 0x03d0 */ 226,255, 15,  0,  0,137,199,141, 52, 17,139, 77,208,137, 69,236,
-/* 0x03e0 */ 129,226,255, 15,  0,  0,137,199,141, 52, 17,139, 77,208,137, 69,
+/* 0x03e0 */  41,215,139, 65,  4,137, 93,192, 41,208,131,125,220,  0, 80,139,
-/* 0x03f0 */ 236, 41,215,139, 65,  4,137, 93,192, 41,208,131,125,220,  0, 80,
+/* 0x03f0 */  69,228,116,  3,131,200,255,131,125,220,  1, 80, 25,192,131,224,
-/* 0x0400 */ 139, 69,228,116,  3,131,200,255,131,125,220,  1, 80, 25,192,131,
+/* 0x0400 */ 224,131,192, 50,131,125,220,  0, 80,139, 69,196,116,  3,131,200,
-/* 0x0410 */ 224,224,131,192, 50,131,125,220,  0, 80,139, 69,196,116,  3,131,
+/* 0x0410 */   2,131,125,220,  0, 80,137,240,116,  3,141, 70,  3, 80, 87,232,
-/* 0x0420 */ 200,  2,131,125,220,  0, 80,137,240,116,  3,141, 70,  3, 80, 87,
+/* 0x0420 */  95,253,255,255,131,196, 24, 57,199, 15,133,184,  0,  0,  0,131,
-/* 0x0430 */ 232, 78,253,255,255,131,196, 24, 57,199, 15,133,184,  0,  0,  0,
+/* 0x0430 */ 125,220,  0,116, 28,246, 69,196,  4,139, 69,212,117,  2, 49,192,
-/* 0x0440 */ 131,125,220,  0,116, 28,246, 69,196,  4,139, 69,212,117,  2, 49,
+/* 0x0440 */  80,139, 69,220,255,117,228,141, 85,232,232,110,253,255,255, 88,
-/* 0x0450 */ 192, 80,139, 69,220,255,117,228,141, 85,232,232, 93,253,255,255,
+/* 0x0450 */  90,137,243,247,219,129,227,255, 15,  0,  0,246, 69,196,  2,137,
-/* 0x0460 */  88, 90,137,243,247,219,129,227,255, 15,  0,  0,246, 69,196,  2,
+/* 0x0460 */  93,188,116, 15,133,219,141,  4, 55,116,  8,137,217,198,  0,  0,
-/* 0x0470 */ 137, 93,188,116, 15,133,219,141,  4, 55,116,  8,137,217,198,  0,
+/* 0x0470 */  64,226,250,131,125,220,  0,116,120,139, 69,208,131, 56,  1,117,
-/* 0x0480 */   0, 64,226,250,131,125,220,  0,116,120,139, 69,208,131, 56,  1,
+/* 0x0480 */  86,246, 64, 24,  1,116, 80,139, 80, 20,139, 88,  8,141, 12, 26,
-/* 0x0490 */ 117, 86,246, 64, 24,  1,116, 80,139, 80, 20,139, 88,  8,141, 12,
+/* 0x0490 */   3, 77,204, 59, 80, 16,117, 14,137,200,247,216, 37,255, 15,  0,
-/* 0x04a0 */  26,  3, 77,204, 59, 80, 16,117, 14,137,200,247,216, 37,255, 15,
+/* 0x04a0 */   0,131,248,  3,119, 17,139, 85,208,107, 69,204, 52,131,122,  4,
-/* 0x04b0 */   0,  0,131,248,  3,119, 17,139, 85,208,107, 69,204, 52,131,122,
+/* 0x04b0 */   0,141, 76,  3, 12,117, 32,139,  1, 61,205,128, 97,195,116,  6,
-/* 0x04c0 */   4,  0,141, 76,  3, 12,117, 32,139,  1, 61,205,128, 97,195,116,
+/* 0x04c0 */ 199,  1,205,128, 97,195,133,201,116, 13,139, 69,216, 49,210,131,
-/* 0x04d0 */   6,199,  1,205,128, 97,195,133,201,116, 13,139, 69,216, 49,210,
+/* 0x04d0 */ 224,254,232,198,253,255,255,137,251,137,241,139, 85,196,106,125,
-/* 0x04e0 */ 131,224,254,232,181,253,255,255,137,251,137,241,139, 85,196,106,
+/* 0x04e0 */  88,205,128,133,192,116, 10,106,127, 91,106,  1, 88,205,128,235,
-/* 0x04f0 */ 125, 88,205,128,133,192,116, 10,106,127, 91,106,  1, 88,205,128,
+/* 0x04f0 */ 254,139, 85,188,141,  4, 22,141, 28,  7, 59, 93,192,115, 30,106,
-/* 0x0500 */ 235,254,139, 85,188,141,  4, 22,141, 28,  7, 59, 93,192,115, 30,
+/* 0x0500 */   0,106,255,106, 50,255,117,196, 41, 93,192,255,117,192, 83,232,
-/* 0x0510 */ 106,  0,106,255,106, 50,255,117,196, 41, 93,192,255,117,192, 83,
+/* 0x0510 */ 111,252,255,255,131,196, 24, 57,195,116, 27,235,202,131,125,220,
-/* 0x0520 */ 232, 94,252,255,255,131,196, 24, 57,195,116, 27,235,202,131,125,
+/* 0x0520 */   0,116, 19,141, 78,  3,129,225,255, 15,  0,  0,131,249,  3,119,
-/* 0x0530 */ 220,  0,116, 19,141, 78,  3,129,225,255, 15,  0,  0,131,249,  3,
+/* 0x0530 */   5,106, 91, 88,205,128,139, 77,224,255, 69,200, 15,183, 65, 44,
-/* 0x0540 */ 119,  5,106, 91, 88,205,128,139, 77,224,255, 69,200, 15,183, 65,
+/* 0x0540 */ 131, 69,208, 32, 57, 69,200, 15,140, 35,254,255,255,131,125,220,
-/* 0x0550 */  44,131, 69,208, 32, 57, 69,200, 15,140, 35,254,255,255,131,125,
+/* 0x0550 */   0,116, 18,139, 93,224,102,131,123, 16,  3,116,  8,139, 93,240,
-/* 0x0560 */ 220,  0,116, 18,139, 93,224,102,131,123, 16,  3,116,  8,139, 93,
+/* 0x0560 */ 106, 45, 88,205,128,131,125, 16,  0,116,  8,139, 85,204,139, 69,
-/* 0x0570 */ 240,106, 45, 88,205,128,131,125, 16,  0,116,  8,139, 85,204,139,
+/* 0x0570 */  16,137, 16,139, 77,224,139, 73, 24,  1, 77,204,139, 69,204,141,
-/* 0x0580 */  69, 16,137, 16,139, 77,224,139, 73, 24,  1, 77,204,139, 69,204,
+/* 0x0580 */ 101,244, 91, 94, 95,201,195, 85,137,229, 87, 86, 83,131,236, 32,
-/* 0x0590 */ 141,101,244, 91, 94, 95,201,195, 85,137,229, 87, 86, 83,131,236,
+/* 0x0590 */ 139,125, 28,106,  0,139,117, 16,139, 69,  8,141, 87, 52,141, 78,
-/* 0x05a0 */  32,139,125, 28,106,  0,139,117, 16,139, 69,  8,141, 87, 52,141,
+/* 0x05a0 */   2,139, 93, 32,137, 69,236,137, 85,228,141, 69, 32,141, 85, 24,
-/* 0x05b0 */  78,  2,139, 93, 32,137, 69,236,137, 85,228,141, 69, 32,141, 85,
+/* 0x05b0 */  86,137, 77,232,232,  4,252,255,255,139, 69, 12,186,  5,  0,  0,
-/* 0x05c0 */  24, 86,137, 77,232,232,243,251,255,255,139, 69, 12,186,  5,  0,
+/* 0x05c0 */   0, 15,183, 79, 44,137, 69, 32,139, 69,236, 41, 93, 36,232,202,
-/* 0x05d0 */   0,  0, 15,183, 79, 44,137, 69, 32,139, 69,236, 41, 93, 36,232,
+/* 0x05d0 */ 252,255,255, 15,183, 79, 42,139, 69,236,186,  4,  0,  0,  0,232,
-/* 0x05e0 */ 185,252,255,255, 15,183, 79, 42,139, 69,236,186,  4,  0,  0,  0,
+/* 0x05e0 */ 185,252,255,255,139, 93,228,139, 77, 40,186,  3,  0,  0,  0,  3,
-/* 0x05f0 */ 232,168,252,255,255,139, 93,228,139, 77, 40,186,  3,  0,  0,  0,
+/* 0x05f0 */  75,  8,139, 69,236,131,193, 52,232,160,252,255,255,141, 69,240,
-/* 0x0600 */   3, 75,  8,139, 69,236,131,193, 52,232,143,252,255,255,141, 69,
+/* 0x0600 */ 255,117,232,137,250, 80,255,117,236,141, 69, 32, 80,137,240,232,
-/* 0x0610 */ 240,255,117,232,137,250, 80,255,117,236,141, 69, 32, 80,137,240,
+/* 0x0610 */ 164,252,255,255,186,  9,  0,  0,  0,137,193,137, 69,224,139, 69,
-/* 0x0620 */ 232,164,252,255,255,186,  9,  0,  0,  0,137,193,137, 69,224,139,
+/* 0x0620 */ 236,232,119,252,255,255,102,139, 79, 44,131,196, 24, 49,210,102,
-/* 0x0630 */  69,236,232,102,252,255,255,102,139, 79, 44,131,196, 24, 49,210,
+/* 0x0630 */ 133,201,116,126,139, 93,228,131, 59,  3,117,106,139, 69,228, 49,
-/* 0x0640 */ 102,133,201,116,126,139, 93,228,131, 59,  3,117,106,139, 69,228,
+/* 0x0640 */ 201,139, 93,240,137,202,  3, 88,  8,106,  5, 88,205,128,133,192,
-/* 0x0650 */  49,201,139, 93,240,137,202,  3, 88,  8,106,  5, 88,205,128,133,
+/* 0x0650 */ 137,198,120, 21,186,  0,  2,  0,  0,137,195,137,249,106,  3, 88,
-/* 0x0660 */ 192,137,198,120, 21,186,  0,  2,  0,  0,137,195,137,249,106,  3,
+/* 0x0660 */ 205,128, 61,  0,  2,  0,  0,116, 10,106,127, 91,106,  1, 88,205,
-/* 0x0670 */  88,205,128, 61,  0,  2,  0,  0,116, 10,106,127, 91,106,  1, 88,
+/* 0x0670 */ 128,235,254,141, 69,240,137,250,106,  0,137,243, 80,137,240,255,
-/* 0x0680 */ 205,128,235,254,141, 69,240,137,250,106,  0,137,243, 80,137,240,
+/* 0x0680 */ 117,236,106,  0,232, 47,252,255,255,139, 77,240,137, 69,224,139,
-/* 0x0690 */ 255,117,236,106,  0,232, 47,252,255,255,139, 77,240,137, 69,224,
+/* 0x0690 */  69,236,186,  7,  0,  0,  0,232,  1,252,255,255,131,196, 16,106,
-/* 0x06a0 */ 139, 69,236,186,  7,  0,  0,  0,232,240,251,255,255,131,196, 16,
+/* 0x06a0 */   6, 88,205,128,235, 12, 66, 15,183,193,131, 69,228, 32, 57,194,
-/* 0x06b0 */ 106,  6, 88,205,128,235, 12, 66, 15,183,193,131, 69,228, 32, 57,
+/* 0x06b0 */ 124,130,139, 69,224,141,101,244, 91, 94, 95,201,195
-/* 0x06c0 */ 194,124,130,139, 69,224,141,101,244, 91, 94, 95,201,195
 };

src/stub/i386-openbsd.elf-fold.h

@@ -1,5 +1,5 @@
 /* i386-openbsd.elf-fold.h
-   created from i386-openbsd.elf-fold.bin, 2025 (0x7e9) bytes
+   created from i386-openbsd.elf-fold.bin, 2033 (0x7f1) bytes
 
    This file is part of the UPX executable compressor.
 
@@ -31,136 +31,137 @@
  */
 
 
-#define STUB_I386_OPENBSD_ELF_FOLD_SIZE    2025
+#define STUB_I386_OPENBSD_ELF_FOLD_SIZE    2033
-#define STUB_I386_OPENBSD_ELF_FOLD_ADLER32 0x4a4c5f0f
+#define STUB_I386_OPENBSD_ELF_FOLD_ADLER32 0x94526218
-#define STUB_I386_OPENBSD_ELF_FOLD_CRC32   0x8b78113b
+#define STUB_I386_OPENBSD_ELF_FOLD_CRC32   0xf97a3786
 
-unsigned char stub_i386_openbsd_elf_fold[2025] = {
+unsigned char stub_i386_openbsd_elf_fold[2033] = {
 /* 0x0000 */ 127, 69, 76, 70,  1,  1,  1, 12,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0010 */   2,  0,  3,  0,  1,  0,  0,  0,128, 16,192,  0, 52,  0,  0,  0,
 /* 0x0020 */   0,  0,  0,  0,  0,  0,  0,  0, 52,  0, 32,  0,  2,  0,  0,  0,
 /* 0x0030 */   0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0, 16,192,  0,
-/* 0x0040 */   0, 16,192,  0,233,  7,  0,  0,236,  7,  0,  0,  5,  0,  0,  0,
+/* 0x0040 */   0, 16,192,  0,241,  7,  0,  0,244,  7,  0,  0,  5,  0,  0,  0,
-/* 0x0050 */   0, 16,  0,  0,  1,  0,  0,  0,233,  7,  0,  0,  0,  0,  0,  0,
+/* 0x0050 */   0, 16,  0,  0,  1,  0,  0,  0,241,  7,  0,  0,  0,  0,  0,  0,
 /* 0x0060 */   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0070 */   0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-/* 0x0080 */  41,201,186,248,  2,  0,  0,137,230,137,231,232,131,  0,  0,  0,
+/* 0x0080 */  41,201,186,248,  2,  0,  0,137,230,137,231,232,137,  0,  0,  0,
 /* 0x0090 */ 137,230,209,234, 25,192, 41,193,141, 36,196,133,210,117,243,137,
-/* 0x00a0 */ 231,232,109,  0,  0,  0,129,236,  0, 10,  0,  0, 83,139, 83, 72,
+/* 0x00a0 */ 231,232,115,  0,  0,  0,129,236,  0, 10,  0,  0, 83,139, 83, 72,
 /* 0x00b0 */ 141,148, 26,255, 31,  0,  0,129,226,  0,240,255,255, 82, 41,192,
 /* 0x00c0 */ 102,131,123, 16,  3,117,  1,146, 80,139,115, 24,141,131,196,  0,
 /* 0x00d0 */   0,  0, 41,198,139, 24,139, 72,  4,131,193, 12,141, 84, 36, 12,
-/* 0x00e0 */  96, 71,232, 68,  5,  0,  0,131,196, 36, 89, 91,129,196,  0, 10,
+/* 0x00e0 */  96, 71,232, 76,  5,  0,  0,131,196, 36, 89, 91,129,196,  0, 10,
-/* 0x00f0 */   0,  0, 80,106,  0,137,229, 41,217, 41,192, 81, 83, 80, 79, 60,
+/* 0x00f0 */   0,  0, 90,193,226, 12,  1,211, 80,106,  0,137,229, 41,217, 41,
-/* 0x0100 */ 175,175,117,252,255, 55, 49,255, 49,246, 49,210, 49,201, 49,219,
+/* 0x0100 */ 192, 81, 83, 80, 79, 60,175,175,117,252,255, 55, 49,255, 49,246,
-/* 0x0110 */ 176, 73,195,173,171,173,171,133,192,117,250,173,171,133,192,117,
+/* 0x0110 */  49,210, 49,201, 49,219,176, 73,195,173,171,173,171,133,192,117,
-/* 0x0120 */ 250, 87,173,171,131,248, 32,115,  3, 15,179,194,133,192,173,171,
+/* 0x0120 */ 250,173,171,133,192,117,250, 87,173,171,131,248, 32,115,  3, 15,
-/* 0x0130 */ 117,240,131,239,  8,  1,201, 64,243,171, 72,171,171, 95,195,  0,
+/* 0x0130 */ 179,194,133,192,173,171,117,240,131,239,  8,  1,201, 64,243,171,
-/* 0x0140 */  85,137,229, 87, 86,137,206, 83,137,195, 57,  8,139,120,  4,115,
+/* 0x0140 */  72,171,171, 95,195,  0,  0,  0, 85,137,229, 87, 86,137,206, 83,
-/* 0x0150 */   7,106,127,232, 73,  6,  0,  0,133,201,116,  8,138,  7, 71,136,
+/* 0x0150 */ 137,195, 57,  8,139,120,  4,115,  7,106,127,232, 73,  6,  0,  0,
-/* 0x0160 */   2, 66,226,248,  1,115,  4, 41, 51,141,101,244, 91, 94, 95,201,
+/* 0x0160 */ 133,201,116,  8,138,  7, 71,136,  2, 66,226,248,  1,115,  4, 41,
-/* 0x0170 */ 195, 85,137,229, 87, 86,137,198, 83,137,211,131,236, 24,139, 69,
+/* 0x0170 */  51,141,101,244, 91, 94, 95,201,195, 85,137,229, 87, 86,137,198,
-/* 0x0180 */   8,139,125, 12,137, 69,220,131, 58,  0, 15,132,182,  0,  0,  0,
+/* 0x0180 */  83,137,211,131,236, 24,139, 69,  8,139,125, 12,137, 69,220,131,
-/* 0x0190 */ 141, 85,228,185, 12,  0,  0,  0,137,240,232,161,255,255,255,139,
+/* 0x0190 */  58,  0, 15,132,182,  0,  0,  0,141, 85,228,185, 12,  0,  0,  0,
-/* 0x01a0 */  69,228,139, 77,232,133,192,117, 19,129,249, 85, 80, 88, 33,117,
+/* 0x01a0 */ 137,240,232,161,255,255,255,139, 69,228,139, 77,232,133,192,117,
-/* 0x01b0 */  15,131, 62,  0, 15,132,140,  0,  0,  0,235,  4,133,201,117,  7,
+/* 0x01b0 */  19,129,249, 85, 80, 88, 33,117, 15,131, 62,  0, 15,132,140,  0,
-/* 0x01c0 */ 106,127,232,218,  5,  0,  0, 57,193,119,245, 59,  3,119,241, 57,
+/* 0x01c0 */   0,  0,235,  4,133,201,117,  7,106,127,232,218,  5,  0,  0, 57,
-/* 0x01d0 */ 193,115, 86,137, 69,224,141, 69,224,255,117,236, 80,255,115,  4,
+/* 0x01d0 */ 193,119,245, 59,  3,119,241, 57,193,115, 86,137, 69,224,141, 69,
-/* 0x01e0 */  81,255,118,  4,255, 85,220,131,196, 20,133,192,117,210,139, 85,
+/* 0x01e0 */ 224,255,117,236, 80,255,115,  4, 81,255,118,  4,255, 85,220,131,
-/* 0x01f0 */ 224, 59, 85,228,117,202,138, 69,237,132,192,116, 34,133,255,116,
+/* 0x01f0 */ 196, 20,133,192,117,210,139, 85,224, 59, 85,228,117,202,138, 69,
-/* 0x0200 */  30,129,250,  0,  2,  0,  0,119,  4, 57, 19,117, 18, 15,182,192,
+/* 0x0200 */ 237,132,192,116, 34,133,255,116, 30,129,250,  0,  2,  0,  0,119,
-/* 0x0210 */  80, 15,182, 69,238, 80, 82,255,115,  4,255,215,131,196, 16,139,
+/* 0x0210 */   4, 57, 19,117, 18, 15,182,192, 80, 15,182, 69,238, 80, 82,255,
-/* 0x0220 */  69,232,  1, 70,  4, 41,  6,235, 10,139, 83,  4,137,240,232, 13,
+/* 0x0220 */ 115,  4,255,215,131,196, 16,139, 69,232,  1, 70,  4, 41,  6,235,
-/* 0x0230 */ 255,255,255,139, 85,228,139,  3,  1, 83,  4, 41,208,133,192,137,
+/* 0x0230 */  10,139, 83,  4,137,240,232, 13,255,255,255,139, 85,228,139,  3,
-/* 0x0240 */   3,233, 68,255,255,255,141,101,244, 91, 94, 95,201,195,133,192,
+/* 0x0240 */   1, 83,  4, 41,208,133,192,137,  3,233, 68,255,255,255,141,101,
-/* 0x0250 */  83,137,211,116, 29,168,  1,117, 25,139, 16, 57,218,116,  7, 74,
+/* 0x0250 */ 244, 91, 94, 95,201,195,133,192, 83,137,211,116, 29,168,  1,117,
-/* 0x0260 */ 117, 11,133,219,116,  7,137, 24,137, 72,  4,235,  5,131,192,  8,
+/* 0x0260 */  25,139, 16, 57,218,116,  7, 74,117, 11,133,219,116,  7,137, 24,
-/* 0x0270 */ 235,231, 91,195, 85,137,229, 87, 86, 83,131,236,104,137, 69,200,
+/* 0x0270 */ 137, 72,  4,235,  5,131,192,  8,235,231, 91,195, 85,137,229, 87,
-/* 0x0280 */ 139, 69, 12,137, 85,196,139, 77, 24,199, 69,228,  0,  0,  0,  0,
+/* 0x0280 */  86, 83,131,236,104,137, 69,200,139, 69, 12,137, 85,196,139, 77,
-/* 0x0290 */ 137, 69,192,139, 69,196,137, 77,184,139, 93,196,139,117,196,199,
+/* 0x0290 */  24,199, 69,228,  0,  0,  0,  0,137, 69,192,139, 69,196,137, 77,
-/* 0x02a0 */  69,232,  0,  0,  0,  0, 15,183, 72, 44,199, 69,220,  0,  0,  0,
+/* 0x02a0 */ 184,139, 93,196,139,117,196,199, 69,232,  0,  0,  0,  0, 15,183,
-/* 0x02b0 */   0,139, 85, 16,199, 69,224,  0,  0,  0,  0,  3, 91, 28,199, 69,
+/* 0x02b0 */  72, 44,199, 69,220,  0,  0,  0,  0,139, 85, 16,199, 69,224,  0,
-/* 0x02c0 */ 236,255,255,255,255, 15,183,118, 16,137, 85,188,137,202,199, 69,
+/* 0x02c0 */   0,  0,  0,  3, 91, 28,199, 69,236,255,255,255,255, 15,183,118,
-/* 0x02d0 */ 240,255,255,255,255, 74,137, 93,180,137,117,176,199, 69,148,  0,
+/* 0x02d0 */  16,137, 85,188,137,202,199, 69,240,255,255,255,255, 74,137, 93,
-/* 0x02e0 */   0,  0,  0,120, 62,137,206,131, 59,  1,117, 49,139, 67, 24,139,
+/* 0x02e0 */ 180,137,117,176,199, 69,148,  0,  0,  0,  0,120, 62,137,206,131,
-/* 0x02f0 */  75,  8,131,224,  1,141, 20,133,  0,  0,  0,  0, 57, 76, 42,236,
+/* 0x02f0 */  59,  1,117, 49,139, 67, 24,139, 75,  8,131,224,  1,141, 20,133,
-/* 0x0300 */ 118, 11,139, 67, 16,137, 76, 42,236,137, 68, 21,228,139, 67, 20,
+/* 0x0300 */   0,  0,  0,  0, 57, 76, 42,236,118, 11,139, 67, 16,137, 76, 42,
-/* 0x0310 */ 141,125,220,  1,200, 57,  4, 58,115,  3,137,  4, 58,131,195, 32,
+/* 0x0310 */ 236,137, 68, 21,228,139, 67, 20,141,125,220,  1,200, 57,  4, 58,
-/* 0x0320 */  78,117,196,131,125,176,  2,116, 63,129,125,220,255,255,255, 31,
+/* 0x0320 */ 115,  3,137,  4, 58,131,195, 32, 78,117,196,131,125,176,  2,116,
-/* 0x0330 */ 118, 54,139, 77,  8,139, 93,  8,139, 65,  4,137,194,137,193,139,
+/* 0x0330 */  63,129,125,220,255,255,255, 31,118, 54,139, 77,  8,139, 93,  8,
-/* 0x0340 */   3,129,225,255,255,255,  3,129,226,  0,  0,  0,252, 37,255,255,
+/* 0x0340 */ 139, 65,  4,137,194,137,193,139,  3,129,225,255,255,255,  3,129,
-/* 0x0350 */ 255,  3, 57,193,118,  2,137,200,141,148,  2,255, 15,  0,  0,129,
+/* 0x0350 */ 226,  0,  0,  0,252, 37,255,255,255,  3, 57,193,118,  2,137,200,
-/* 0x0360 */ 226,  0,240,255,255,137, 85,148,139,117,  8, 49,255,199, 69,144,
+/* 0x0360 */ 141,148,  2,255, 15,  0,  0,129,226,  0,240,255,255,137, 85,148,
-/* 0x0370 */   1,  0,  0,  0,137,117,152,141, 69,236,139, 85,148,139,117,152,
+/* 0x0370 */ 139,117,  8, 49,255,199, 69,144,  1,  0,  0,  0,137,117,152,141,
-/* 0x0380 */ 139, 28,  7,137,217,129,227,  0,240,255,255,129,225,255, 15,  0,
+/* 0x0380 */  69,236,139, 85,148,139,117,152,139, 28,  7,137,217,129,227,  0,
-/* 0x0390 */   0,  3, 76, 47,228,137, 28,  7,139, 68, 47,220,  1,194, 41,216,
+/* 0x0390 */ 240,255,255,129,225,255, 15,  0,  0,  3, 76, 47,228,137, 28,  7,
-/* 0x03a0 */ 137, 22,  3, 93,148,106,  0,  5,255, 15,  0,  0,106,255, 37,  0,
+/* 0x03a0 */ 139, 68, 47,220,  1,194, 41,216,137, 22,  3, 93,148,106,  0,  5,
-/* 0x03b0 */ 240,255,255,104, 18, 16,  0,  0,129,193,255, 15,  0,  0,106,  0,
+/* 0x03b0 */ 255, 15,  0,  0,106,255, 37,  0,240,255,255,104, 18, 16,  0,  0,
-/* 0x03c0 */ 129,225,  0,240,255,255, 80,131,198,  4, 83,137, 68, 47,220,137,
+/* 0x03c0 */ 129,193,255, 15,  0,  0,106,  0,129,225,  0,240,255,255, 80,131,
-/* 0x03d0 */  76, 47,228,232,164,  3,  0,  0,137, 68, 61,212,131,196, 24,131,
+/* 0x03d0 */ 198,  4, 83,137, 68, 47,220,137, 76, 47,228,232,164,  3,  0,  0,
-/* 0x03e0 */ 199,  4,255, 77,144,137,117,152,121,141,139, 69,212,199, 69,168,
+/* 0x03e0 */ 137, 68, 61,212,131,196, 24,131,199,  4,255, 77,144,137,117,152,
-/* 0x03f0 */   0,  0,  0,  0,139, 85,236,139, 77,196, 41,208,102,131,121, 44,
+/* 0x03f0 */ 121,141,139, 69,212,199, 69,168,  0,  0,  0,  0,139, 85,236,139,
-/* 0x0400 */   0,137, 69,172, 15,132,236,  1,  0,  0,139, 93,180,139,  3,131,
+/* 0x0400 */  77,196, 41,208,102,131,121, 44,  0,137, 69,172, 15,132,236,  1,
-/* 0x0410 */ 248,  6,117, 34,131,125,192,  0, 15,132,193,  1,  0,  0,139, 77,
+/* 0x0410 */   0,  0,139, 93,180,139,  3,131,248,  6,117, 34,131,125,192,  0,
-/* 0x0420 */ 172,186,  3,  0,  0,  0,  3, 75,  8,139, 69,188,232, 29,254,255,
+/* 0x0420 */  15,132,193,  1,  0,  0,139, 77,172,186,  3,  0,  0,  0,  3, 75,
-/* 0x0430 */ 255,233,169,  1,  0,  0, 72, 15,133,162,  1,  0,  0,139,117,180,
+/* 0x0430 */   8,139, 69,188,232, 29,254,255,255,233,169,  1,  0,  0, 72, 15,
-/* 0x0440 */ 199, 69,164, 64, 98, 81,115,139, 69,172,  3, 70,  8,139, 78, 24,
+/* 0x0440 */ 133,162,  1,  0,  0,139,117,180,199, 69,164, 64, 98, 81,115,139,
-/* 0x0450 */ 139, 86, 20,131,225,  7,137, 69,208,  1,194,193,225,  2,211,109,
+/* 0x0450 */  69,172,  3, 70,  8,139, 78, 24,139, 86, 20,131,225,  7,137, 69,
-/* 0x0460 */ 164,137, 85,156,139, 78, 16,137,194,131,101,164,  7,129,226,255,
+/* 0x0460 */ 208,  1,194,193,225,  2,211,109,164,137, 85,156,139, 78, 16,137,
-/* 0x0470 */  15,  0,  0,137, 77,204,141, 52, 17,139, 77,180, 41,208,137, 69,
+/* 0x0470 */ 194,131,101,164,  7,129,226,255, 15,  0,  0,137, 77,204,141, 52,
-/* 0x0480 */ 160,139, 65,  4, 41,208,131,125,192,  0, 80,139, 69,200,116,  3,
+/* 0x0480 */  17,139, 77,180, 41,208,137, 69,160,139, 65,  4, 41,208,131,125,
-/* 0x0490 */ 131,200,255,131,125,192,  1, 80, 25,192, 37,  0,240,255,255,  5,
+/* 0x0490 */ 192,  0, 80,139, 69,200,116,  3,131,200,255,131,125,192,  1, 80,
-/* 0x04a0 */  18, 16,  0,  0,131,125,192,  0, 80,139, 69,164,116,  3,131,200,
+/* 0x04a0 */  25,192, 37,  0,240,255,255,  5, 18, 16,  0,  0,131,125,192,  0,
-/* 0x04b0 */   2,131,125,192,  0, 80,137,240,116,  3,141, 70,  3, 80,255,117,
+/* 0x04b0 */  80,139, 69,164,116,  3,131,200,  2,131,125,192,  0, 80,137,240,
-/* 0x04c0 */ 160,232,182,  2,  0,  0,131,196, 24, 57, 69,160, 15,133,188,  0,
+/* 0x04c0 */ 116,  3,141, 70,  3, 80,255,117,160,232,182,  2,  0,  0,131,196,
-/* 0x04d0 */   0,  0,131,125,192,  0,116, 28,246, 69,164,  4,139, 69,184,117,
+/* 0x04d0 */  24, 57, 69,160, 15,133,188,  0,  0,  0,131,125,192,  0,116, 28,
-/* 0x04e0 */   2, 49,192, 80,139, 69,192,255,117,200,141, 85,204,232,127,252,
+/* 0x04e0 */ 246, 69,164,  4,139, 69,184,117,  2, 49,192, 80,139, 69,192,255,
-/* 0x04f0 */ 255,255, 95, 88,137,247,247,223,129,231,255, 15,  0,  0,246, 69,
+/* 0x04f0 */ 117,200,141, 85,204,232,127,252,255,255, 95, 88,137,247,247,223,
-/* 0x0500 */ 164,  2,116, 17,139, 69,160,  1,240,133,255,116,  8,137,249,198,
+/* 0x0500 */ 129,231,255, 15,  0,  0,246, 69,164,  2,116, 17,139, 69,160,  1,
-/* 0x0510 */   0,  0, 64,226,250,131,125,192,  0,116,122,139, 93,180,131, 59,
+/* 0x0510 */ 240,133,255,116,  8,137,249,198,  0,  0, 64,226,250,131,125,192,
-/* 0x0520 */   1,117, 88,246, 67, 24,  1,116, 82,139, 83, 20,137,216,139, 91,
+/* 0x0520 */   0,116,122,139, 93,180,131, 59,  1,117, 88,246, 67, 24,  1,116,
-/* 0x0530 */   8,141, 12, 26,  3, 77,172, 59, 80, 16,117, 14,137,200,247,216,
+/* 0x0530 */  82,139, 83, 20,137,216,139, 91,  8,141, 12, 26,  3, 77,172, 59,
-/* 0x0540 */  37,255, 15,  0,  0,131,248,  3,119, 17,139, 85,180,107, 69,172,
+/* 0x0540 */  80, 16,117, 14,137,200,247,216, 37,255, 15,  0,  0,131,248,  3,
-/* 0x0550 */  52,131,122,  4,  0,141, 76,  3, 12,117, 15,139,  1, 61,205,128,
+/* 0x0550 */ 119, 17,139, 85,180,107, 69,172, 52,131,122,  4,  0,141, 76,  3,
-/* 0x0560 */ 201,195,116,  6,199,  1,205,128,201,195,133,201,116, 13,139, 69,
+/* 0x0560 */  12,117, 15,139,  1, 61,205,128,201,195,116,  6,199,  1,205,128,
-/* 0x0570 */ 188, 49,210,131,224,254,232,211,252,255,255,255,117,164, 86,255,
+/* 0x0570 */ 201,195,133,201,116, 13,139, 69,188, 49,210,131,224,254,232,211,
-/* 0x0580 */ 117,160,232, 54,  2,  0,  0,131,196, 12,133,192,116,  7,106,127,
+/* 0x0580 */ 252,255,255,255,117,164, 86,255,117,160,232, 54,  2,  0,  0,131,
-/* 0x0590 */ 232, 12,  2,  0,  0,141,  4, 62,139, 93,160,  1,195, 59, 93,156,
+/* 0x0590 */ 196, 12,133,192,116,  7,106,127,232, 12,  2,  0,  0,141,  4, 62,
-/* 0x05a0 */ 115, 33,106,  0,106,255,104, 18, 16,  0,  0,255,117,164, 41, 93,
+/* 0x05a0 */ 139, 93,160,  1,195, 59, 93,156,115, 33,106,  0,106,255,104, 18,
-/* 0x05b0 */ 156,255,117,156, 83,232,194,  1,  0,  0,131,196, 24, 57,195,116,
+/* 0x05b0 */  16,  0,  0,255,117,164, 41, 93,156,255,117,156, 83,232,194,  1,
-/* 0x05c0 */  30,235,203,131,125,192,  0,116, 22,141, 70,  3, 37,255, 15,  0,
+/* 0x05c0 */   0,  0,131,196, 24, 57,195,116, 30,235,203,131,125,192,  0,116,
-/* 0x05d0 */   0,131,248,  3,119,  9, 80, 83,232,220,  1,  0,  0, 89, 91,139,
+/* 0x05d0 */  22,141, 70,  3, 37,255, 15,  0,  0,131,248,  3,119,  9, 80, 83,
-/* 0x05e0 */  77,196,255, 69,168, 15,183, 65, 44,131, 69,180, 32, 57, 69,168,
+/* 0x05e0 */ 232,220,  1,  0,  0, 89, 91,139, 77,196,255, 69,168, 15,183, 65,
-/* 0x05f0 */  15,140, 20,254,255,255,131,125,192,  0,117, 13,255,117,200,232,
+/* 0x05f0 */  44,131, 69,180, 32, 57, 69,168, 15,140, 20,254,255,255,131,125,
-/* 0x0600 */ 177,  1,  0,  0, 90,133,192,117,133,131,125, 20,  0,116,  8,139,
+/* 0x0600 */ 192,  0,117, 13,255,117,200,232,177,  1,  0,  0, 90,133,192,117,
-/* 0x0610 */ 117,172,139, 93, 20,137, 51,139, 69,196,139, 64, 24,  1, 69,172,
+/* 0x0610 */ 133,131,125, 20,  0,116,  8,139,117,172,139, 93, 20,137, 51,139,
-/* 0x0620 */ 139, 69,172,141,101,244, 91, 94, 95,201,195, 85,137,229, 87, 86,
+/* 0x0620 */  69,196,139, 64, 24,  1, 69,172,139, 69,172,141,101,244, 91, 94,
-/* 0x0630 */  83,131,236, 24,141, 85, 24,139, 69,  8,106,  0,139,125, 28,199,
+/* 0x0630 */  95,201,195, 85,137,229, 87, 86, 83,131,236, 24,141, 85, 24,139,
-/* 0x0640 */  69,232,  0,  0,  0,  0,137, 69,228,139, 69, 16,139, 93, 32,199,
+/* 0x0640 */  69,  8,106,  0,139,125, 28,199, 69,232,  0,  0,  0,  0,137, 69,
-/* 0x0650 */  69,236,  0,  0,  0,  0,137, 69,224,131,192,  2,255,117,224,137,
+/* 0x0650 */ 228,139, 69, 16,139, 93, 32,199, 69,236,  0,  0,  0,  0,137, 69,
-/* 0x0660 */  69,220,141, 69, 32,141,119, 52,232,  4,251,255,255,139, 69, 12,
+/* 0x0660 */ 224,131,192,  2,255,117,224,137, 69,220,141, 69, 32,141,119, 52,
-/* 0x0670 */ 185,  0, 16,  0,  0,186,  6,  0,  0,  0,137, 69, 32,139, 69,228,
+/* 0x0670 */ 232,  4,251,255,255,139, 69, 12,185,  0, 16,  0,  0,186,  6,  0,
-/* 0x0680 */  41, 93, 36,232,198,251,255,255, 15,183, 79, 44,139, 69,228,186,
+/* 0x0680 */   0,  0,137, 69, 32,139, 69,228, 41, 93, 36,232,198,251,255,255,
-/* 0x0690 */   5,  0,  0,  0,232,181,251,255,255, 15,183, 79, 42,139, 69,228,
+/* 0x0690 */  15,183, 79, 44,139, 69,228,186,  5,  0,  0,  0,232,181,251,255,
-/* 0x06a0 */ 186,  4,  0,  0,  0,232,164,251,255,255,139, 77, 40,  3, 78,  8,
+/* 0x06a0 */ 255, 15,183, 79, 42,139, 69,228,186,  4,  0,  0,  0,232,164,251,
-/* 0x06b0 */ 186,  3,  0,  0,  0,139, 69,228,131,193, 52,232,142,251,255,255,
+/* 0x06b0 */ 255,255,139, 77, 40,  3, 78,  8,186,  3,  0,  0,  0,139, 69,228,
-/* 0x06c0 */ 141, 69,240,255,117,220,137,250, 80,141, 69, 32,255,117,228, 80,
+/* 0x06c0 */ 131,193, 52,232,142,251,255,255,141, 69,240,255,117,220,137,250,
-/* 0x06d0 */ 141, 69,232, 80,139, 69,224,232,152,251,255,255,186,  9,  0,  0,
+/* 0x06d0 */  80,141, 69, 32,255,117,228, 80,141, 69,232, 80,139, 69,224,232,
-/* 0x06e0 */   0,137,193,137,195,139, 69,228,232, 97,251,255,255,102,139, 79,
+/* 0x06e0 */ 152,251,255,255,186,  9,  0,  0,  0,137,193,137,195,139, 69,228,
-/* 0x06f0 */  44,131,196, 28, 49,210,102,133,201,116,116,131, 62,  3,117,100,
+/* 0x06f0 */ 232, 97,251,255,255,102,139, 79, 44,131,196, 28, 49,210,102,133,
-/* 0x0700 */ 106,  0,139, 69,240,106,  0,  3, 70,  8, 80,232,161,  0,  0,  0,
+/* 0x0700 */ 201,116,116,131, 62,  3,117,100,106,  0,139, 69,240,106,  0,  3,
-/* 0x0710 */ 131,196, 12,133,192,137,195,120, 22,104,  0,  2,  0,  0, 87, 80,
+/* 0x0710 */  70,  8, 80,232,161,  0,  0,  0,131,196, 12,133,192,137,195,120,
-/* 0x0720 */ 232,132,  0,  0,  0,131,196, 12, 61,  0,  2,  0,  0,116,  7,106,
+/* 0x0720 */  22,104,  0,  2,  0,  0, 87, 80,232,132,  0,  0,  0,131,196, 12,
-/* 0x0730 */ 127,232,107,  0,  0,  0,141, 69,240,137,250,106,  0, 80,106,  0,
+/* 0x0730 */  61,  0,  2,  0,  0,116,  7,106,127,232,107,  0,  0,  0,141, 69,
-/* 0x0740 */ 141, 69,232,106,  0, 80,137,216,232, 39,251,255,255,139, 77,240,
+/* 0x0740 */ 240,137,250,106,  0, 80,106,  0,141, 69,232,106,  0, 80,137,216,
-/* 0x0750 */ 137,195,139, 69,228,186,  7,  0,  0,  0,232,239,250,255,255,131,
+/* 0x0750 */ 232, 39,251,255,255,139, 77,240,137,195,139, 69,228,186,  7,  0,
-/* 0x0760 */ 196, 20,235, 11, 66, 15,183,193,131,198, 32, 57,194,124,140,141,
+/* 0x0760 */   0,  0,232,239,250,255,255,131,196, 20,235, 11, 66, 15,183,193,
-/* 0x0770 */ 101,244,137,216, 91, 94, 95,201,195,  0,  0,  0, 85,137,229, 49,
+/* 0x0770 */ 131,198, 32, 57,194,124,140,141,101,244,137,216, 91, 94, 95,201,
-/* 0x0780 */ 192, 80,255,117, 28, 80,255,117, 24,255,117, 20,255,117, 16,255,
+/* 0x0780 */ 195,  0,  0,  0, 85,137,229, 49,192, 80,255,117, 28, 80,255,117,
-/* 0x0790 */ 117, 12,255,117,  8, 80,176,197, 80, 80,176,198,205,128,201,195,
+/* 0x0790 */  24,255,117, 20,255,117, 16,255,117, 12,255,117,  8, 80,176,197,
-/* 0x07a0 */ 195,176,  1, 15,182,192,205,128,195,176,  3,235,246,176,  4,235,
+/* 0x07a0 */  80, 80,176,198,205,128,201,195,195,176,  1, 15,182,192,205,128,
-/* 0x07b0 */ 242,176,  5,235,238,176,  6,235,234,176, 73,235,230,176, 74,235,
+/* 0x07b0 */ 195,176,  3,235,246,176,  4,235,242,176,  5,235,238,176,  6,235,
-/* 0x07c0 */ 226,176, 33,235,222,176, 20,235,218,176, 92,235,214,176, 59,235,
+/* 0x07c0 */ 234,176, 73,235,230,176, 74,235,226,176, 33,235,222,176, 20,235,
-/* 0x07d0 */ 210,176,  2,235,206,176,130,235,202,176,116,235,198,176,240,235,
+/* 0x07d0 */ 218,176, 92,235,214,176, 59,235,210,176,  2,235,206,176,130,235,
-/* 0x07e0 */ 194,176, 10,235,190,176,  7,235,186
+/* 0x07e0 */ 202,176,116,235,198,176,240,235,194,176, 10,235,190,176,  7,235,
+/* 0x07f0 */ 186
 };

src/stub/mips.r3000-linux.elf-fold.h

@@ -1,5 +1,5 @@
 /* mips.r3000-linux.elf-fold.h
-   created from mips.r3000-linux.elf-fold.bin, 2576 (0xa10) bytes
+   created from mips.r3000-linux.elf-fold.bin, 2548 (0x9f4) bytes
 
    This file is part of the UPX executable compressor.
 
@@ -31,17 +31,17 @@
  */
 
 
-#define STUB_MIPS_R3000_LINUX_ELF_FOLD_SIZE    2576
+#define STUB_MIPS_R3000_LINUX_ELF_FOLD_SIZE    2548
-#define STUB_MIPS_R3000_LINUX_ELF_FOLD_ADLER32 0x03b2382e
+#define STUB_MIPS_R3000_LINUX_ELF_FOLD_ADLER32 0xa69934a6
-#define STUB_MIPS_R3000_LINUX_ELF_FOLD_CRC32   0xd27d2885
+#define STUB_MIPS_R3000_LINUX_ELF_FOLD_CRC32   0x18e06b89
 
-unsigned char stub_mips_r3000_linux_elf_fold[2576] = {
+unsigned char stub_mips_r3000_linux_elf_fold[2548] = {
 /* 0x0000 */ 127, 69, 76, 70,  1,  2,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0010 */   0,  2,  0,  8,  0,  0,  0,  1,  0, 16,  0,128,  0,  0,  0, 52,
 /* 0x0020 */   0,  0,  0,  0,  0,  0, 48,  1,  0, 52,  0, 32,  0,  2,  0,  0,
 /* 0x0030 */   0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0, 16,  0,  0,
-/* 0x0040 */   0, 16,  0,  0,  0,  0, 10, 16,  0,  0, 10, 16,  0,  0,  0,  5,
+/* 0x0040 */   0, 16,  0,  0,  0,  0,  9,244,  0,  0, 10,  0,  0,  0,  0,  5,
-/* 0x0050 */   0,  0, 16,  0,  0,  0,  0,  1,  0,  0, 10, 16,  0,  0,  0,  0,
+/* 0x0050 */   0,  0, 16,  0,  0,  0,  0,  1,  0,  0,  9,244,  0,  0,  0,  0,
 /* 0x0060 */   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0070 */   0,  0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0080 */  39,162,  0, 32, 39,189,240, 24,  3,160, 24, 33,140, 65,  0,  0,
@@ -57,7 +57,7 @@ unsigned char stub_mips_r3000_linux_elf_fold[2576] = {
 /* 0x0120 */   0,  0,  0, 12,  4,224,  0,  2,  0,162,  8, 33,160, 32,  0,  0,
 /* 0x0130 */  39,189,254,  0,  0,  0, 72, 33,  2,224, 64, 33,  2,128, 56, 33,
 /* 0x0140 */   3,160, 48, 33, 38,165,255,116,  4, 16,  0,  1, 36,  2,  1, 80,
-/* 0x0150 */   3,226, 16, 35, 36, 66,  8,100,  0, 64,248,  9,  2, 32, 32, 33,
+/* 0x0150 */   3,226, 16, 35, 36, 66,  8, 72,  0, 64,248,  9,  2, 32, 32, 33,
 /* 0x0160 */   0, 64,200, 33, 39,161,  2,  0, 39,189,254,212, 39,189,  0,  4,
 /* 0x0170 */  23,161,255,254,175,160,255,252,142,193,255,252,  2, 64, 40, 33,
 /* 0x0180 */  16, 32,  0,  3,  2, 96, 32, 33,  0, 32,  0,  8, 36,  2, 15,251,
@@ -98,103 +98,102 @@ unsigned char stub_mips_r3000_linux_elf_fold[2576] = {
 /* 0x03b0 */   0,130, 32, 35,174,  3,  0,  4,174,  4,  0,  0,142,  2,  0,  0,
 /* 0x03c0 */   0,  0,  0,  0, 20, 64,255,172, 36,  6,  0, 12,143,191,  0, 32,
 /* 0x03d0 */ 143,179,  0, 28,143,178,  0, 24,143,177,  0, 20,143,176,  0, 16,
-/* 0x03e0 */   3,224,  0,  8, 39,189,  0, 40, 16,128,  0, 14,  0,128, 16, 33,
+/* 0x03e0 */   3,224,  0,  8, 39,189,  0, 40, 16,128,  0,  7,  0,  0,  0,  0,
-/* 0x03f0 */  36,  4,  0,  1,140, 67,  0,  0,  0,  0,  0,  0, 16,101,  0,  5,
+/* 0x03f0 */ 140,130,  0,  0,  0,  0,  0,  0, 16, 69,  0,  3,  0,  0,  0,  0,
-/* 0x0400 */   0,  0,  0,  0, 20,100,  0,  5,  0,  0,  0,  0, 16,160,  0,  3,
+/* 0x0400 */  16,  0,255,251, 36,132,  0,  8,  3,224,  0,  8,  0,128, 16, 33,
-/* 0x0410 */   0,  0,  0,  0,  3,224,  0,  8,172, 69,  0,  0, 16,  0,255,245,
+/* 0x0410 */  39,189,255,248,175,176,  0,  0,175,191,  0,  4,  4, 17,255,242,
-/* 0x0420 */  36, 66,  0,  8,  3,224,  0,  8,  0,  0,  0,  0, 39,189,255,248,
+/* 0x0420 */   0,192,128, 33, 16, 64,  0,  2,  0,  0,  0,  0,172, 80,  0,  4,
-/* 0x0430 */ 175,176,  0,  0,175,191,  0,  4,  4, 17,255,235,  0,192,128, 33,
+/* 0x0430 */ 143,191,  0,  4,143,176,  0,  0,  3,224,  0,  8, 39,189,  0,  8,
-/* 0x0440 */  16, 64,  0,  2,  0,  0,  0,  0,172, 80,  0,  4,143,191,  0,  4,
+/* 0x0440 */  39,189,255,168,175,190,  0, 80,175,181,  0, 68,175,177,  0, 52,
-/* 0x0450 */ 143,176,  0,  0,  3,224,  0,  8, 39,189,  0,  8, 39,189,255,168,
+/* 0x0450 */ 175,191,  0, 84,175,183,  0, 76,175,182,  0, 72,175,180,  0, 64,
-/* 0x0460 */ 175,190,  0, 80,175,181,  0, 68,175,177,  0, 52,175,191,  0, 84,
+/* 0x0460 */ 175,179,  0, 60,175,178,  0, 56,175,176,  0, 48,140,162,  0, 28,
-/* 0x0470 */ 175,183,  0, 76,175,182,  0, 72,175,180,  0, 64,175,179,  0, 60,
+/* 0x0470 */   0,160,168, 33,175,164,  0, 28, 36,  5,  0,  6,  0,224, 32, 33,
-/* 0x0480 */ 175,178,  0, 56,175,176,  0, 48,140,162,  0, 28,  0,160,168, 33,
+/* 0x0480 */ 175,167,  0, 32,  0,192,240, 33,175,168,  0, 36,175,169,  0, 40,
-/* 0x0490 */ 175,164,  0, 28, 36,  5,  0,  6,  0,224, 32, 33,175,167,  0, 32,
+/* 0x0490 */   4, 17,255,213,  2,162,136, 33, 20, 64,  0,  3,  0,  0,  0,  0,
-/* 0x04a0 */   0,192,240, 33,175,168,  0, 36,175,169,  0, 40,  4, 17,255,206,
+/* 0x04a0 */  16,  0,  0,  4, 52,  2,255,255,140, 66,  0,  4,  0,  0,  0,  0,
-/* 0x04b0 */   2,162,136, 33, 20, 64,  0,  3,  0,  0,  0,  0, 16,  0,  0,  4,
+/* 0x04b0 */  36, 66,255,255,175,162,  0, 20,150,162,  0, 16,143,164,  0, 20,
-/* 0x04c0 */  52,  2,255,255,140, 66,  0,  4,  0,  0,  0,  0, 36, 66,255,255,
+/* 0x04c0 */  56, 66,  0,  2,150,163,  0, 44, 44, 66,  0,  1,  0,  2, 17,  0,
-/* 0x04d0 */ 175,162,  0, 20,150,162,  0, 16,143,164,  0, 20, 56, 66,  0,  2,
+/* 0x04d0 */   0,  4, 40, 39, 36, 71,  8,  2, 36, 99,255,255,  2, 32, 64, 33,
-/* 0x04e0 */ 150,163,  0, 44, 44, 66,  0,  1,  0,  2, 17,  0,  0,  4, 40, 39,
+/* 0x04e0 */  36,  4,255,255,  0,  0, 72, 33, 16,  0,  0, 19, 36, 10,  0,  1,
-/* 0x04f0 */  36, 71,  8,  2, 36, 99,255,255,  2, 32, 64, 33, 36,  4,255,255,
+/* 0x04f0 */ 141,  2,  0,  0,  0,  0,  0,  0, 20, 74,  0, 14, 36, 99,255,255,
-/* 0x0500 */   0,  0, 72, 33, 16,  0,  0, 19, 36, 10,  0,  1,141,  2,  0,  0,
+/* 0x0500 */ 141,  6,  0,  8,  0,  0,  0,  0,  0,196, 16, 43, 16, 64,  0,  2,
-/* 0x0510 */   0,  0,  0,  0, 20, 74,  0, 14, 36, 99,255,255,141,  6,  0,  8,
+/* 0x0510 */   0,  0,  0,  0,  0,192, 32, 33,141,  2,  0, 20,  0,  0,  0,  0,
-/* 0x0520 */   0,  0,  0,  0,  0,196, 16, 43, 16, 64,  0,  2,  0,  0,  0,  0,
+/* 0x0520 */   0,194, 48, 33,  1, 38, 16, 43, 16, 64,  0,  2,  0,  0,  0,  0,
-/* 0x0530 */   0,192, 32, 33,141,  2,  0, 20,  0,  0,  0,  0,  0,194, 48, 33,
+/* 0x0530 */   0,192, 72, 33, 37,  8,  0, 32,  4, 97,255,237,  0,164,128, 36,
-/* 0x0540 */   1, 38, 16, 43, 16, 64,  0,  2,  0,  0,  0,  0,  0,192, 72, 33,
+/* 0x0540 */   1, 48, 16, 35,  0, 69, 16, 35, 36, 66,255,255,  0,162, 40, 36,
-/* 0x0550 */  37,  8,  0, 32,  4, 97,255,237,  0,164,128, 36,  1, 48, 16, 35,
+/* 0x0550 */  48,227,  0, 16, 16, 96,  0,  3,175,165,  0,  8, 16,  0,  0,  8,
-/* 0x0560 */   0, 69, 16, 35, 36, 66,255,255,  0,162, 40, 36, 48,227,  0, 16,
+/* 0x0560 */ 175,176,  0, 12,143,165,  0,  8,  2,  0, 32, 33,  0,  0, 48, 33,
-/* 0x0570 */  16, 96,  0,  3,175,165,  0,  8, 16,  0,  0,  8,175,176,  0, 12,
+/* 0x0570 */  36,  8,255,255,  4, 17,255, 10,  0,  0, 72, 33,175,162,  0, 12,
-/* 0x0580 */ 143,165,  0,  8,  2,  0, 32, 33,  0,  0, 48, 33, 36,  8,255,255,
+/* 0x0580 */ 143,162,  0, 12,175,160,  0, 16, 16,  0,  0,133,  0, 80,184, 35,
-/* 0x0590 */   4, 17,255,  3,  0,  0, 72, 33,175,162,  0, 12,143,165,  0, 12,
+/* 0x0590 */  19,192,  0, 12, 36,  2,  0,  6,142, 35,  0,  0,  0,  0,  0,  0,
-/* 0x05a0 */ 175,160,  0, 16, 16,  0,  0,133,  0,176,184, 35, 19,192,  0, 12,
+/* 0x05a0 */  20, 98,  0, 10, 36,  2,  0,  1,142, 38,  0,  8,143,164,  0, 32,
-/* 0x05b0 */  36,  2,  0,  6,142, 35,  0,  0,  0,  0,  0,  0, 20, 98,  0, 10,
+/* 0x05b0 */   2,230, 48, 33,  4, 17,255,150, 36,  5,  0,  3, 16,  0,  0,116,
-/* 0x05c0 */  36,  2,  0,  1,142, 38,  0,  8,143,164,  0, 32,  2,230, 48, 33,
+/* 0x05c0 */   0,  0,  0,  0,142, 35,  0,  0, 36,  2,  0,  1, 20, 98,  0,112,
-/* 0x05d0 */   4, 17,255,150, 36,  5,  0,  3, 16,  0,  0,116,  0,  0,  0,  0,
+/* 0x05d0 */   0,  0,  0,  0,142, 34,  0,  8,142, 35,  0, 24,  2,226,176, 33,
-/* 0x05e0 */ 142, 35,  0,  0, 36,  2,  0,  1, 20, 98,  0,112,  0,  0,  0,  0,
+/* 0x05e0 */  60,  2,115, 81,  0,  3, 24,128, 52, 66, 98, 64,  0, 98, 16,  6,
-/* 0x05f0 */ 142, 34,  0,  8,142, 35,  0, 24,  2,226,176, 33, 60,  2,115, 81,
+/* 0x05f0 */ 143,164,  0, 20,142, 42,  0, 16, 48, 82,  0,  7,142, 34,  0, 20,
-/* 0x0600 */   0,  3, 24,128, 52, 66, 98, 64,  0, 98, 16,  6,143,165,  0, 20,
+/* 0x0600 */   2,196, 24, 36,175,162,  0, 24,  1, 67,152, 33, 19,192,  0,124,
-/* 0x0610 */ 142, 36,  0, 16, 48, 82,  0,  7,142, 34,  0, 20,  2,197, 24, 36,
+/* 0x0610 */   2,195,160, 35, 54, 70,  0,  2, 36,  8,255,255, 36,  7,  8, 18,
-/* 0x0620 */ 175,164,  0,  0,175,182,  0,  4,  0,131,160, 33,175,162,  0, 24,
+/* 0x0620 */ 142, 41,  0,  4,  2,128, 32, 33,  1, 35, 72, 35,  2, 96, 40, 33,
-/* 0x0630 */  19,192,  0,122,  2,195,152, 35, 54, 70,  0,  2, 36,  8,255,255,
+/* 0x0630 */ 175,170,  0,  0,  4, 17,254,218,175,182,  0,  4, 22,130,  0, 64,
-/* 0x0640 */  36,  7,  8, 18,142, 41,  0,  4,  2, 96, 32, 33,  1, 35, 72, 35,
+/* 0x0640 */  36,  4,  0,127, 19,192,  0, 11, 50, 66,  0,  4, 16, 64,  0,  4,
-/* 0x0650 */   4, 17,254,211,  2,128, 40, 33, 22, 98,  0, 64, 36,  4,  0,127,
+/* 0x0650 */   0,  0,  0,  0,143,167,  0, 40, 16,  0,  0,  2,  0,  0,  0,  0,
-/* 0x0660 */  19,192,  0, 11, 50, 66,  0,  4, 16, 64,  0,  4,  0,  0,  0,  0,
+/* 0x0660 */   0,  0, 56, 33,143,166,  0, 28,  3,192, 32, 33,  4, 17,254,247,
-/* 0x0670 */ 143,167,  0, 40, 16,  0,  0,  2,  0,  0,  0,  0,  0,  0, 56, 33,
+/* 0x0670 */   3,160, 40, 33,143,164,  0, 20,  0, 19, 16, 35, 50, 67,  0,  2,
-/* 0x0680 */ 143,166,  0, 28,  3,192, 32, 33,  4, 17,254,240,  3,160, 40, 33,
+/* 0x0680 */  16, 96,  0,  8,  0, 68,128, 36, 18,  0,  0,  6,  2,  0, 16, 33,
-/* 0x0690 */ 143,164,  0, 20,  0, 20, 16, 35, 50, 67,  0,  2, 16, 96,  0,  8,
+/* 0x0690 */   2,147, 24, 33, 36, 66,255,255,160, 96,  0,  0, 20, 64,255,253,
-/* 0x06a0 */   0, 68,128, 36, 18,  0,  0,  6,  2,116, 24, 33,  2,  0, 16, 33,
+/* 0x06a0 */  36, 99,  0,  1, 19,192,  0, 43, 36,  2,  0,  1,142, 35,  0,  0,
-/* 0x06b0 */  36, 66,255,255,160, 96,  0,  0, 20, 64,255,253, 36, 99,  0,  1,
+/* 0x06b0 */   0,  0,  0,  0, 20, 98,  0, 28,  2,128, 32, 33,142, 34,  0, 24,
-/* 0x06c0 */  19,192,  0, 43, 36,  2,  0,  1,142, 35,  0,  0,  0,  0,  0,  0,
+/* 0x06c0 */   0,  0,  0,  0, 48, 66,  0,  1, 16, 64,  0, 23,  0,  0,  0,  0,
-/* 0x06d0 */  20, 98,  0, 28,  2, 96, 32, 33,142, 34,  0, 24,  0,  0,  0,  0,
+/* 0x06d0 */ 142, 36,  0, 20,142, 34,  0, 16,142, 35,  0,  8, 20,130,  0, 17,
-/* 0x06e0 */  48, 66,  0,  1, 16, 64,  0, 24,  2,128, 40, 33,142, 36,  0, 20,
+/* 0x06e0 */   0,131, 16, 33,  0, 87, 48, 33,143,163,  0, 20,  0,  6, 16, 35,
-/* 0x06f0 */ 142, 34,  0, 16,142, 35,  0,  8, 20,130,  0, 17,  0,131, 16, 33,
+/* 0x06f0 */   0, 98, 16, 36, 44, 66,  0, 12, 20, 64,  0, 11,  2,128, 32, 33,
-/* 0x0700 */   0, 87, 48, 33,143,165,  0, 20,  0,  6, 16, 35,  0,162, 16, 36,
+/* 0x0700 */  36,  2,  0, 12,172,194,  0,  0, 60,  2,  3, 32, 52, 66,  0,  8,
-/* 0x0710 */  44, 66,  0, 12, 20, 64,  0, 11,  2, 96, 32, 33, 36,  2,  0, 12,
+/* 0x0710 */ 143,164,  0, 32,172,194,  0,  4,172,192,  0,  8,  4, 17,255, 60,
-/* 0x0720 */ 172,194,  0,  0, 60,  2,  3, 32, 52, 66,  0,  8,143,164,  0, 32,
+/* 0x0720 */   0,  0, 40, 33,  2,128, 32, 33,  2, 96, 40, 33,  2, 64, 48, 33,
-/* 0x0730 */ 172,194,  0,  4,172,192,  0,  8,  4, 17,255, 60,  0,  0, 40, 33,
+/* 0x0730 */   4, 17,254,162, 36,  2, 16, 29, 16, 64,  0,  6, 36,  4,  0,127,
-/* 0x0740 */   2, 96, 32, 33,  2,128, 40, 33,  2, 64, 48, 33,  4, 17,254,155,
+/* 0x0740 */  36,  2, 15,161,  4, 17,254,157,  0,  0,  0,  0, 16,  0,255,255,
-/* 0x0750 */  36,  2, 16, 29, 16, 64,  0,  6, 36,  4,  0,127, 36,  2, 15,161,
+/* 0x0750 */   0,  0,  0,  0,143,164,  0, 24,  2,112, 16, 33,  2,196, 40, 33,
-/* 0x0760 */   4, 17,254,150,  0,  0,  0,  0, 16,  0,255,255,  0,  0,  0,  0,
+/* 0x0760 */   2,130,128, 33,  2,  5, 16, 43, 16, 64,  0,  9,  0,176, 40, 35,
-/* 0x0770 */ 143,163,  0, 24,  2,144, 16, 33,  2,195, 40, 33,  2, 98,128, 33,
+/* 0x0770 */   2, 64, 48, 33,  2,  0, 32, 33, 36,  7,  8, 18, 36,  8,255,255,
-/* 0x0780 */   2,  5, 16, 43, 16, 64,  0,  9,  0,176, 40, 35,  2, 64, 48, 33,
+/* 0x0780 */   4, 17,254,135,  0,  0, 72, 33, 22,  2,255,237, 36,  4,  0,127,
-/* 0x0790 */   2,  0, 32, 33, 36,  7,  8, 18, 36,  8,255,255,  4, 17,254,128,
+/* 0x0790 */ 143,162,  0, 16, 38, 49,  0, 32, 36, 66,  0,  1,175,162,  0, 16,
-/* 0x07a0 */   0,  0, 72, 33, 22,  2,255,237, 36,  4,  0,127,143,164,  0, 16,
+/* 0x07a0 */ 150,162,  0, 44,143,163,  0, 16,  0,  0,  0,  0,  0, 98, 16, 42,
-/* 0x07b0 */  38, 49,  0, 32, 36,132,  0,  1,175,164,  0, 16,150,162,  0, 44,
+/* 0x07b0 */  20, 64,255,119,  0,  0,  0,  0, 19,192,  0, 11, 36,  2,  0,  3,
-/* 0x07c0 */ 143,165,  0, 16,  0,  0,  0,  0,  0,162, 16, 42, 20, 64,255,119,
+/* 0x07c0 */ 150,163,  0, 16,  0,  0,  0,  0, 16, 98,  0,  7,  0,  0,  0,  0,
-/* 0x07d0 */   0,  0,  0,  0, 19,192,  0, 11, 36,  2,  0,  3,150,163,  0, 16,
+/* 0x07d0 */ 143,162,  0, 12,143,163,  0,  8,  0,  0,  0,  0,  0, 67, 32, 33,
-/* 0x07e0 */   0,  0,  0,  0, 16, 98,  0,  7,  0,  0,  0,  0,143,162,  0, 12,
+/* 0x07e0 */   4, 17,254,118, 36,  2, 15,205,143,164,  0, 36,  0,  0,  0,  0,
-/* 0x07f0 */ 143,163,  0,  8,  0,  0,  0,  0,  0, 67, 32, 33,  4, 17,254,111,
+/* 0x07f0 */  16,128,  0,  7,  0,  0,  0,  0, 16,  0,  0,  5,172,151,  0,  0,
-/* 0x0800 */  36,  2, 15,205,143,164,  0, 36,  0,  0,  0,  0, 16,128,  0,  7,
+/* 0x0800 */ 143,168,  0, 28,  2, 64, 48, 33, 16,  0,255,133, 36,  7,  0, 18,
-/* 0x0810 */   0,  0,  0,  0, 16,  0,  0,  5,172,151,  0,  0,143,168,  0, 28,
+/* 0x0810 */ 142,162,  0, 24,143,191,  0, 84,  2,226, 16, 33,143,190,  0, 80,
-/* 0x0820 */   2, 64, 48, 33, 16,  0,255,135, 36,  7,  0, 18,142,162,  0, 24,
+/* 0x0820 */ 143,183,  0, 76,143,182,  0, 72,143,181,  0, 68,143,180,  0, 64,
-/* 0x0830 */ 143,191,  0, 84,  2,226, 16, 33,143,190,  0, 80,143,183,  0, 76,
+/* 0x0830 */ 143,179,  0, 60,143,178,  0, 56,143,177,  0, 52,143,176,  0, 48,
-/* 0x0840 */ 143,182,  0, 72,143,181,  0, 68,143,180,  0, 64,143,179,  0, 60,
+/* 0x0840 */   3,224,  0,  8, 39,189,  0, 88, 39,189,255,200,175,191,  0, 52,
-/* 0x0850 */ 143,178,  0, 56,143,177,  0, 52,143,176,  0, 48,  3,224,  0,  8,
+/* 0x0850 */ 175,180,  0, 48,175,179,  0, 44,175,178,  0, 40,175,177,  0, 36,
-/* 0x0860 */  39,189,  0, 88, 39,189,255,200,175,191,  0, 52,175,180,  0, 48,
+/* 0x0860 */ 175,176,  0, 32,  1,  0,128, 33,140,136,  0,  0,  0,160, 24, 33,
-/* 0x0870 */ 175,179,  0, 44,175,178,  0, 40,175,177,  0, 36,175,176,  0, 32,
+/* 0x0870 */   0,128, 16, 33,  0,192,144, 33,  0,224,160, 33, 39,165,  0,  4,
-/* 0x0880 */   1,  0,128, 33,140,136,  0,  0,  0,160, 24, 33,  0,128, 16, 33,
+/* 0x0880 */   0,  0, 56, 33,  2,  0, 48, 33, 39,164,  0, 20,175,163,  0, 20,
-/* 0x0890 */   0,192,144, 33,  0,224,160, 33, 39,165,  0,  4,  0,  0, 56, 33,
+/* 0x0890 */   1, 32,136, 33,175,163,  0, 12,175,168,  0,  4,175,162,  0, 24,
-/* 0x08a0 */   2,  0, 48, 33, 39,164,  0, 20,175,163,  0, 20,  1, 32,136, 33,
+/* 0x08a0 */ 175,162,  0, 16,  4, 17,254,105,175,178,  0,  8,150, 70,  0, 44,
-/* 0x08b0 */ 175,163,  0, 12,175,168,  0,  4,175,162,  0, 24,175,162,  0, 16,
+/* 0x08b0 */   2,128, 32, 33,  4, 17,254,214, 36,  5,  0,  5,150, 70,  0, 42,
-/* 0x08c0 */   4, 17,254, 98,175,178,  0,  8,150, 70,  0, 44,  2,128, 32, 33,
+/* 0x08c0 */   2,128, 32, 33, 36,  5,  0,  4,  4, 17,254,209, 38, 83,  0, 52,
-/* 0x08d0 */   4, 17,254,214, 36,  5,  0,  5,150, 70,  0, 42,  2,128, 32, 33,
+/* 0x08d0 */ 142,102,  0,  8,  2,128, 32, 33, 36,198,  0, 52,  4, 17,254,204,
-/* 0x08e0 */  36,  5,  0,  4,  4, 17,254,209, 38, 83,  0, 52,142,102,  0,  8,
+/* 0x08e0 */  36,  5,  0,  3,  2, 32, 72, 33,  2,  0, 32, 33,  2, 64, 40, 33,
-/* 0x08f0 */   2,128, 32, 33, 36,198,  0, 52,  4, 17,254,204, 36,  5,  0,  3,
+/* 0x08f0 */  39,166,  0, 12,  2,128, 56, 33,  4, 17,254,209,  3,160, 64, 33,
-/* 0x0900 */   2, 32, 72, 33,  2,  0, 32, 33,  2, 64, 40, 33, 39,166,  0, 12,
+/* 0x0900 */   0, 64, 48, 33,  2,128, 32, 33, 36,  5,  0,  9,  4, 17,254,192,
-/* 0x0910 */   2,128, 56, 33,  4, 17,254,209,  3,160, 64, 33,  0, 64, 48, 33,
+/* 0x0910 */   0, 64,136, 33,150, 69,  0, 44, 16,  0,  0, 42,  0,  0, 32, 33,
-/* 0x0920 */   2,128, 32, 33, 36,  5,  0,  9,  4, 17,254,192,  0, 64,136, 33,
+/* 0x0920 */ 142, 99,  0,  0, 36,  2,  0,  3, 20, 98,  0, 38, 38,115,  0, 32,
-/* 0x0930 */ 150, 69,  0, 44, 16,  0,  0, 42,  0,  0, 32, 33,142, 99,  0,  0,
+/* 0x0930 */  38,115,255,224,142, 98,  0,  8,143,164,  0,  0,  0,  0, 40, 33,
-/* 0x0940 */  36,  2,  0,  3, 20, 98,  0, 38, 38,115,  0, 32, 38,115,255,224,
+/* 0x0940 */   0, 68, 32, 33,  0,  0, 48, 33,  4, 17,254, 28, 36,  2, 15,165,
-/* 0x0950 */ 142, 98,  0,  8,143,164,  0,  0,  0,  0, 40, 33,  0, 68, 32, 33,
+/* 0x0950 */   4, 64,  0,  9,  0, 64,128, 33,  0, 64, 32, 33,  2, 64, 40, 33,
-/* 0x0960 */   0,  0, 48, 33,  4, 17,254, 21, 36,  2, 15,165,  4, 64,  0,  9,
+/* 0x0960 */  36,  6,  2,  0,  4, 17,254, 21, 36,  2, 15,163, 36,  3,  2,  0,
-/* 0x0970 */   0, 64,128, 33,  0, 64, 32, 33,  2, 64, 40, 33, 36,  6,  2,  0,
+/* 0x0970 */  16, 67,  0,  6,  2,128, 56, 33, 36,  4,  0,127,  4, 17,254, 15,
-/* 0x0980 */   4, 17,254, 14, 36,  2, 15,163, 36,  3,  2,  0, 16, 67,  0,  6,
+/* 0x0980 */  36,  2, 15,161, 16,  0,255,255,  0,  0,  0,  0,  3,160, 64, 33,
-/* 0x0990 */   2,128, 56, 33, 36,  4,  0,127,  4, 17,254,  8, 36,  2, 15,161,
+/* 0x0990 */   0,  0, 72, 33,  4, 17,254,170,  0,  0, 48, 33,143,166,  0,  0,
-/* 0x09a0 */  16,  0,255,255,  0,  0,  0,  0,  3,160, 64, 33,  0,  0, 72, 33,
+/* 0x09a0 */   2,128, 32, 33, 36,  5,  0,  7,  4, 17,254,153,  0, 64,136, 33,
-/* 0x09b0 */   4, 17,254,170,  0,  0, 48, 33,143,166,  0,  0,  2,128, 32, 33,
+/* 0x09b0 */   2,  0, 32, 33,  4, 17,254,  1, 36,  2, 15,166, 16,  0,  0,  5,
-/* 0x09c0 */  36,  5,  0,  7,  4, 17,254,153,  0, 64,136, 33,  2,  0, 32, 33,
+/* 0x09c0 */   2, 32, 16, 33,  0,133, 16, 42, 20, 64,255,213, 36,132,  0,  1,
-/* 0x09d0 */   4, 17,253,250, 36,  2, 15,166, 16,  0,  0,  5,  2, 32, 16, 33,
+/* 0x09d0 */   2, 32, 16, 33,143,191,  0, 52,143,180,  0, 48,143,179,  0, 44,
-/* 0x09e0 */   0,133, 16, 42, 20, 64,255,213, 36,132,  0,  1,  2, 32, 16, 33,
+/* 0x09e0 */ 143,178,  0, 40,143,177,  0, 36,143,176,  0, 32,  3,224,  0,  8,
-/* 0x09f0 */ 143,191,  0, 52,143,180,  0, 48,143,179,  0, 44,143,178,  0, 40,
+/* 0x09f0 */  39,189,  0, 56
-/* 0x0a00 */ 143,177,  0, 36,143,176,  0, 32,  3,224,  0,  8, 39,189,  0, 56
 };

src/stub/mipsel.r3000-linux.elf-fold.h

@@ -1,5 +1,5 @@
 /* mipsel.r3000-linux.elf-fold.h
-   created from mipsel.r3000-linux.elf-fold.bin, 2576 (0xa10) bytes
+   created from mipsel.r3000-linux.elf-fold.bin, 2548 (0x9f4) bytes
 
    This file is part of the UPX executable compressor.
 
@@ -31,17 +31,17 @@
  */
 
 
-#define STUB_MIPSEL_R3000_LINUX_ELF_FOLD_SIZE    2576
+#define STUB_MIPSEL_R3000_LINUX_ELF_FOLD_SIZE    2548
-#define STUB_MIPSEL_R3000_LINUX_ELF_FOLD_ADLER32 0x67e2382d
+#define STUB_MIPSEL_R3000_LINUX_ELF_FOLD_ADLER32 0x133a34a5
-#define STUB_MIPSEL_R3000_LINUX_ELF_FOLD_CRC32   0xabc99d32
+#define STUB_MIPSEL_R3000_LINUX_ELF_FOLD_CRC32   0x3bbceedc
 
-unsigned char stub_mipsel_r3000_linux_elf_fold[2576] = {
+unsigned char stub_mipsel_r3000_linux_elf_fold[2548] = {
 /* 0x0000 */ 127, 69, 76, 70,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0010 */   2,  0,  8,  0,  1,  0,  0,  0,128,  0, 16,  0, 52,  0,  0,  0,
 /* 0x0020 */   0,  0,  0,  0,  1, 48,  0,  0, 52,  0, 32,  0,  2,  0,  0,  0,
 /* 0x0030 */   0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0, 16,  0,
-/* 0x0040 */   0,  0, 16,  0, 16, 10,  0,  0, 16, 10,  0,  0,  5,  0,  0,  0,
+/* 0x0040 */   0,  0, 16,  0,244,  9,  0,  0,  0, 10,  0,  0,  5,  0,  0,  0,
-/* 0x0050 */   0, 16,  0,  0,  1,  0,  0,  0, 16, 10,  0,  0,  0,  0,  0,  0,
+/* 0x0050 */   0, 16,  0,  0,  1,  0,  0,  0,244,  9,  0,  0,  0,  0,  0,  0,
 /* 0x0060 */   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0070 */   0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 /* 0x0080 */  32,  0,162, 39, 24,240,189, 39, 33, 24,160,  3,  0,  0, 65,140,
@@ -57,7 +57,7 @@ unsigned char stub_mipsel_r3000_linux_elf_fold[2576] = {
 /* 0x0120 */  12,  0,  0,  0,  2,  0,224,  4, 33,  8,162,  0,  0,  0, 32,160,
 /* 0x0130 */   0,254,189, 39, 33, 72,  0,  0, 33, 64,224,  2, 33, 56,128,  2,
 /* 0x0140 */  33, 48,160,  3,116,255,165, 38,  1,  0, 16,  4, 80,  1,  2, 36,
-/* 0x0150 */  35, 16,226,  3,100,  8, 66, 36,  9,248, 64,  0, 33, 32, 32,  2,
+/* 0x0150 */  35, 16,226,  3, 72,  8, 66, 36,  9,248, 64,  0, 33, 32, 32,  2,
 /* 0x0160 */  33,200, 64,  0,  0,  2,161, 39,212,254,189, 39,  4,  0,189, 39,
 /* 0x0170 */ 254,255,161, 23,252,255,160,175,252,255,193,142, 33, 40, 64,  2,
 /* 0x0180 */   3,  0, 32, 16, 33, 32, 96,  2,  8,  0, 32,  0,251, 15,  2, 36,
@@ -98,103 +98,102 @@ unsigned char stub_mipsel_r3000_linux_elf_fold[2576] = {
 /* 0x03b0 */  35, 32,130,  0,  4,  0,  3,174,  0,  0,  4,174,  0,  0,  2,142,
 /* 0x03c0 */   0,  0,  0,  0,172,255, 64, 20, 12,  0,  6, 36, 32,  0,191,143,
 /* 0x03d0 */  28,  0,179,143, 24,  0,178,143, 20,  0,177,143, 16,  0,176,143,
-/* 0x03e0 */   8,  0,224,  3, 40,  0,189, 39, 14,  0,128, 16, 33, 16,128,  0,
+/* 0x03e0 */   8,  0,224,  3, 40,  0,189, 39,  7,  0,128, 16,  0,  0,  0,  0,
-/* 0x03f0 */   1,  0,  4, 36,  0,  0, 67,140,  0,  0,  0,  0,  5,  0,101, 16,
+/* 0x03f0 */   0,  0,130,140,  0,  0,  0,  0,  3,  0, 69, 16,  0,  0,  0,  0,
-/* 0x0400 */   0,  0,  0,  0,  5,  0,100, 20,  0,  0,  0,  0,  3,  0,160, 16,
+/* 0x0400 */ 251,255,  0, 16,  8,  0,132, 36,  8,  0,224,  3, 33, 16,128,  0,
-/* 0x0410 */   0,  0,  0,  0,  8,  0,224,  3,  0,  0, 69,172,245,255,  0, 16,
+/* 0x0410 */ 248,255,189, 39,  0,  0,176,175,  4,  0,191,175,242,255, 17,  4,
-/* 0x0420 */   8,  0, 66, 36,  8,  0,224,  3,  0,  0,  0,  0,248,255,189, 39,
+/* 0x0420 */  33,128,192,  0,  2,  0, 64, 16,  0,  0,  0,  0,  4,  0, 80,172,
-/* 0x0430 */   0,  0,176,175,  4,  0,191,175,235,255, 17,  4, 33,128,192,  0,
+/* 0x0430 */   4,  0,191,143,  0,  0,176,143,  8,  0,224,  3,  8,  0,189, 39,
-/* 0x0440 */   2,  0, 64, 16,  0,  0,  0,  0,  4,  0, 80,172,  4,  0,191,143,
+/* 0x0440 */ 168,255,189, 39, 80,  0,190,175, 68,  0,181,175, 52,  0,177,175,
-/* 0x0450 */   0,  0,176,143,  8,  0,224,  3,  8,  0,189, 39,168,255,189, 39,
+/* 0x0450 */  84,  0,191,175, 76,  0,183,175, 72,  0,182,175, 64,  0,180,175,
-/* 0x0460 */  80,  0,190,175, 68,  0,181,175, 52,  0,177,175, 84,  0,191,175,
+/* 0x0460 */  60,  0,179,175, 56,  0,178,175, 48,  0,176,175, 28,  0,162,140,
-/* 0x0470 */  76,  0,183,175, 72,  0,182,175, 64,  0,180,175, 60,  0,179,175,
+/* 0x0470 */  33,168,160,  0, 28,  0,164,175,  6,  0,  5, 36, 33, 32,224,  0,
-/* 0x0480 */  56,  0,178,175, 48,  0,176,175, 28,  0,162,140, 33,168,160,  0,
+/* 0x0480 */  32,  0,167,175, 33,240,192,  0, 36,  0,168,175, 40,  0,169,175,
-/* 0x0490 */  28,  0,164,175,  6,  0,  5, 36, 33, 32,224,  0, 32,  0,167,175,
+/* 0x0490 */ 213,255, 17,  4, 33,136,162,  2,  3,  0, 64, 20,  0,  0,  0,  0,
-/* 0x04a0 */  33,240,192,  0, 36,  0,168,175, 40,  0,169,175,206,255, 17,  4,
+/* 0x04a0 */   4,  0,  0, 16,255,255,  2, 52,  4,  0, 66,140,  0,  0,  0,  0,
-/* 0x04b0 */  33,136,162,  2,  3,  0, 64, 20,  0,  0,  0,  0,  4,  0,  0, 16,
+/* 0x04b0 */ 255,255, 66, 36, 20,  0,162,175, 16,  0,162,150, 20,  0,164,143,
-/* 0x04c0 */ 255,255,  2, 52,  4,  0, 66,140,  0,  0,  0,  0,255,255, 66, 36,
+/* 0x04c0 */   2,  0, 66, 56, 44,  0,163,150,  1,  0, 66, 44,  0, 17,  2,  0,
-/* 0x04d0 */  20,  0,162,175, 16,  0,162,150, 20,  0,164,143,  2,  0, 66, 56,
+/* 0x04d0 */  39, 40,  4,  0,  2,  8, 71, 36,255,255, 99, 36, 33, 64, 32,  2,
-/* 0x04e0 */  44,  0,163,150,  1,  0, 66, 44,  0, 17,  2,  0, 39, 40,  4,  0,
+/* 0x04e0 */ 255,255,  4, 36, 33, 72,  0,  0, 19,  0,  0, 16,  1,  0, 10, 36,
-/* 0x04f0 */   2,  8, 71, 36,255,255, 99, 36, 33, 64, 32,  2,255,255,  4, 36,
+/* 0x04f0 */   0,  0,  2,141,  0,  0,  0,  0, 14,  0, 74, 20,255,255, 99, 36,
-/* 0x0500 */  33, 72,  0,  0, 19,  0,  0, 16,  1,  0, 10, 36,  0,  0,  2,141,
+/* 0x0500 */   8,  0,  6,141,  0,  0,  0,  0, 43, 16,196,  0,  2,  0, 64, 16,
-/* 0x0510 */   0,  0,  0,  0, 14,  0, 74, 20,255,255, 99, 36,  8,  0,  6,141,
+/* 0x0510 */   0,  0,  0,  0, 33, 32,192,  0, 20,  0,  2,141,  0,  0,  0,  0,
-/* 0x0520 */   0,  0,  0,  0, 43, 16,196,  0,  2,  0, 64, 16,  0,  0,  0,  0,
+/* 0x0520 */  33, 48,194,  0, 43, 16, 38,  1,  2,  0, 64, 16,  0,  0,  0,  0,
-/* 0x0530 */  33, 32,192,  0, 20,  0,  2,141,  0,  0,  0,  0, 33, 48,194,  0,
+/* 0x0530 */  33, 72,192,  0, 32,  0,  8, 37,237,255, 97,  4, 36,128,164,  0,
-/* 0x0540 */  43, 16, 38,  1,  2,  0, 64, 16,  0,  0,  0,  0, 33, 72,192,  0,
+/* 0x0540 */  35, 16, 48,  1, 35, 16, 69,  0,255,255, 66, 36, 36, 40,162,  0,
-/* 0x0550 */  32,  0,  8, 37,237,255, 97,  4, 36,128,164,  0, 35, 16, 48,  1,
+/* 0x0550 */  16,  0,227, 48,  3,  0, 96, 16,  8,  0,165,175,  8,  0,  0, 16,
-/* 0x0560 */  35, 16, 69,  0,255,255, 66, 36, 36, 40,162,  0, 16,  0,227, 48,
+/* 0x0560 */  12,  0,176,175,  8,  0,165,143, 33, 32,  0,  2, 33, 48,  0,  0,
-/* 0x0570 */   3,  0, 96, 16,  8,  0,165,175,  8,  0,  0, 16, 12,  0,176,175,
+/* 0x0570 */ 255,255,  8, 36, 10,255, 17,  4, 33, 72,  0,  0, 12,  0,162,175,
-/* 0x0580 */   8,  0,165,143, 33, 32,  0,  2, 33, 48,  0,  0,255,255,  8, 36,
+/* 0x0580 */  12,  0,162,143, 16,  0,160,175,133,  0,  0, 16, 35,184, 80,  0,
-/* 0x0590 */   3,255, 17,  4, 33, 72,  0,  0, 12,  0,162,175, 12,  0,165,143,
+/* 0x0590 */  12,  0,192, 19,  6,  0,  2, 36,  0,  0, 35,142,  0,  0,  0,  0,
-/* 0x05a0 */  16,  0,160,175,133,  0,  0, 16, 35,184,176,  0, 12,  0,192, 19,
+/* 0x05a0 */  10,  0, 98, 20,  1,  0,  2, 36,  8,  0, 38,142, 32,  0,164,143,
-/* 0x05b0 */   6,  0,  2, 36,  0,  0, 35,142,  0,  0,  0,  0, 10,  0, 98, 20,
+/* 0x05b0 */  33, 48,230,  2,150,255, 17,  4,  3,  0,  5, 36,116,  0,  0, 16,
-/* 0x05c0 */   1,  0,  2, 36,  8,  0, 38,142, 32,  0,164,143, 33, 48,230,  2,
+/* 0x05c0 */   0,  0,  0,  0,  0,  0, 35,142,  1,  0,  2, 36,112,  0, 98, 20,
-/* 0x05d0 */ 150,255, 17,  4,  3,  0,  5, 36,116,  0,  0, 16,  0,  0,  0,  0,
+/* 0x05d0 */   0,  0,  0,  0,  8,  0, 34,142, 24,  0, 35,142, 33,176,226,  2,
-/* 0x05e0 */   0,  0, 35,142,  1,  0,  2, 36,112,  0, 98, 20,  0,  0,  0,  0,
+/* 0x05e0 */  81,115,  2, 60,128, 24,  3,  0, 64, 98, 66, 52,  6, 16, 98,  0,
-/* 0x05f0 */   8,  0, 34,142, 24,  0, 35,142, 33,176,226,  2, 81,115,  2, 60,
+/* 0x05f0 */  20,  0,164,143, 16,  0, 42,142,  7,  0, 82, 48, 20,  0, 34,142,
-/* 0x0600 */ 128, 24,  3,  0, 64, 98, 66, 52,  6, 16, 98,  0, 20,  0,165,143,
+/* 0x0600 */  36, 24,196,  2, 24,  0,162,175, 33,152, 67,  1,124,  0,192, 19,
-/* 0x0610 */  16,  0, 36,142,  7,  0, 82, 48, 20,  0, 34,142, 36, 24,197,  2,
+/* 0x0610 */  35,160,195,  2,  2,  0, 70, 54,255,255,  8, 36, 18,  8,  7, 36,
-/* 0x0620 */   0,  0,164,175,  4,  0,182,175, 33,160,131,  0, 24,  0,162,175,
+/* 0x0620 */   4,  0, 41,142, 33, 32,128,  2, 35, 72, 35,  1, 33, 40, 96,  2,
-/* 0x0630 */ 122,  0,192, 19, 35,152,195,  2,  2,  0, 70, 54,255,255,  8, 36,
+/* 0x0630 */   0,  0,170,175,218,254, 17,  4,  4,  0,182,175, 64,  0,130, 22,
-/* 0x0640 */  18,  8,  7, 36,  4,  0, 41,142, 33, 32, 96,  2, 35, 72, 35,  1,
+/* 0x0640 */ 127,  0,  4, 36, 11,  0,192, 19,  4,  0, 66, 50,  4,  0, 64, 16,
-/* 0x0650 */ 211,254, 17,  4, 33, 40,128,  2, 64,  0, 98, 22,127,  0,  4, 36,
+/* 0x0650 */   0,  0,  0,  0, 40,  0,167,143,  2,  0,  0, 16,  0,  0,  0,  0,
-/* 0x0660 */  11,  0,192, 19,  4,  0, 66, 50,  4,  0, 64, 16,  0,  0,  0,  0,
+/* 0x0660 */  33, 56,  0,  0, 28,  0,166,143, 33, 32,192,  3,247,254, 17,  4,
-/* 0x0670 */  40,  0,167,143,  2,  0,  0, 16,  0,  0,  0,  0, 33, 56,  0,  0,
+/* 0x0670 */  33, 40,160,  3, 20,  0,164,143, 35, 16, 19,  0,  2,  0, 67, 50,
-/* 0x0680 */  28,  0,166,143, 33, 32,192,  3,240,254, 17,  4, 33, 40,160,  3,
+/* 0x0680 */   8,  0, 96, 16, 36,128, 68,  0,  6,  0,  0, 18, 33, 16,  0,  2,
-/* 0x0690 */  20,  0,164,143, 35, 16, 20,  0,  2,  0, 67, 50,  8,  0, 96, 16,
+/* 0x0690 */  33, 24,147,  2,255,255, 66, 36,  0,  0, 96,160,253,255, 64, 20,
-/* 0x06a0 */  36,128, 68,  0,  6,  0,  0, 18, 33, 24,116,  2, 33, 16,  0,  2,
+/* 0x06a0 */   1,  0, 99, 36, 43,  0,192, 19,  1,  0,  2, 36,  0,  0, 35,142,
-/* 0x06b0 */ 255,255, 66, 36,  0,  0, 96,160,253,255, 64, 20,  1,  0, 99, 36,
+/* 0x06b0 */   0,  0,  0,  0, 28,  0, 98, 20, 33, 32,128,  2, 24,  0, 34,142,
-/* 0x06c0 */  43,  0,192, 19,  1,  0,  2, 36,  0,  0, 35,142,  0,  0,  0,  0,
+/* 0x06c0 */   0,  0,  0,  0,  1,  0, 66, 48, 23,  0, 64, 16,  0,  0,  0,  0,
-/* 0x06d0 */  28,  0, 98, 20, 33, 32, 96,  2, 24,  0, 34,142,  0,  0,  0,  0,
+/* 0x06d0 */  20,  0, 36,142, 16,  0, 34,142,  8,  0, 35,142, 17,  0,130, 20,
-/* 0x06e0 */   1,  0, 66, 48, 24,  0, 64, 16, 33, 40,128,  2, 20,  0, 36,142,
+/* 0x06e0 */  33, 16,131,  0, 33, 48, 87,  0, 20,  0,163,143, 35, 16,  6,  0,
-/* 0x06f0 */  16,  0, 34,142,  8,  0, 35,142, 17,  0,130, 20, 33, 16,131,  0,
+/* 0x06f0 */  36, 16, 98,  0, 12,  0, 66, 44, 11,  0, 64, 20, 33, 32,128,  2,
-/* 0x0700 */  33, 48, 87,  0, 20,  0,165,143, 35, 16,  6,  0, 36, 16,162,  0,
+/* 0x0700 */  12,  0,  2, 36,  0,  0,194,172, 32,  3,  2, 60,  8,  0, 66, 52,
-/* 0x0710 */  12,  0, 66, 44, 11,  0, 64, 20, 33, 32, 96,  2, 12,  0,  2, 36,
+/* 0x0710 */  32,  0,164,143,  4,  0,194,172,  8,  0,192,172, 60,255, 17,  4,
-/* 0x0720 */   0,  0,194,172, 32,  3,  2, 60,  8,  0, 66, 52, 32,  0,164,143,
+/* 0x0720 */  33, 40,  0,  0, 33, 32,128,  2, 33, 40, 96,  2, 33, 48, 64,  2,
-/* 0x0730 */   4,  0,194,172,  8,  0,192,172, 60,255, 17,  4, 33, 40,  0,  0,
+/* 0x0730 */ 162,254, 17,  4, 29, 16,  2, 36,  6,  0, 64, 16,127,  0,  4, 36,
-/* 0x0740 */  33, 32, 96,  2, 33, 40,128,  2, 33, 48, 64,  2,155,254, 17,  4,
+/* 0x0740 */ 161, 15,  2, 36,157,254, 17,  4,  0,  0,  0,  0,255,255,  0, 16,
-/* 0x0750 */  29, 16,  2, 36,  6,  0, 64, 16,127,  0,  4, 36,161, 15,  2, 36,
+/* 0x0750 */   0,  0,  0,  0, 24,  0,164,143, 33, 16,112,  2, 33, 40,196,  2,
-/* 0x0760 */ 150,254, 17,  4,  0,  0,  0,  0,255,255,  0, 16,  0,  0,  0,  0,
+/* 0x0760 */  33,128,130,  2, 43, 16,  5,  2,  9,  0, 64, 16, 35, 40,176,  0,
-/* 0x0770 */  24,  0,163,143, 33, 16,144,  2, 33, 40,195,  2, 33,128, 98,  2,
+/* 0x0770 */  33, 48, 64,  2, 33, 32,  0,  2, 18,  8,  7, 36,255,255,  8, 36,
-/* 0x0780 */  43, 16,  5,  2,  9,  0, 64, 16, 35, 40,176,  0, 33, 48, 64,  2,
+/* 0x0780 */ 135,254, 17,  4, 33, 72,  0,  0,237,255,  2, 22,127,  0,  4, 36,
-/* 0x0790 */  33, 32,  0,  2, 18,  8,  7, 36,255,255,  8, 36,128,254, 17,  4,
+/* 0x0790 */  16,  0,162,143, 32,  0, 49, 38,  1,  0, 66, 36, 16,  0,162,175,
-/* 0x07a0 */  33, 72,  0,  0,237,255,  2, 22,127,  0,  4, 36, 16,  0,164,143,
+/* 0x07a0 */  44,  0,162,150, 16,  0,163,143,  0,  0,  0,  0, 42, 16, 98,  0,
-/* 0x07b0 */  32,  0, 49, 38,  1,  0,132, 36, 16,  0,164,175, 44,  0,162,150,
+/* 0x07b0 */ 119,255, 64, 20,  0,  0,  0,  0, 11,  0,192, 19,  3,  0,  2, 36,
-/* 0x07c0 */  16,  0,165,143,  0,  0,  0,  0, 42, 16,162,  0,119,255, 64, 20,
+/* 0x07c0 */  16,  0,163,150,  0,  0,  0,  0,  7,  0, 98, 16,  0,  0,  0,  0,
-/* 0x07d0 */   0,  0,  0,  0, 11,  0,192, 19,  3,  0,  2, 36, 16,  0,163,150,
+/* 0x07d0 */  12,  0,162,143,  8,  0,163,143,  0,  0,  0,  0, 33, 32, 67,  0,
-/* 0x07e0 */   0,  0,  0,  0,  7,  0, 98, 16,  0,  0,  0,  0, 12,  0,162,143,
+/* 0x07e0 */ 118,254, 17,  4,205, 15,  2, 36, 36,  0,164,143,  0,  0,  0,  0,
-/* 0x07f0 */   8,  0,163,143,  0,  0,  0,  0, 33, 32, 67,  0,111,254, 17,  4,
+/* 0x07f0 */   7,  0,128, 16,  0,  0,  0,  0,  5,  0,  0, 16,  0,  0,151,172,
-/* 0x0800 */ 205, 15,  2, 36, 36,  0,164,143,  0,  0,  0,  0,  7,  0,128, 16,
+/* 0x0800 */  28,  0,168,143, 33, 48, 64,  2,133,255,  0, 16, 18,  0,  7, 36,
-/* 0x0810 */   0,  0,  0,  0,  5,  0,  0, 16,  0,  0,151,172, 28,  0,168,143,
+/* 0x0810 */  24,  0,162,142, 84,  0,191,143, 33, 16,226,  2, 80,  0,190,143,
-/* 0x0820 */  33, 48, 64,  2,135,255,  0, 16, 18,  0,  7, 36, 24,  0,162,142,
+/* 0x0820 */  76,  0,183,143, 72,  0,182,143, 68,  0,181,143, 64,  0,180,143,
-/* 0x0830 */  84,  0,191,143, 33, 16,226,  2, 80,  0,190,143, 76,  0,183,143,
+/* 0x0830 */  60,  0,179,143, 56,  0,178,143, 52,  0,177,143, 48,  0,176,143,
-/* 0x0840 */  72,  0,182,143, 68,  0,181,143, 64,  0,180,143, 60,  0,179,143,
+/* 0x0840 */   8,  0,224,  3, 88,  0,189, 39,200,255,189, 39, 52,  0,191,175,
-/* 0x0850 */  56,  0,178,143, 52,  0,177,143, 48,  0,176,143,  8,  0,224,  3,
+/* 0x0850 */  48,  0,180,175, 44,  0,179,175, 40,  0,178,175, 36,  0,177,175,
-/* 0x0860 */  88,  0,189, 39,200,255,189, 39, 52,  0,191,175, 48,  0,180,175,
+/* 0x0860 */  32,  0,176,175, 33,128,  0,  1,  0,  0,136,140, 33, 24,160,  0,
-/* 0x0870 */  44,  0,179,175, 40,  0,178,175, 36,  0,177,175, 32,  0,176,175,
+/* 0x0870 */  33, 16,128,  0, 33,144,192,  0, 33,160,224,  0,  4,  0,165, 39,
-/* 0x0880 */  33,128,  0,  1,  0,  0,136,140, 33, 24,160,  0, 33, 16,128,  0,
+/* 0x0880 */  33, 56,  0,  0, 33, 48,  0,  2, 20,  0,164, 39, 20,  0,163,175,
-/* 0x0890 */  33,144,192,  0, 33,160,224,  0,  4,  0,165, 39, 33, 56,  0,  0,
+/* 0x0890 */  33,136, 32,  1, 12,  0,163,175,  4,  0,168,175, 24,  0,162,175,
-/* 0x08a0 */  33, 48,  0,  2, 20,  0,164, 39, 20,  0,163,175, 33,136, 32,  1,
+/* 0x08a0 */  16,  0,162,175,105,254, 17,  4,  8,  0,178,175, 44,  0, 70,150,
-/* 0x08b0 */  12,  0,163,175,  4,  0,168,175, 24,  0,162,175, 16,  0,162,175,
+/* 0x08b0 */  33, 32,128,  2,214,254, 17,  4,  5,  0,  5, 36, 42,  0, 70,150,
-/* 0x08c0 */  98,254, 17,  4,  8,  0,178,175, 44,  0, 70,150, 33, 32,128,  2,
+/* 0x08c0 */  33, 32,128,  2,  4,  0,  5, 36,209,254, 17,  4, 52,  0, 83, 38,
-/* 0x08d0 */ 214,254, 17,  4,  5,  0,  5, 36, 42,  0, 70,150, 33, 32,128,  2,
+/* 0x08d0 */   8,  0,102,142, 33, 32,128,  2, 52,  0,198, 36,204,254, 17,  4,
-/* 0x08e0 */   4,  0,  5, 36,209,254, 17,  4, 52,  0, 83, 38,  8,  0,102,142,
+/* 0x08e0 */   3,  0,  5, 36, 33, 72, 32,  2, 33, 32,  0,  2, 33, 40, 64,  2,
-/* 0x08f0 */  33, 32,128,  2, 52,  0,198, 36,204,254, 17,  4,  3,  0,  5, 36,
+/* 0x08f0 */  12,  0,166, 39, 33, 56,128,  2,209,254, 17,  4, 33, 64,160,  3,
-/* 0x0900 */  33, 72, 32,  2, 33, 32,  0,  2, 33, 40, 64,  2, 12,  0,166, 39,
+/* 0x0900 */  33, 48, 64,  0, 33, 32,128,  2,  9,  0,  5, 36,192,254, 17,  4,
-/* 0x0910 */  33, 56,128,  2,209,254, 17,  4, 33, 64,160,  3, 33, 48, 64,  0,
+/* 0x0910 */  33,136, 64,  0, 44,  0, 69,150, 42,  0,  0, 16, 33, 32,  0,  0,
-/* 0x0920 */  33, 32,128,  2,  9,  0,  5, 36,192,254, 17,  4, 33,136, 64,  0,
+/* 0x0920 */   0,  0, 99,142,  3,  0,  2, 36, 38,  0, 98, 20, 32,  0,115, 38,
-/* 0x0930 */  44,  0, 69,150, 42,  0,  0, 16, 33, 32,  0,  0,  0,  0, 99,142,
+/* 0x0930 */ 224,255,115, 38,  8,  0, 98,142,  0,  0,164,143, 33, 40,  0,  0,
-/* 0x0940 */   3,  0,  2, 36, 38,  0, 98, 20, 32,  0,115, 38,224,255,115, 38,
+/* 0x0940 */  33, 32, 68,  0, 33, 48,  0,  0, 28,254, 17,  4,165, 15,  2, 36,
-/* 0x0950 */   8,  0, 98,142,  0,  0,164,143, 33, 40,  0,  0, 33, 32, 68,  0,
+/* 0x0950 */   9,  0, 64,  4, 33,128, 64,  0, 33, 32, 64,  0, 33, 40, 64,  2,
-/* 0x0960 */  33, 48,  0,  0, 21,254, 17,  4,165, 15,  2, 36,  9,  0, 64,  4,
+/* 0x0960 */   0,  2,  6, 36, 21,254, 17,  4,163, 15,  2, 36,  0,  2,  3, 36,
-/* 0x0970 */  33,128, 64,  0, 33, 32, 64,  0, 33, 40, 64,  2,  0,  2,  6, 36,
+/* 0x0970 */   6,  0, 67, 16, 33, 56,128,  2,127,  0,  4, 36, 15,254, 17,  4,
-/* 0x0980 */  14,254, 17,  4,163, 15,  2, 36,  0,  2,  3, 36,  6,  0, 67, 16,
+/* 0x0980 */ 161, 15,  2, 36,255,255,  0, 16,  0,  0,  0,  0, 33, 64,160,  3,
-/* 0x0990 */  33, 56,128,  2,127,  0,  4, 36,  8,254, 17,  4,161, 15,  2, 36,
+/* 0x0990 */  33, 72,  0,  0,170,254, 17,  4, 33, 48,  0,  0,  0,  0,166,143,
-/* 0x09a0 */ 255,255,  0, 16,  0,  0,  0,  0, 33, 64,160,  3, 33, 72,  0,  0,
+/* 0x09a0 */  33, 32,128,  2,  7,  0,  5, 36,153,254, 17,  4, 33,136, 64,  0,
-/* 0x09b0 */ 170,254, 17,  4, 33, 48,  0,  0,  0,  0,166,143, 33, 32,128,  2,
+/* 0x09b0 */  33, 32,  0,  2,  1,254, 17,  4,166, 15,  2, 36,  5,  0,  0, 16,
-/* 0x09c0 */   7,  0,  5, 36,153,254, 17,  4, 33,136, 64,  0, 33, 32,  0,  2,
+/* 0x09c0 */  33, 16, 32,  2, 42, 16,133,  0,213,255, 64, 20,  1,  0,132, 36,
-/* 0x09d0 */ 250,253, 17,  4,166, 15,  2, 36,  5,  0,  0, 16, 33, 16, 32,  2,
+/* 0x09d0 */  33, 16, 32,  2, 52,  0,191,143, 48,  0,180,143, 44,  0,179,143,
-/* 0x09e0 */  42, 16,133,  0,213,255, 64, 20,  1,  0,132, 36, 33, 16, 32,  2,
+/* 0x09e0 */  40,  0,178,143, 36,  0,177,143, 32,  0,176,143,  8,  0,224,  3,
-/* 0x09f0 */  52,  0,191,143, 48,  0,180,143, 44,  0,179,143, 40,  0,178,143,
+/* 0x09f0 */  56,  0,189, 39
-/* 0x0a00 */  36,  0,177,143, 32,  0,176,143,  8,  0,224,  3, 56,  0,189, 39
 };

src/stub/scripts/UNUSED/bin2h.pl

@@ -48,7 +48,7 @@ binmode(INFILE);
 # check file size
 @st = stat($ifile);
 if (1 && $st[7] <= 0) {
-    print STDERR "$ifile: ERROR: emtpy file\n";
+    print STDERR "$ifile: ERROR: empty file\n";
     exit(1);
 }
 if (1 && $st[7] > 64*1024) {

src/stub/scripts/bin2h.py

@@ -284,7 +284,7 @@ def main(argv):
     # check file size
     st = os.stat(ifile)
     if 1 and st.st_size <= 0:
-        print >> sys.stderr, "%s: ERROR: emtpy file" % (ifile)
+        print >> sys.stderr, "%s: ERROR: empty file" % (ifile)
         sys.exit(1)
     if 1 and st.st_size > 128*1024:
         print >> sys.stderr, "%s: ERROR: file is too big (%d bytes)" % (ifile, st.st_size)

src/stub/src/amd64-darwin.macho-main.c

@@ -76,7 +76,7 @@ xread(Extent *x, void *buf, size_t count)
 #define ERR_LAB error: exit(127);
 #define err_exit(a) goto error
 #else  //}{  save debugging time
-#define ERR_LAB
+#define ERR_LAB /*empty*/
 static void
 err_exit(int a)
 {

src/stub/src/amd64-linux.elf-entry.S

@@ -261,6 +261,8 @@ unfold:
         je L80  // no copy
         addl      %edx,%ebp  // update &decompress
         //addl      %edx,%ebx  // copy==>no overlap; unfolded before overwrite
+        addl      %edx,1*8(%rsp)  // update ADRX  XXX: 4GB
+        addl      %edx,3*8(%rsp)  // update ADRU  XXX: 4GB
         movl %ebx,%ecx  // XXX: 4GB  [&b_info] beyond end of decompressor
         subl %esi,%ecx  // byte length
         shrl $3,%ecx  // qwords to copy

src/stub/src/amd64-linux.elf-main.c

@@ -78,7 +78,7 @@ xread(Extent *x, char *buf, size_t count)
 #define ERR_LAB error: exit(127);
 #define err_exit(a) goto error
 #else  //}{  save debugging time
-#define ERR_LAB
+#define ERR_LAB /*empty*/
 static void
 err_exit(int a)
 {

src/stub/src/arch/i086/lzma_d.S

@@ -102,7 +102,7 @@ section LZMA_DEC00
     ignore_reloc_overflow lzma_properties
 
 
-#define ret
+#define ret /*empty*/
 section LZMA_DEC10
 .arch   i8086, nojumps
 #define SMALL 1

src/stub/src/arch/mips/r3000/bits.ash

@@ -32,7 +32,7 @@
 
 
 #ifndef _MR3K_STD_CONF_
-#define _MR3K_STD_CONF_
+#define _MR3K_STD_CONF_ 1
 
 #define  JOHN       1
 #define  ALT_SMALL  1

src/stub/src/arch/mips/r3000/macros.ash

@@ -83,7 +83,7 @@
 .endm
 
 #ifndef DEBUG
-#   define PRINT(str)
+#   define PRINT(str)   /*empty*/
 #else
-#   define PRINT(str)  .print str
+#   define PRINT(str)   .print str
 #endif

src/stub/src/arch/powerpc/32/ppc_regs.h

@@ -1,5 +1,5 @@
 #ifndef __PPC_REGS__  /*{*/
-#define __PPC_REGS__
+#define __PPC_REGS__ 1
 
 #define r0 0
 #define r1 1

src/stub/src/arch/powerpc/32/regs.h

@@ -1,46 +0,0 @@
-#ifndef __PPC_REGS__  /*{*/
-#define __PPC_REGS__
-
-#define r0 0
-#define r1 1
-#define r2 2
-
-#define r29 29
-#define r30 30
-#define r31 31
-
-/* Stack pointer */
-#define sp 1
-
-/* Subroutine arguments; not saved by callee */
-#define a0 3
-#define a1 4
-#define a2 5
-#define a3 6
-#define a4 7
-#define a5 8
-#define a6 9
-#define a7 10
-
-/* Scratch (temporary) registers; not saved by callee */
-#define t0  2
-#define t1 11
-#define t2 12
-#define t3 13
-
-/* branch and link */
-#define call bl
-
-/* branch to link register */
-#define ret  blr
-
-/* move register */
-#define movr mr
-
-#endif  /*} __PPC_REGS__ */
-
-
-/*
-vi:ts=4:et:nowrap
-*/
-

src/stub/src/arm-darwin.macho-main.c

@@ -79,7 +79,7 @@ xread(Extent *x, void *buf, size_t count)
 #define ERR_LAB error: exit(127);
 #define err_exit(a) goto error
 #else  //}{  save debugging time
-#define ERR_LAB
+#define ERR_LAB /*empty*/
 static void
 err_exit(int a)
 {

src/stub/src/arm.v4a-wince.pe.S

@@ -38,9 +38,9 @@
 
 #define DEBUG 0
 #if DEBUG == 0
-# define DINIT
+# define DINIT      /*empty*/
-# define DDUMP(x)
+# define DDUMP(x)   /*empty*/
-# define DDONE
+# define DDONE      /*empty*/
 #else
  #define DDUMP(x)   stmfd sp!, {r0 - r3}; mov  r0, x; mov lr, pc; mov pc, r8; ldmia sp!, {r0 - r3}
  #if DEBUG == 1
@@ -48,10 +48,10 @@
  #define DDONE      mov  pc, lr
  #elif DEBUG == 2
  #define DINIT      adr  r8, writefile
- #define DDONE
+ #define DDONE      /*empty*/
  #elif DEBUG == 3
  #define DINIT      adr  r8, DelFile
- #define DDONE
+ #define DDONE      /*empty*/
  #endif
 #endif
 

src/stub/src/i386-bsd.elf-entry.S

@@ -41,7 +41,7 @@
 
 section LEXEC000
 _start: .globl _start
-////    int3
+////    nop; int3
 /*
 ;; How to debug this code:  Uncomment the 'int3' breakpoint instruction above.
 ;; Build the stubs and upx.  Compress a testcase, such as a copy of /bin/date.
@@ -135,8 +135,7 @@ section LEXEC020
 #define PROT_READ      1
 #define PROT_WRITE     2
 #define PROT_EXEC      4
-#define __NR_mmap    197
+#define SYS_mmap     477
-#define __NR_syscall 198
 #define szElf32_Ehdr 0x34
 #define p_memsz  5*4
 
@@ -179,24 +178,24 @@ unfold:
         add eax,   PAGE_SIZE -1
         and eax, 0-PAGE_SIZE
 
+section LUNMP000
+        push 0  // 0-page bread crumb
+section LUNMP001
+        push 1  // 1-page bread crumb
+section LEXEC025
         push eax  // destination for 'ret'
 
                 // mmap a page to hold the decompressed fold_elf86
         xor ecx, ecx  // %ecx= 0
-        // MAP_ANONYMOUS ==>offset is ignored, so do not push!
+        push ecx; push ecx  // 64-bit offset
-        push ecx  // pad (must be zero?)
         push -1  // *BSD demands -1==fd for mmap(,,,MAP_ANON,,)
         push MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS
         mov ch, PAGE_SIZE >> 8  // %ecx= PAGE_SIZE
         push PROT_READ | PROT_WRITE | PROT_EXEC
         push ecx  // length
         push eax  // destination
-        xor eax,eax  // 0
-        push eax  // current thread
-        mov al, __NR_mmap
-        push eax  // __NR_mmap
         push eax  // fake return address
-        mov al, __NR_syscall
+        mov eax, SYS_mmap
         int 0x80  // changes only %eax; %edx is live
         jb fail_mmap
         xchg eax, edx  // %edx= page after .text; %eax= &Elf32_Ehdr of this program
@@ -215,7 +214,8 @@ unfold:
         mov [4*3 + esp],eax
         push esi  // &compressed_data
         call ebp  // decompress(&src, srclen, &dst, &dstlen, b_info.misc)
-        add esp, (5+1 + 9)*4  // (5+1) args to decompress, 9 "args" to mmap
+        add esp, (5+1 + 8)*4  // (5+1) args to decompress, 8 "args" to mmap
+
         ret      // &destination
 main:
         pop ebp  // &decompress

src/stub/src/i386-bsd.elf-fold.S

@@ -128,6 +128,9 @@ L53:
         pop ecx  // end of unmap region
         pop ebx  // start of unmap region (&Elf32_Ehdr of this stub)
         add esp, MAX_ELF_HDR + OVERHEAD  // un-alloca
+        pop edx  // bread crumb size in pages
+        shl edx,12
+        add ebx,edx  // start of unmap region
 
         push eax  // save entry address as ret.addr
         push 0  // 'leave' uses this to clear ebp

src/stub/src/i386-bsd.elf-main.c

@@ -167,7 +167,7 @@ xread(struct Extent *x, char *buf, size_t count)
 #define ERR_LAB error: exit(127);
 #define err_exit(a) goto error
 #else  //}{  save debugging time
-#define ERR_LAB
+#define ERR_LAB /*empty*/
 static void
 err_exit(int a) __attribute__ ((__noreturn__));
 {
@@ -368,6 +368,8 @@ auxv_up(Elf32_auxv_t *av, unsigned const type, unsigned const value)
         ) >> ((pf & (PF_R|PF_W|PF_X))<<2) ))
 
 
+#define MAP_ANON_FD -1
+
 // Find convex hull of PT_LOAD (the minimal interval which covers all PT_LOAD),
 // and mmap that much, to be sure that a kernel using exec-shield-randomize
 // won't place the first piece in a way that leaves no room for the rest.
@@ -396,7 +398,7 @@ xfind_pages(unsigned mflags, Elf32_Phdr const *phdr, int phnum,
     lo   -= ~PAGE_MASK & lo;  // round down to page boundary
     hi    =  PAGE_MASK & (hi - lo - PAGE_MASK -1);  // page length
     szlo  =  PAGE_MASK & (szlo    - PAGE_MASK -1);  // page length
-    addr = mmap((void *)lo, hi, PROT_NONE, mflags, -1, 0);
+    addr = mmap((void *)lo, hi, PROT_NONE, mflags, MAP_ANON_FD, 0);
     *p_brk = hi + addr;  // the logical value of brk(0)
     //mprotect(szlo + addr, hi - szlo, PROT_NONE);  // no access, but keep the frames!
     return (unsigned long)addr - lo;
@@ -430,14 +432,18 @@ do_xmap(int const fdi, Elf32_Ehdr const *const ehdr, struct Extent *const xi,
         mlen += frag;
         addr -= frag;
 
-        if (addr != mmap(addr, mlen
+        if (addr != (xi
+            ? mmap(addr, mlen
 #if defined(__i386__)  /*{*/
-            // Decompressor can overrun the destination by 3 bytes.
+                    // Decompressor can overrun the destination by 3 bytes.
-            + (xi ? 3 : 0)
+                    + 3
 #endif  /*}*/
-                , prot | (xi ? PROT_WRITE : 0),
+                , prot | PROT_WRITE, MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS,
-                MAP_FIXED | MAP_PRIVATE | (xi ? MAP_ANONYMOUS : 0),
+                MAP_ANON_FD , 0 )
-                (xi ? -1 : fdi), phdr->p_offset - frag) ) {
+            : mmap(addr, mlen
+                , prot,              MAP_FIXED | MAP_PRIVATE,
+                fdi,          phdr->p_offset - frag) ))
+        {
             err_exit(8);
         }
         if (xi) {
@@ -473,7 +479,7 @@ ERR_LAB
         addr += mlen + frag;  /* page boundary on hi end */
         if (addr < haddr) { // need pages for .bss
             if (addr != mmap(addr, haddr - addr, prot,
-                    MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0 ) ) {
+                    MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, MAP_ANON_FD, 0 ) ) {
                 err_exit(9);
             }
         }

src/stub/src/i386-bsd.elf.execve-main.c

@@ -37,7 +37,7 @@
 **************************************************************************/
 
 // mmap() the temporary output file
-#define USE_MMAP_FO
+#define USE_MMAP_FO 1
 
 
 /*************************************************************************
@@ -50,7 +50,7 @@ struct Extent {
 };
 
 
-#if !defined(USE_MMAP_FO)
+#if !(USE_MMAP_FO)
 #if 1
 static __inline__ int xwrite(int fd, const void *buf, int count)
 {
@@ -322,7 +322,7 @@ void upx_main(
     }
 
     // Create the temporary output file.
-#if defined(USE_MMAP_FO)
+#if (USE_MMAP_FO)
     fdo = open(tmpname, O_RDWR | O_CREAT | O_EXCL, 0700);
 #else
     fdo = open(tmpname, O_WRONLY | O_CREAT | O_EXCL, 0700);
@@ -342,7 +342,7 @@ void upx_main(
     // ----- Step 3: setup memory -----
     //
 
-#if defined(USE_MMAP_FO)
+#if (USE_MMAP_FO)
     // FIXME: packer could set length
     buf = (unsigned char *)mmap(0, header.p_filesize,
         PROT_READ | PROT_WRITE, MAP_SHARED, fdo, 0);
@@ -413,7 +413,7 @@ void upx_main(
         else
         {
             // Incompressible block
-#if defined(USE_MMAP_FO)
+#if (USE_MMAP_FO)
             //memcpy(buf, xi.buf, h.sz_unc);
             register unsigned long int __d0, __d1, __d2;
             __asm__ __volatile__( "rep; movsb"
@@ -423,7 +423,7 @@ void upx_main(
 #endif
         }
 
-#if defined(USE_MMAP_FO)
+#if (USE_MMAP_FO)
         // unmap part of the output
         munmap(buf, h.sz_unc);
         buf     += h.sz_unc;
@@ -455,7 +455,7 @@ void upx_main(
     //
 
 
-#if !defined(USE_MMAP_FO)
+#if !(USE_MMAP_FO)
     // Free our temporary decompression buffer.
     munmap(buf, malloc_args.ma_length);
 #endif

src/stub/src/i386-darwin.macho-main.c

@@ -76,7 +76,7 @@ xread(Extent *x, char *buf, size_t count)
 #define ERR_LAB error: exit(127);
 #define err_exit(a) goto error
 #else  //}{  save debugging time
-#define ERR_LAB
+#define ERR_LAB /*empty*/
 static void
 err_exit(int a)
 {

src/stub/src/i386-linux.elf-entry.S

@@ -127,7 +127,8 @@ section LEXEC017
 
 section LEXEC020
 
-#define PAGE_SIZE ( 1<<12)
+#define PAGE_SHIFT 12
+#define PAGE_SIZE ( 1 << PAGE_SHIFT)
 
 #define MAP_FIXED     0x10
 #define MAP_PRIVATE   0x02
@@ -180,6 +181,38 @@ unfold:
         add eax,   PAGE_SIZE -1
         and eax, 0-PAGE_SIZE
 
+section LEXECDYN
+// VDSO might be at [eax]; if so, then erase AT_SYSINFO and AT_SYSINFO_EHDR.
+// This happens with some kernels (Linux-2.6.34) for ET_DYN when stack is
+// unlimited (ulimit -s unlimited), because the only PT_LOAD of compressed
+// ET_DYN is placed at TASK_UNMAPPED_BASE (TASK_SIZE/3, typically 0x40000000)
+// and VDSO follows.  When stack is limited, then allocation is from high
+// (just below stack) to low: VDSO will be below our PT_LOAD, and mmap()
+// below will steal the lowest page of stack.
+        pop ecx; push ecx  // argc
+        push esi
+        push eax
+        lea esi,[esp + 4*ecx + (3+1)*4]  // &env
+1:
+        lodsd; test eax,eax; jne 1b  // skip env
+2:
+        lodsd; test eax,eax; je 5f  // done with auxv
+AT_IGNORE=  1
+AT_SYSINFO= 32
+AT_SYSINFO_EHDR=33
+        subb al,AT_SYSINFO
+        cmpb al,AT_SYSINFO_EHDR - AT_SYSINFO
+        lodsd
+        ja 2b  // not AT_SYSINFO*
+        xor eax,[esp]
+        shr eax,PAGE_SHIFT
+        jne 2b  // no conflict with decompressed fold_elf86
+        movb [esi - 2*4],AT_IGNORE
+        jmp 2b
+5:
+        pop eax
+        pop esi
+
 section LUNMP000
         push 0  // 0-page bread crumb
 section LUNMP001