From eaa463e1c924125d06493a721cd07f27ebfc22d8 Mon Sep 17 00:00:00 2001 From: John Reiser Date: Sun, 23 Apr 2006 20:51:38 +0000 Subject: [PATCH] Insert copyright notice (equivalent to ident_s.ash) into stub by hand because buildLoader is not fully working yet l_lx_elf64amd.S l_lx_elfppc32.S l_mac_ppc32.S committer: jreiser 1145825498 +0000 --- src/stub/l_lx_elf64amd.S | 2 ++ src/stub/l_lx_elf64amd.h | 39 ++++++++++++++++++++++----------------- src/stub/l_lx_elfppc32.S | 4 ++++ src/stub/l_lx_elfppc32.h | 39 ++++++++++++++++++++++----------------- src/stub/l_mac_ppc32.S | 4 ++++ src/stub/l_mac_ppc32.h | 27 ++++++++++++++++----------- 6 files changed, 70 insertions(+), 45 deletions(-) diff --git a/src/stub/l_lx_elf64amd.S b/src/stub/l_lx_elf64amd.S index b428376a..67275cad 100644 --- a/src/stub/l_lx_elf64amd.S +++ b/src/stub/l_lx_elf64amd.S @@ -169,6 +169,8 @@ eof: pop %rbx; pop %rbp ret +/* Temporary until we get the buildLoader stuff working ... */ + .asciz "\n$Id$\n" /* These from /usr/include/asm-x86_64/unistd.h */ __NR_write = 1 diff --git a/src/stub/l_lx_elf64amd.h b/src/stub/l_lx_elf64amd.h index 0103e5f5..b01a7395 100644 --- a/src/stub/l_lx_elf64amd.h +++ b/src/stub/l_lx_elf64amd.h @@ -1,4 +1,4 @@ -/* l_lx_elf64amd.h -- created from l_lx_elf64amd.bin, 616 (0x268) bytes +/* l_lx_elf64amd.h -- created from l_lx_elf64amd.bin, 696 (0x2b8) bytes This file is part of the UPX executable compressor. @@ -27,12 +27,12 @@ */ -#define LINUX_ELF64AMD_LOADER_SIZE 616 -#define LINUX_ELF64AMD_LOADER_ADLER32 0x3d3a267e -#define LINUX_ELF64AMD_LOADER_CRC32 0x323363cd +#define LINUX_ELF64AMD_LOADER_SIZE 696 +#define LINUX_ELF64AMD_LOADER_ADLER32 0x5f8e3dec +#define LINUX_ELF64AMD_LOADER_CRC32 0x2f447d28 -unsigned char linux_elf64amd_loader[616] = { -232, 93, 2, 0, 0, 85, 83, 81, 82, 72, 1,254, 86, 72,137,254, /* 0x 0 */ +unsigned char linux_elf64amd_loader[696] = { +232,173, 2, 0, 0, 85, 83, 81, 82, 72, 1,254, 86, 72,137,254, /* 0x 0 */ 72,137,215, 49,219, 49,201, 72,131,205,255,232,129, 1, 0, 0, /* 0x 10 */ 1,219,116, 2,243,195,139, 30, 72,131,238,252, 17,219,138, 22, /* 0x 20 */ 243,195, 72,141, 4, 47,131,249, 5,138, 16,118, 33, 72,131,253, /* 0x 30 */ @@ -60,15 +60,20 @@ unsigned char linux_elf64amd_loader[616] = { 237, 72,129,253, 0,243,255,255, 17,193,232,147,254,255,255,235, /* 0x 190 */ 135,252, 65, 91, 65,131,248, 8, 15,132,202,254,255,255, 65,131, /* 0x 1a0 */ 248, 2, 15,132,112,255,255,255, 89, 72,137,240, 72, 41,200, 90, /* 0x 1b0 */ - 72, 41,215, 89,137, 57, 91, 93,195,104, 25, 0, 0, 0, 90,232, /* 0x 1c0 */ - 25, 0, 0, 0, 83, 69, 76,105,110,117,120, 32,100,101,110,105, /* 0x 1d0 */ -101,100, 32,101,120,101, 99,109,101,109, 46, 10, 0, 94,106, 2, /* 0x 1e0 */ - 95,106, 1, 88, 15, 5,106,127, 95,106, 60, 88, 15, 5, 91,191, /* 0x 1f0 */ - 65, 68, 82, 77,106, 7, 90,190, 76, 69, 78, 77,106, 50, 65, 90, /* 0x 200 */ - 69, 41,192,106, 9, 88, 15, 5, 57,199,117,173,104, 74, 77, 80, /* 0x 210 */ - 85,104, 65, 68, 82, 85,190, 65, 68, 82, 67,104, 76, 69, 78, 85, /* 0x 220 */ -185, 67, 78, 84, 67,104, 65, 68, 82, 88,104, 76, 69, 78, 88,137, /* 0x 230 */ -250, 41,242, 1,213, 1,211,252,243, 72,165,151,137,222, 80,146, /* 0x 240 */ -173, 80, 72,137,225,173,151,173, 68, 15,182,192,135,254,255,213, /* 0x 250 */ - 89,195, 93,232,150,255,255,255 /* 0x 260 */ + 72, 41,215, 89,137, 57, 91, 93,195, 10, 36, 73,100, 58, 32, 85, /* 0x 1c0 */ + 80, 88, 32, 40, 67, 41, 32, 49, 57, 57, 54, 45, 50, 48, 48, 54, /* 0x 1d0 */ + 32,116,104,101, 32, 85, 80, 88, 32, 84,101, 97,109, 46, 32, 65, /* 0x 1e0 */ +108,108, 32, 82,105,103,104,116,115, 32, 82,101,115,101,114,118, /* 0x 1f0 */ +101,100, 46, 32,104,116,116,112, 58, 47, 47,117,112,120, 46,115, /* 0x 200 */ +102, 46,110,101,116, 32, 36, 10, 0,104, 25, 0, 0, 0, 90,232, /* 0x 210 */ + 25, 0, 0, 0, 83, 69, 76,105,110,117,120, 32,100,101,110,105, /* 0x 220 */ +101,100, 32,101,120,101, 99,109,101,109, 46, 10, 0, 94,106, 2, /* 0x 230 */ + 95,106, 1, 88, 15, 5,106,127, 95,106, 60, 88, 15, 5, 91,191, /* 0x 240 */ + 65, 68, 82, 77,106, 7, 90,190, 76, 69, 78, 77,106, 50, 65, 90, /* 0x 250 */ + 69, 41,192,106, 9, 88, 15, 5, 57,199,117,173,104, 74, 77, 80, /* 0x 260 */ + 85,104, 65, 68, 82, 85,190, 65, 68, 82, 67,104, 76, 69, 78, 85, /* 0x 270 */ +185, 67, 78, 84, 67,104, 65, 68, 82, 88,104, 76, 69, 78, 88,137, /* 0x 280 */ +250, 41,242, 1,213, 1,211,252,243, 72,165,151,137,222, 80,146, /* 0x 290 */ +173, 80, 72,137,225,173,151,173, 68, 15,182,192,135,254,255,213, /* 0x 2a0 */ + 89,195, 93,232,150,255,255,255 /* 0x 2b0 */ }; diff --git a/src/stub/l_lx_elfppc32.S b/src/stub/l_lx_elfppc32.S index 90b96b4b..f298cff3 100644 --- a/src/stub/l_lx_elfppc32.S +++ b/src/stub/l_lx_elfppc32.S @@ -54,6 +54,10 @@ __NR_mmap= 90 PAGE_SHIFT= 12 PAGE_SIZE = -(~0<