Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 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.v4a-linux.elf-fold.map
+24 -24
View File
@@ -9,35 +9,35 @@ Linker script and memory map
TARGET(elf32-littlearm)
0x0000000000008080 . = ((0x8000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000008080 0x998
.text 0x0000000000008080 0x980
*(.text)
.text 0x0000000000008080 0x2a4 tmp/arm.v4a-linux.elf-fold.o
0x00000000000082c8 munmap
0x00000000000082b0 getpid
0x00000000000082c0 readlink
0x00000000000082e4 mmap
0x00000000000082d8 __clear_cache
0x0000000000008308 mmap_privanon
0x0000000000008290 write
0x0000000000008288 read
0x00000000000082a8 unlink
0x000000000000827c my_bkpt
0x0000000000008284 exit
0x00000000000082b8 brk
0x0000000000008298 open
0x00000000000082d0 mprotect
0x00000000000082a0 close
.text 0x0000000000008324 0x6f4 tmp/arm.v4a-linux.elf-main.o
0x0000000000008898 upx_main
.text 0x0000000000008080 0x28c tmp/arm.v4a-linux.elf-fold.o
0x00000000000082b0 munmap
0x0000000000008298 getpid
0x00000000000082a8 readlink
0x00000000000082cc mmap
0x00000000000082c0 __clear_cache
0x00000000000082f0 mmap_privanon
0x0000000000008278 write
0x0000000000008270 read
0x0000000000008290 unlink
0x0000000000008264 my_bkpt
0x000000000000826c exit
0x00000000000082a0 brk
0x0000000000008280 open
0x00000000000082b8 mprotect
0x0000000000008288 close
.text 0x000000000000830c 0x6f4 tmp/arm.v4a-linux.elf-main.o
0x0000000000008880 upx_main
*(.data)
.data 0x0000000000008a18 0x0 tmp/arm.v4a-linux.elf-fold.o
.data 0x0000000000008a18 0x0 tmp/arm.v4a-linux.elf-main.o
.data 0x0000000000008a00 0x0 tmp/arm.v4a-linux.elf-fold.o
.data 0x0000000000008a00 0x0 tmp/arm.v4a-linux.elf-main.o
.data
.bss 0x0000000000008a18 0x0
.bss 0x0000000000008a18 0x0 tmp/arm.v4a-linux.elf-fold.o
.bss 0x0000000000008a18 0x0 tmp/arm.v4a-linux.elf-main.o
.bss 0x0000000000008a00 0x0
.bss 0x0000000000008a00 0x0 tmp/arm.v4a-linux.elf-fold.o
.bss 0x0000000000008a00 0x0 tmp/arm.v4a-linux.elf-main.o
LOAD tmp/arm.v4a-linux.elf-fold.o
LOAD tmp/arm.v4a-linux.elf-main.o
OUTPUT(tmp/arm.v4a-linux.elf-fold.bin elf32-littlearm)