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/powerpc-linux.elf-fold.map
+18 -18
View File
@@ -9,30 +9,30 @@ Linker script and memory map
TARGET(elf32-powerpc)
0x0000000000100080 . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000100080 0xe74
.text 0x0000000000100080 0xe78
*(.text)
.text 0x0000000000100080 0x250 tmp/powerpc-linux.elf-fold.o
0x00000000001002c0 munmap
0x0000000000100284 mmap
0x00000000001002a0 read
0x0000000000100298 exit
0x00000000001002c8 brk
0x00000000001002a8 open
0x00000000001002b8 mprotect
0x00000000001002b0 close
.text 0x00000000001002d0 0xc24 tmp/powerpc-linux.elf-main.o
0x0000000000100bf8 upx_main
.text 0x0000000000100080 0x254 tmp/powerpc-linux.elf-fold.o
0x00000000001002c4 munmap
0x0000000000100288 mmap
0x00000000001002a4 read
0x000000000010029c exit
0x00000000001002cc brk
0x00000000001002ac open
0x00000000001002bc mprotect
0x00000000001002b4 close
.text 0x00000000001002d4 0xc24 tmp/powerpc-linux.elf-main.o
0x0000000000100bfc upx_main
*(.data)
.data 0x0000000000100ef4 0x0 tmp/powerpc-linux.elf-fold.o
.data 0x0000000000100ef4 0x0 tmp/powerpc-linux.elf-main.o
.data 0x0000000000100ef8 0x0 tmp/powerpc-linux.elf-fold.o
.data 0x0000000000100ef8 0x0 tmp/powerpc-linux.elf-main.o
.data
.bss 0x0000000000100ef4 0x0
.bss 0x0000000000100ef4 0x0 tmp/powerpc-linux.elf-fold.o
.bss 0x0000000000100ef4 0x0 tmp/powerpc-linux.elf-main.o
.bss 0x0000000000100ef8 0x0
.bss 0x0000000000100ef8 0x0 tmp/powerpc-linux.elf-fold.o
.bss 0x0000000000100ef8 0x0 tmp/powerpc-linux.elf-main.o
.rela.dyn 0x0000000000100ef4 0x0
.rela.dyn 0x0000000000100ef8 0x0
.rela.text 0x0000000000000000 0x0 tmp/powerpc-linux.elf-fold.o
LOAD tmp/powerpc-linux.elf-fold.o
LOAD tmp/powerpc-linux.elf-main.o