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/stub/amd64-win64.pep.h
	src/stub/powerpc-linux.elf-entry.h
	src/stub/powerpc-linux.elf-fold.h
	src/stub/src/amd64-win64.pep.S
	src/stub/src/arch/powerpc/32/ppc_regs.h
	src/stub/src/arch/powerpc/64le/lzma_d.S
	src/stub/src/powerpc-linux.elf-entry.S
	src/stub/src/powerpc64le-darwin.dylib-entry.S
	src/stub/src/powerpc64le-darwin.macho-entry.S
	src/stub/src/powerpc64le-linux.elf-entry.S
	src/stub/src/powerpc64le-linux.kernel.vmlinux.S
	src/stub/tmp/amd64-win64.pep.bin.dump
	src/stub/tmp/powerpc-linux.elf-entry.bin.dump
	src/stub/tmp/powerpc-linux.elf-fold.map

	modified:   ../../.github/travis_testsuite_1.sh
	modified:   ../p_lx_elf.cpp
	modified:   ../p_unix.cpp
	modified:   ../p_unix.h
	modified:   amd64-win64.pep.h
	modified:   arm.v4a-linux.elf-fold.h
	modified:   arm.v5a-linux.elf-fold.h
	modified:   armeb.v4a-linux.elf-fold.h
	modified:   powerpc-darwin.dylib-entry.h
	modified:   powerpc-darwin.macho-entry.h
	copied:     powerpc-darwin.dylib-entry.h -> powerpc-linux.elf-entry.h
	modified:   powerpc-linux.elf-fold.h
	modified:   powerpc-linux.kernel.vmlinux.h
	modified:   powerpc64le-linux.elf-fold.h
	modified:   src/amd64-win64.pep.S
	modified:   src/arch/powerpc/32/bxx.S
	modified:   src/arch/powerpc/32/lzma_d.S
	modified:   src/arch/powerpc/32/nrv2d_d.S
	modified:   src/arch/powerpc/32/nrv2e_d.S
	modified:   src/arch/powerpc/32/ppc_regs.h
	modified:   src/arch/powerpc/64le/bxx.S
	modified:   src/arch/powerpc/64le/lzma_d.S
	modified:   src/arch/powerpc/64le/nrv2b_d.S
	modified:   src/arch/powerpc/64le/nrv2d_d.S
	modified:   src/arch/powerpc/64le/nrv2e_d.S
	modified:   src/arm.v4a-linux.elf-fold.S
	modified:   src/powerpc-darwin.macho-fold.S
	modified:   src/powerpc-linux.elf-entry.S
	modified:   src/powerpc-linux.elf-fold.S
	modified:   src/powerpc64le-darwin.dylib-entry.S
	modified:   src/powerpc64le-darwin.macho-entry.S
	modified:   src/powerpc64le-darwin.macho-fold.S
	modified:   src/powerpc64le-linux.elf-entry.S
	modified:   src/powerpc64le-linux.elf-fold.S
	modified:   src/powerpc64le-linux.kernel.vmlinux.S
	modified:   tmp/amd64-win64.pep.bin.dump
	modified:   tmp/arm.v4a-linux.elf-fold.map
	modified:   tmp/arm.v5a-linux.elf-fold.map
	modified:   tmp/armeb.v4a-linux.elf-fold.map
	modified:   tmp/powerpc-darwin.dylib-entry.bin.dump
	modified:   tmp/powerpc-darwin.macho-entry.bin.dump
	modified:   tmp/powerpc-linux.elf-entry.bin.dump
	modified:   tmp/powerpc-linux.elf-fold.map
	modified:   tmp/powerpc-linux.kernel.vmlinux.bin.dump
This commit is contained in:
John Reiser
2017-03-01 08:14:13 -08:00
parent 8c6133c115 483db31acd
commit 4e8848eeca
44 changed files with 3912 additions and 3883 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 0xc6c
.text 0x0000000000100080 0xc68
*(.text)
.text 0x0000000000100080 0x114 tmp/powerpc-linux.elf-fold.o
0x0000000000100184 munmap
0x0000000000100144 mmap
0x0000000000100164 read
0x000000000010015c exit
0x000000000010018c brk
0x000000000010016c open
0x000000000010017c mprotect
0x0000000000100174 close
.text 0x0000000000100194 0xb58 tmp/powerpc-linux.elf-main.o
0x0000000000100ab8 upx_main
.text 0x0000000000100080 0x110 tmp/powerpc-linux.elf-fold.o
0x0000000000100180 munmap
0x0000000000100140 mmap
0x0000000000100160 read
0x0000000000100158 exit
0x0000000000100188 brk
0x0000000000100168 open
0x0000000000100178 mprotect
0x0000000000100170 close
.text 0x0000000000100190 0xb58 tmp/powerpc-linux.elf-main.o
0x0000000000100ab4 upx_main
*(.data)
.data 0x0000000000100cec 0x0 tmp/powerpc-linux.elf-fold.o
.data 0x0000000000100cec 0x0 tmp/powerpc-linux.elf-main.o
.data 0x0000000000100ce8 0x0 tmp/powerpc-linux.elf-fold.o
.data 0x0000000000100ce8 0x0 tmp/powerpc-linux.elf-main.o
.data
.bss 0x0000000000100cec 0x0
.bss 0x0000000000100cec 0x0 tmp/powerpc-linux.elf-fold.o
.bss 0x0000000000100cec 0x0 tmp/powerpc-linux.elf-main.o
.bss 0x0000000000100ce8 0x0
.bss 0x0000000000100ce8 0x0 tmp/powerpc-linux.elf-fold.o
.bss 0x0000000000100ce8 0x0 tmp/powerpc-linux.elf-main.o
.rela.dyn 0x0000000000100cec 0x0
.rela.dyn 0x0000000000100ce8 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