jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'devel' into jreiser

Browse Source 
Conflicts:
	src/p_lx_elf.cpp
	src/stub/src/amd64-linux.elf-entry.S
	src/stub/src/amd64-linux.elf-main.c
	src/stub/src/arm.v4a-linux.elf-entry.S
	src/stub/src/arm.v4a-linux.elf-fold.S
	src/stub/src/arm64-linux.elf-entry.S
	src/stub/src/arm64-linux.elf-fold.S
	src/stub/src/i386-linux.elf-fold.S
	src/stub/src/powerpc-darwin.macho-entry.S
	src/stub/src/powerpc-linux.elf-fold.S
	src/stub/src/powerpc64le-darwin.macho-entry.S
	src/stub/src/powerpc64le-linux.elf-entry.S
	src/stub/src/powerpc64le-linux.elf-fold.S
	src/stub/src/powerpc64le-linux.elf-main.c

 Changes to be committed:
	modified:   ../.github/ISSUE_TEMPLATE.md
	modified:   ../.github/travis_build.sh
	modified:   ../.github/travis_deploy.sh
	modified:   ../.github/travis_init.sh
	modified:   ../.github/travis_testsuite_1.sh
	modified:   ../.gitignore
	modified:   ../.travis.yml
	modified:   ../NEWS
	modified:   c_screen.cpp
	modified:   file.cpp
	modified:   help.cpp
	modified:   linker.cpp
	modified:   main.cpp
	modified:   p_lx_elf.cpp
	modified:   packer.cpp
	modified:   s_djgpp2.cpp
	modified:   stub/src/amd64-linux.elf-main.c
	modified:   stub/src/arm.v4a-linux.elf-entry.S
	modified:   stub/src/arm.v4a-linux.elf-fold.S
	modified:   stub/src/arm64-linux.elf-entry.S
	modified:   stub/src/arm64-linux.elf-fold.S
	modified:   stub/src/i386-linux.elf-main.c
	modified:   stub/src/powerpc-darwin.dylib-entry.S
	modified:   stub/src/powerpc-darwin.macho-entry.S
	modified:   stub/src/powerpc-darwin.macho-fold.S
	modified:   stub/src/powerpc-linux.elf-fold.S
	modified:   stub/src/powerpc64le-darwin.dylib-entry.S
	modified:   stub/src/powerpc64le-darwin.macho-entry.S
	modified:   stub/src/powerpc64le-darwin.macho-fold.S
	modified:   stub/src/powerpc64le-linux.elf-entry.S
	modified:   stub/src/powerpc64le-linux.elf-fold.S
	modified:   stub/src/powerpc64le-linux.elf-main.c
	modified:   ui.cpp
	modified:   util.cpp
	modified:   work.cpp
	[plus *.h, *.dump, *.map]
This commit is contained in:
John Reiser
2017-05-08 14:21:31 -07:00
parent 6e2a41cb26 082dd7d5ee
commit 955206aaf0
71 changed files with 5478 additions and 5396 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stub/powerpc64le-darwin.macho-entry.h
+3 -3
View File
@@ -32,8 +32,8 @@
#define STUB_POWERPC64LE_DARWIN_MACHO_ENTRY_SIZE 11623
#define STUB_POWERPC64LE_DARWIN_MACHO_ENTRY_ADLER32 0xb1221278
#define STUB_POWERPC64LE_DARWIN_MACHO_ENTRY_CRC32 0xf500812b
#define STUB_POWERPC64LE_DARWIN_MACHO_ENTRY_ADLER32 0x804712f9
#define STUB_POWERPC64LE_DARWIN_MACHO_ENTRY_CRC32 0x48e60fc5
unsigned char stub_powerpc64le_darwin_macho_entry[11623] = {
/* 0x0000 */ 127, 69, 76, 70, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -577,7 +577,7 @@ unsigned char stub_powerpc64le_darwin_macho_entry[11623] = {
/* 0x21a0 */ 12, 0,139,128,166, 3,137,124, 8, 0,203,128, 16, 0,235,136,
/* 0x21b0 */ 20, 90,164,124, 20, 0,165, 56, 20, 90,102,124,192, 0, 99, 56,
/* 0x21c0 */ 255,255, 5,140,255,255, 3,156,248,255, 32, 67,166, 3,233,127,
/* 0x21d0 */ 128, 0,171, 56,248,255,193,248,248,255,193, 56,208,255, 33, 56,
/* 0x21d0 */ 128, 0,171, 56,248,255,193,248,248,255,193, 56,145,255, 33,248,
/* 0x21e0 */ 32, 4,128, 78,166, 2,232,127,181,255,255, 75,128, 0, 0, 72,
/* 0x21f0 */ 0, 0, 0, 0,102,105,108,101, 32,102,111,114,109, 97,116, 32,
/* 0x2200 */ 101,108,102, 54, 52, 45,112,111,119,101,114,112, 99,108,101, 10,