Allow qemu on host with smaller PAGE_SIZE. Sync stubs.

https://github.com/upx/upx/issues/571
	modified:   ../.github/travis_testsuite_1-expected_sha256sums.sh
	modified:   stub/arm64-linux.elf-fold.h
	modified:   stub/powerpc64-linux.elf-fold.h
	modified:   stub/powerpc64le-linux.elf-fold.h
	modified:   stub/src/amd64-linux.elf-main.c
	modified:   stub/tmp/arm64-linux.elf-fold.map
	modified:   stub/tmp/powerpc64-linux.elf-fold.map
	modified:   stub/tmp/powerpc64le-linux.elf-fold.map
This commit is contained in:
John Reiser
2022-03-25 09:13:10 -07:00
committed by Markus F.X.J. Oberhumer
parent 52f19ae330
commit 7a232cb330
8 changed files with 373 additions and 366 deletions
+14 -14
View File
@@ -8,7 +8,7 @@ Linker script and memory map
0x00000000001000bc . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x00000000001000bc 0x9dc
.text 0x00000000001000bc 0x9f0
*(.text)
.text 0x00000000001000bc 0x24c tmp/arm64-linux.elf-fold.o
0x000000000010023c my_bkpt
@@ -26,26 +26,26 @@ Linker script and memory map
0x00000000001002d0 readlink
0x00000000001002d8 open
0x00000000001002f4 __clear_cache
.text 0x0000000000100308 0x790 tmp/arm64-linux.elf-main.o
0x0000000000100930 upx_main
.text 0x0000000000100308 0x7a4 tmp/arm64-linux.elf-main.o
0x0000000000100944 upx_main
*(.data)
.data 0x0000000000100a98 0x0 tmp/arm64-linux.elf-fold.o
.data 0x0000000000100a98 0x0 tmp/arm64-linux.elf-main.o
.data 0x0000000000100aac 0x0 tmp/arm64-linux.elf-fold.o
.data 0x0000000000100aac 0x0 tmp/arm64-linux.elf-main.o
.iplt 0x0000000000100a98 0x0
.iplt 0x0000000000100a98 0x0 tmp/arm64-linux.elf-fold.o
.iplt 0x0000000000100aac 0x0
.iplt 0x0000000000100aac 0x0 tmp/arm64-linux.elf-fold.o
.rela.dyn 0x0000000000100a98 0x0
.rela.iplt 0x0000000000100a98 0x0 tmp/arm64-linux.elf-fold.o
.rela.dyn 0x0000000000100ab0 0x0
.rela.iplt 0x0000000000100ab0 0x0 tmp/arm64-linux.elf-fold.o
.data
LOAD tmp/arm64-linux.elf-fold.o
LOAD tmp/arm64-linux.elf-main.o
OUTPUT(tmp/arm64-linux.elf-fold.bin elf64-littleaarch64)
.igot.plt 0x0000000000100a98 0x0
.igot.plt 0x0000000000100a98 0x0 tmp/arm64-linux.elf-fold.o
.igot.plt 0x0000000000100ab0 0x0
.igot.plt 0x0000000000100ab0 0x0 tmp/arm64-linux.elf-fold.o
.bss 0x0000000000100a98 0x0
.bss 0x0000000000100a98 0x0 tmp/arm64-linux.elf-fold.o
.bss 0x0000000000100a98 0x0 tmp/arm64-linux.elf-main.o
.bss 0x0000000000100aac 0x0
.bss 0x0000000000100aac 0x0 tmp/arm64-linux.elf-fold.o
.bss 0x0000000000100aac 0x0 tmp/arm64-linux.elf-main.o
+30 -30
View File
@@ -9,7 +9,7 @@ Linker script and memory map
TARGET(elf64-powerpc)
0x00000000001000bc . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x00000000001000bc 0xb9c
.text 0x00000000001000bc 0xbac
*(.text)
.text 0x00000000001000bc 0x330 tmp/powerpc64-linux.elf-fold.o
0x00000000001000bc get_page_mask
@@ -23,47 +23,47 @@ TARGET(elf64-powerpc)
0x00000000001003d4 mprotect
0x00000000001003dc munmap
0x00000000001003e4 my_bkpt
.text 0x00000000001003ec 0x86c tmp/powerpc64-linux.elf-main.o
.text 0x00000000001003ec 0x87c tmp/powerpc64-linux.elf-main.o
*(.data)
.data 0x0000000000100c58 0x0 tmp/powerpc64-linux.elf-fold.o
.data 0x0000000000100c58 0x0 tmp/powerpc64-linux.elf-main.o
.data 0x0000000000100c68 0x0 tmp/powerpc64-linux.elf-fold.o
.data 0x0000000000100c68 0x0 tmp/powerpc64-linux.elf-main.o
.sfpr 0x0000000000100c58 0xa4
.sfpr 0x0000000000100c58 0xa4 linker stubs
0x0000000000100c58 _savegpr0_14
0x0000000000100c80 _savegpr0_24
0x0000000000100c90 _savegpr0_28
0x0000000000100ca8 _restgpr0_14
0x0000000000100cd0 _restgpr0_24
0x0000000000100ce0 _restgpr0_28
.sfpr 0x0000000000100c68 0xa4
.sfpr 0x0000000000100c68 0xa4 linker stubs
0x0000000000100c68 _savegpr0_14
0x0000000000100c90 _savegpr0_24
0x0000000000100ca0 _savegpr0_28
0x0000000000100cb8 _restgpr0_14
0x0000000000100ce0 _restgpr0_24
0x0000000000100cf0 _restgpr0_28
.glink 0x0000000000100d00 0x0
.glink 0x0000000000100d00 0x0 linker stubs
.glink 0x0000000000100d10 0x0
.glink 0x0000000000100d10 0x0 linker stubs
.eh_frame 0x0000000000100cfc 0x0
.eh_frame 0x0000000000100cfc 0x0 linker stubs
.eh_frame 0x0000000000100d0c 0x0
.eh_frame 0x0000000000100d0c 0x0 linker stubs
.rela.dyn 0x0000000000100d00 0x0
.rela.iplt 0x0000000000100d00 0x0 linker stubs
.rela.dyn 0x0000000000100d10 0x0
.rela.iplt 0x0000000000100d10 0x0 linker stubs
.data
LOAD tmp/powerpc64-linux.elf-fold.o
LOAD tmp/powerpc64-linux.elf-main.o
OUTPUT(tmp/powerpc64-linux.elf-fold.bin elf64-powerpc)
.branch_lt 0x0000000000100d00 0x0
.branch_lt 0x0000000000100d00 0x0 linker stubs
.branch_lt 0x0000000000100d10 0x0
.branch_lt 0x0000000000100d10 0x0 linker stubs
.toc 0x0000000000100d00 0x0
.toc 0x0000000000100d00 0x0 tmp/powerpc64-linux.elf-main.o
.toc 0x0000000000100d10 0x0
.toc 0x0000000000100d10 0x0 tmp/powerpc64-linux.elf-main.o
.opd 0x0000000000100d00 0x58
.opd 0x0000000000100d00 0x58 tmp/powerpc64-linux.elf-main.o
0x0000000000100d40 upx_main
.opd 0x0000000000100d10 0x58
.opd 0x0000000000100d10 0x58 tmp/powerpc64-linux.elf-main.o
0x0000000000100d50 upx_main
.iplt 0x0000000000100d58 0x0
.iplt 0x0000000000100d58 0x0 linker stubs
.iplt 0x0000000000100d68 0x0
.iplt 0x0000000000100d68 0x0 linker stubs
.bss 0x0000000000100d58 0x0
.bss 0x0000000000100d58 0x0 tmp/powerpc64-linux.elf-fold.o
.bss 0x0000000000100d58 0x0 tmp/powerpc64-linux.elf-main.o
.bss 0x0000000000100d68 0x0
.bss 0x0000000000100d68 0x0 tmp/powerpc64-linux.elf-fold.o
.bss 0x0000000000100d68 0x0 tmp/powerpc64-linux.elf-main.o
+30 -30
View File
@@ -9,7 +9,7 @@ Linker script and memory map
TARGET(elf64-powerpcle)
0x00000000001000bc . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x00000000001000bc 0xb98
.text 0x00000000001000bc 0xba8
*(.text)
.text 0x00000000001000bc 0x330 tmp/powerpc64le-linux.elf-fold.o
0x00000000001000bc get_page_mask
@@ -23,47 +23,47 @@ TARGET(elf64-powerpcle)
0x00000000001003d4 mprotect
0x00000000001003dc munmap
0x00000000001003e4 my_bkpt
.text 0x00000000001003ec 0x868 tmp/powerpc64le-linux.elf-main.o
.text 0x00000000001003ec 0x878 tmp/powerpc64le-linux.elf-main.o
*(.data)
.data 0x0000000000100c54 0x0 tmp/powerpc64le-linux.elf-fold.o
.data 0x0000000000100c54 0x0 tmp/powerpc64le-linux.elf-main.o
.data 0x0000000000100c64 0x0 tmp/powerpc64le-linux.elf-fold.o
.data 0x0000000000100c64 0x0 tmp/powerpc64le-linux.elf-main.o
.sfpr 0x0000000000100c54 0xa4
.sfpr 0x0000000000100c54 0xa4 linker stubs
0x0000000000100c54 _savegpr0_14
0x0000000000100c7c _savegpr0_24
0x0000000000100c8c _savegpr0_28
0x0000000000100ca4 _restgpr0_14
0x0000000000100ccc _restgpr0_24
0x0000000000100cdc _restgpr0_28
.sfpr 0x0000000000100c64 0xa4
.sfpr 0x0000000000100c64 0xa4 linker stubs
0x0000000000100c64 _savegpr0_14
0x0000000000100c8c _savegpr0_24
0x0000000000100c9c _savegpr0_28
0x0000000000100cb4 _restgpr0_14
0x0000000000100cdc _restgpr0_24
0x0000000000100cec _restgpr0_28
.glink 0x0000000000100cf8 0x0
.glink 0x0000000000100cf8 0x0 linker stubs
.glink 0x0000000000100d08 0x0
.glink 0x0000000000100d08 0x0 linker stubs
.eh_frame 0x0000000000100cf8 0x0
.eh_frame 0x0000000000100cf8 0x0 linker stubs
.eh_frame 0x0000000000100d08 0x0
.eh_frame 0x0000000000100d08 0x0 linker stubs
.rela.dyn 0x0000000000100cf8 0x0
.rela.iplt 0x0000000000100cf8 0x0 linker stubs
.rela.dyn 0x0000000000100d08 0x0
.rela.iplt 0x0000000000100d08 0x0 linker stubs
.data
LOAD tmp/powerpc64le-linux.elf-fold.o
LOAD tmp/powerpc64le-linux.elf-main.o
OUTPUT(tmp/powerpc64le-linux.elf-fold.bin elf64-powerpcle)
.branch_lt 0x0000000000100cf8 0x0
.branch_lt 0x0000000000100cf8 0x0 linker stubs
.branch_lt 0x0000000000100d08 0x0
.branch_lt 0x0000000000100d08 0x0 linker stubs
.toc 0x0000000000100cf8 0x0
.toc 0x0000000000100cf8 0x0 tmp/powerpc64le-linux.elf-main.o
.toc 0x0000000000100d08 0x0
.toc 0x0000000000100d08 0x0 tmp/powerpc64le-linux.elf-main.o
.opd 0x0000000000100cf8 0x58
.opd 0x0000000000100cf8 0x58 tmp/powerpc64le-linux.elf-main.o
0x0000000000100d38 upx_main
.opd 0x0000000000100d08 0x58
.opd 0x0000000000100d08 0x58 tmp/powerpc64le-linux.elf-main.o
0x0000000000100d48 upx_main
.iplt 0x0000000000100d50 0x0
.iplt 0x0000000000100d50 0x0 linker stubs
.iplt 0x0000000000100d60 0x0
.iplt 0x0000000000100d60 0x0 linker stubs
.bss 0x0000000000100d50 0x0
.bss 0x0000000000100d50 0x0 tmp/powerpc64le-linux.elf-fold.o
.bss 0x0000000000100d50 0x0 tmp/powerpc64le-linux.elf-main.o
.bss 0x0000000000100d60 0x0
.bss 0x0000000000100d60 0x0 tmp/powerpc64le-linux.elf-fold.o
.bss 0x0000000000100d60 0x0 tmp/powerpc64le-linux.elf-main.o