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/powerpc-darwin.macho-entry.h
+3 -3
View File
@@ -32,8 +32,8 @@
#define STUB_POWERPC_DARWIN_MACHO_ENTRY_SIZE 8924
#define STUB_POWERPC_DARWIN_MACHO_ENTRY_ADLER32 0x067719e1
#define STUB_POWERPC_DARWIN_MACHO_ENTRY_CRC32 0x1ea12920
#define STUB_POWERPC_DARWIN_MACHO_ENTRY_ADLER32 0xc5741a3d
#define STUB_POWERPC_DARWIN_MACHO_ENTRY_CRC32 0xb1818d3a
unsigned char stub_powerpc_darwin_macho_entry[8924] = {
/* 0x0000 */ 127, 69, 76, 70, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -427,7 +427,7 @@ unsigned char stub_powerpc_darwin_macho_entry[8924] = {
/* 0x1840 */ 136,236, 0, 16,124,164, 98, 20, 56,165, 0, 16,124,102, 98, 20,
/* 0x1850 */ 56, 99, 0,192,140, 5,255,255,156, 3,255,255, 66, 0,255,248,
/* 0x1860 */ 127,233, 3,166, 56,172, 0,128,144,193,255,252, 56,193,255,252,
/* 0x1870 */ 56, 33,255,232, 78,128, 4, 32,127,232, 2,166, 75,255,255,181,
/* 0x1870 */ 148, 33,255,232, 78,128, 4, 32,127,232, 2,166, 75,255,255,181,
/* 0x1880 */ 72, 0, 0,128, 0, 0, 0, 0,102,105,108,101, 32,102,111,114,
/* 0x1890 */ 109, 97,116, 32,101,108,102, 51, 50, 45,112,111,119,101,114,112,
/* 0x18a0 */ 99, 10, 10, 83,101, 99,116,105,111,110,115, 58, 10, 73,100,120,