Merge branch 'jreiser' into devel
O_BINFO simplifies stubs on linux Elf;
PowerPC64 (big endian: Apple Macintosh G5) and PowerPC* cleanup;
-fpie simplification; shlib for arm64, amd64.
A big merge due to suspending activity on 'devel' branch
during stabilization for release of UPX-3.94.
There were intermediate merges with private branch 'jreiser',
and attempted rebase onto 'devel' did not go well.
Verfication of cases ({ET_EXEC, -fpie, shlib} x {$ARCH}) is in progress.
modified: ../.github/travis_testsuite_1.sh
modified: conf.h
modified: linker.cpp
modified: linker.h
modified: p_lx_elf.cpp
modified: p_lx_elf.h
modified: p_mach.cpp
modified: p_mach.h
modified: p_mach_enum.h
modified: packmast.cpp
modified: stub/Makefile
modified: stub/scripts/xstrip.py
modified: stub/src/amd64-darwin.dylib-entry.S
modified: stub/src/amd64-darwin.macho-entry.S
modified: stub/src/amd64-linux.elf-entry.S
modified: stub/src/amd64-linux.elf-fold.S
modified: stub/src/amd64-linux.elf-main.c
modified: stub/src/arch/powerpc/32/bxx.S
modified: stub/src/arch/powerpc/32/lzma_d.S
modified: stub/src/arch/powerpc/32/nrv2b_d.S
modified: stub/src/arch/powerpc/32/nrv2d_d.S
modified: stub/src/arch/powerpc/32/nrv2e_d.S
modified: stub/src/arch/powerpc/32/ppc_regs.h
new file: stub/src/arch/powerpc/64/Makefile
new file: stub/src/arch/powerpc/64/Makefile.extra
new file: stub/src/arch/powerpc/64/bxx.S
new file: stub/src/arch/powerpc/64/lzma_d.S
new file: stub/src/arch/powerpc/64/lzma_d_cf.S
new file: stub/src/arch/powerpc/64/lzma_d_cs.S
new file: stub/src/arch/powerpc/64/macros.S
new file: stub/src/arch/powerpc/64/nrv2b_d.S
new file: stub/src/arch/powerpc/64/nrv2d_d.S
new file: stub/src/arch/powerpc/64/nrv2e_d.S
new file: stub/src/arch/powerpc/64/ppc_regs.h
modified: stub/src/arch/powerpc/64le/bxx.S
copied: stub/src/arch/powerpc/64le/lzma_d.S -> stub/src/arch/powerpc/64le/lzma_d-common.S
modified: stub/src/arch/powerpc/64le/lzma_d.S
modified: stub/src/arch/powerpc/64le/lzma_d_cs.S
modified: stub/src/arch/powerpc/64le/nrv2b_d.S
modified: stub/src/arch/powerpc/64le/nrv2d_d.S
modified: stub/src/arch/powerpc/64le/nrv2e_d.S
modified: stub/src/arch/powerpc/64le/ppc_regs.h
modified: stub/src/arm.v4a-linux.elf-entry.S
modified: stub/src/arm.v4a-linux.elf-fold.S
modified: stub/src/arm64-darwin.macho-entry.S
modified: stub/src/arm64-linux.elf-entry.S
modified: stub/src/arm64-linux.elf-fold.S
modified: stub/src/arm64-linux.shlib-init.S
modified: stub/src/i386-bsd.elf-entry.S
modified: stub/src/i386-darwin.macho-entry.S
modified: stub/src/i386-linux.elf-entry.S
modified: stub/src/i386-linux.elf-fold.S
modified: stub/src/mipsel.r3000-linux.elf-entry.S
modified: stub/src/mipsel.r3000-linux.elf-fold.S
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-entry.S
modified: stub/src/powerpc-linux.elf-fold.S
modified: stub/src/powerpc-linux.elf-main.c
new file: stub/src/powerpc64-darwin.dylib-entry.S
new file: stub/src/powerpc64-darwin.macho-entry.S
new file: stub/src/powerpc64-darwin.macho-fold.S
new file: stub/src/powerpc64-darwin.macho-main.c
new file: stub/src/powerpc64-linux.elf-entry.S
new file: stub/src/powerpc64-linux.elf-fold.S
new file: stub/src/powerpc64-linux.elf-fold.lds
new file: stub/src/powerpc64-linux.elf-main.c
modified: stub/src/powerpc64-savegpr0.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
and most stub/*.h and stub/tmp/*.dump
This commit is contained in:
John Reiser
@@ -8,32 +8,32 @@ Linker script and memory map
|
||||
|
||||
0x00000000001000bc . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
|
||||
|
||||
.text 0x00000000001000bc 0x6b4
|
||||
.text 0x00000000001000bc 0x764
|
||||
*(.text)
|
||||
.text 0x00000000001000bc 0x121 tmp/amd64-linux.elf-fold.o
|
||||
0x00000000001001aa munmap
|
||||
0x00000000001001b6 mmap
|
||||
0x00000000001001cd read
|
||||
0x00000000001001d9 exit
|
||||
0x00000000001001b2 brk
|
||||
0x00000000001001d1 open
|
||||
0x00000000001001ae mprotect
|
||||
0x00000000001001d5 close
|
||||
*fill* 0x00000000001001dd 0x3 00
|
||||
.text 0x00000000001001e0 0x58d tmp/amd64-linux.elf-main.o
|
||||
0x00000000001005f2 upx_main
|
||||
.text 0x00000000001000bc 0x197 tmp/amd64-linux.elf-fold.o
|
||||
0x0000000000100243 munmap
|
||||
0x000000000010021c mmap
|
||||
0x000000000010024b write
|
||||
0x000000000010024f read
|
||||
0x0000000000100233 exit
|
||||
0x0000000000100237 brk
|
||||
0x000000000010023f open
|
||||
0x0000000000100247 mprotect
|
||||
0x000000000010023b close
|
||||
*fill* 0x0000000000100253 0x1 00
|
||||
.text 0x0000000000100254 0x5cc tmp/amd64-linux.elf-main.o
|
||||
0x0000000000100666 upx_main
|
||||
*(.data)
|
||||
*fill* 0x000000000010076d 0x3 00
|
||||
.data 0x0000000000100770 0x0 tmp/amd64-linux.elf-fold.o
|
||||
.data 0x0000000000100770 0x0 tmp/amd64-linux.elf-main.o
|
||||
.data 0x0000000000100820 0x0 tmp/amd64-linux.elf-fold.o
|
||||
.data 0x0000000000100820 0x0 tmp/amd64-linux.elf-main.o
|
||||
|
||||
.data
|
||||
|
||||
.bss 0x0000000000100770 0x0
|
||||
.bss 0x0000000000100770 0x0 tmp/amd64-linux.elf-fold.o
|
||||
.bss 0x0000000000100770 0x0 tmp/amd64-linux.elf-main.o
|
||||
.bss 0x0000000000100820 0x0
|
||||
.bss 0x0000000000100820 0x0 tmp/amd64-linux.elf-fold.o
|
||||
.bss 0x0000000000100820 0x0 tmp/amd64-linux.elf-main.o
|
||||
|
||||
.rela.dyn 0x0000000000100770 0x0
|
||||
.rela.dyn 0x0000000000100820 0x0
|
||||
.rela.text 0x0000000000000000 0x0 tmp/amd64-linux.elf-fold.o
|
||||
LOAD tmp/amd64-linux.elf-fold.o
|
||||
LOAD tmp/amd64-linux.elf-main.o
|
||||
|
||||
Reference in New Issue
Block a user