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.dylib-entry.h
+4 -4
View File
@@ -32,8 +32,8 @@
#define STUB_POWERPC64LE_DARWIN_DYLIB_ENTRY_SIZE 12283
#define STUB_POWERPC64LE_DARWIN_DYLIB_ENTRY_ADLER32 0x58a22180
#define STUB_POWERPC64LE_DARWIN_DYLIB_ENTRY_CRC32 0x47a1b2a5
#define STUB_POWERPC64LE_DARWIN_DYLIB_ENTRY_ADLER32 0x15272241
#define STUB_POWERPC64LE_DARWIN_DYLIB_ENTRY_CRC32 0xeaa65f27
unsigned char stub_powerpc64le_darwin_dylib_entry[12283] = {
/* 0x0000 */ 127, 69, 76, 70, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -596,8 +596,8 @@ unsigned char stub_powerpc64le_darwin_dylib_entry[12283] = {
/* 0x22d0 */ 104, 0,130, 65, 20, 26,123,127,120, 27,119,124, 4, 0,122, 56,
/* 0x22e0 */ 29, 1, 0, 72, 20, 26, 90,127,120, 27,118,124, 12, 0, 90, 59,
/* 0x22f0 */ 249,255,225,250,166, 3,232,127, 12, 0,120, 56,120,179,196,126,
/* 0x2300 */ 120,203, 37,127,120, 11, 38,124, 8, 0,248,136,208,255, 33, 56,
/* 0x2310 */ 33, 0,128, 78, 56, 0, 33, 56, 9, 0,216,136, 0, 0, 6, 40,
/* 0x2300 */ 120,203, 37,127,120, 11, 38,124, 8, 0,248,136,145,255, 33,248,
/* 0x2310 */ 33, 0,128, 78,120, 0, 33, 56, 9, 0,216,136, 0, 0, 6, 40,
/* 0x2320 */ 160,255,130, 65, 10, 0,184,136, 0, 0,152,232,120,203, 35,127,
/* 0x2330 */ 241, 0, 0, 72,140,255,255, 75,145, 0, 0, 72, 2, 0, 0, 68,
/* 0x2340 */ 255,255, 96, 56, 0, 0, 65,232, 8, 0, 97,232, 16, 0,129,232,