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/tmp/arm.v5a-linux.elf-entry.bin.dump
+15 -15
View File
@@ -2,19 +2,19 @@ file format elf32-littlearm
Sections:
Idx Name Size VMA LMA File off Algn Flags
0 ELFMAINX 0000003c 00000000 00000000 00000034 2**0 CONTENTS, RELOC, READONLY
1 ELFMAINXu 0000009c 00000000 00000000 00000070 2**0 CONTENTS, RELOC, READONLY
2 NRV_HEAD 00000000 00000000 00000000 0000010c 2**0 CONTENTS, READONLY
3 NRV_TAIL 00000000 00000000 00000000 0000010c 2**0 CONTENTS, READONLY
4 NRV2E 0000013c 00000000 00000000 0000010c 2**0 CONTENTS, RELOC, READONLY
5 NRV2D 00000128 00000000 00000000 00000248 2**0 CONTENTS, RELOC, READONLY
6 NRV2B 000000ec 00000000 00000000 00000370 2**0 CONTENTS, RELOC, READONLY
7 LZMA_ELF00 000000b8 00000000 00000000 0000045c 2**0 CONTENTS, RELOC, READONLY
8 LZMA_DEC20 00000938 00000000 00000000 00000514 2**0 CONTENTS, RELOC, READONLY
9 LZMA_DEC10 00000478 00000000 00000000 00000e4c 2**0 CONTENTS, RELOC, READONLY
10 LZMA_DEC30 00000000 00000000 00000000 000012c4 2**0 CONTENTS, READONLY
11 ELFMAINY 0000003e 00000000 00000000 000012c4 2**0 CONTENTS, READONLY
12 ELFMAINZ 00000004 00000000 00000000 00001302 2**0 CONTENTS, RELOC, READONLY
0 ELFMAINX 00000044 00000000 00000000 00000034 2**0 CONTENTS, RELOC, READONLY
1 ELFMAINXu 000000a0 00000000 00000000 00000078 2**0 CONTENTS, RELOC, READONLY
2 NRV_HEAD 00000000 00000000 00000000 00000118 2**0 CONTENTS, READONLY
3 NRV_TAIL 00000000 00000000 00000000 00000118 2**0 CONTENTS, READONLY
4 NRV2E 0000013c 00000000 00000000 00000118 2**0 CONTENTS, RELOC, READONLY
5 NRV2D 00000128 00000000 00000000 00000254 2**0 CONTENTS, RELOC, READONLY
6 NRV2B 000000ec 00000000 00000000 0000037c 2**0 CONTENTS, RELOC, READONLY
7 LZMA_ELF00 000000b8 00000000 00000000 00000468 2**0 CONTENTS, RELOC, READONLY
8 LZMA_DEC20 00000938 00000000 00000000 00000520 2**0 CONTENTS, RELOC, READONLY
9 LZMA_DEC10 00000478 00000000 00000000 00000e58 2**0 CONTENTS, RELOC, READONLY
10 LZMA_DEC30 00000000 00000000 00000000 000012d0 2**0 CONTENTS, READONLY
11 ELFMAINY 0000003e 00000000 00000000 000012d0 2**0 CONTENTS, READONLY
12 ELFMAINZ 00000004 00000000 00000000 0000130e 2**0 CONTENTS, RELOC, READONLY
SYMBOL TABLE:
00000000 l d ELFMAINXu 00000000 ELFMAINXu
00000000 l d NRV2E 00000000 NRV2E
@@ -51,8 +51,8 @@ OFFSET TYPE VALUE
RELOCATION RECORDS FOR [ELFMAINXu]:
OFFSET TYPE VALUE
00000024 R_ARM_PC24 ELFMAINY
00000034 R_ARM_PC24 ELFMAINXu
00000028 R_ARM_PC24 ELFMAINY
00000038 R_ARM_PC24 ELFMAINXu
RELOCATION RECORDS FOR [NRV2E]:
OFFSET TYPE VALUE