PowerPC64 unifies into amd64-linux.elf-main.c

Also reconcile ppc32 and ppc64, especially *.S
	modified:   p_lx_elf.cpp
	modified:   stub/src/amd64-linux.elf-main.c
	modified:   stub/src/i386-linux.elf-main.c
	modified:   stub/src/powerpc-linux.elf-entry.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:   ../.github/travis_testsuite_1.sh

	also corresponding *.h *.map *.dump
This commit is contained in:
John Reiser
2017-06-27 14:58:13 -07:00
parent a7a0876298
commit 9be86621bf
22 changed files with 1475 additions and 1786 deletions
+10 -10
View File
@@ -8,7 +8,7 @@ Linker script and memory map
0x00000000001000bc . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x00000000001000bc 0x760
.text 0x00000000001000bc 0x77c
*(.text)
.text 0x00000000001000bc 0x197 tmp/amd64-linux.elf-fold.o
0x0000000000100243 munmap
@@ -21,20 +21,20 @@ Linker script and memory map
0x0000000000100247 mprotect
0x000000000010023b close
*fill* 0x0000000000100253 0x1 00
.text 0x0000000000100254 0x5c5 tmp/amd64-linux.elf-main.o
0x0000000000100666 upx_main
.text 0x0000000000100254 0x5e1 tmp/amd64-linux.elf-main.o
0x000000000010066a upx_main
*(.data)
*fill* 0x0000000000100819 0x3 00
.data 0x000000000010081c 0x0 tmp/amd64-linux.elf-fold.o
.data 0x000000000010081c 0x0 tmp/amd64-linux.elf-main.o
*fill* 0x0000000000100835 0x3 00
.data 0x0000000000100838 0x0 tmp/amd64-linux.elf-fold.o
.data 0x0000000000100838 0x0 tmp/amd64-linux.elf-main.o
.data
.bss 0x000000000010081c 0x0
.bss 0x000000000010081c 0x0 tmp/amd64-linux.elf-fold.o
.bss 0x000000000010081c 0x0 tmp/amd64-linux.elf-main.o
.bss 0x0000000000100838 0x0
.bss 0x0000000000100838 0x0 tmp/amd64-linux.elf-fold.o
.bss 0x0000000000100838 0x0 tmp/amd64-linux.elf-main.o
.rela.dyn 0x0000000000100820 0x0
.rela.dyn 0x0000000000100838 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
@@ -14,7 +14,7 @@ Idx Name Size VMA LMA File off Algn Flags
9 NRV_TAIL 0000001c 00000000 00000000 00001788 2**0 CONTENTS, READONLY
10 CFLUSH 00000024 00000000 00000000 000017a4 2**0 CONTENTS, READONLY
11 ELFMAINY 00000012 00000000 00000000 000017c8 2**0 CONTENTS, RELOC, READONLY
12 ELFMAINZ 000001f8 00000000 00000000 000017da 2**0 CONTENTS, RELOC, READONLY
12 ELFMAINZ 000001ec 00000000 00000000 000017da 2**0 CONTENTS, RELOC, READONLY
SYMBOL TABLE:
00000000 l d LZMA_DEC30 00000000 LZMA_DEC30
00000000 l d NRV_TAIL 00000000 NRV_TAIL
@@ -30,9 +30,6 @@ SYMBOL TABLE:
00000000 l d LZMA_DEC20 00000000 LZMA_DEC20
00000000 l d CFLUSH 00000000 CFLUSH
00000000 g ELFMAINX 00000000 _start
00000000 *UND* 00000000 ADRM
00000000 *UND* 00000000 LENM
00000000 *UND* 00000000 LENU
00000000 *UND* 00000000 O_BINFO
RELOCATION RECORDS FOR [ELFMAINX]:
@@ -63,7 +60,4 @@ RELOCATION RECORDS FOR [ELFMAINZ]:
OFFSET TYPE VALUE
0000007c R_PPC_REL14 ELFMAINY
00000104 R_PPC_REL14 ELFMAINY
000001e8 R_PPC_ADDR32 ADRM
000001ec R_PPC_ADDR32 LENM
000001f0 R_PPC_ADDR32 LENU
000001f4 R_PPC_ADDR32 O_BINFO
000001e8 R_PPC_ADDR32 O_BINFO
+9 -9
View File
@@ -9,7 +9,7 @@ Linker script and memory map
TARGET(elf32-powerpc)
0x0000000000100080 . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000100080 0x10dc
.text 0x0000000000100080 0x10e0
*(.text)
.text 0x0000000000100080 0x264 tmp/powerpc-linux.elf-fold.o
0x0000000000100080 get_page_mask
@@ -24,19 +24,19 @@ TARGET(elf32-powerpc)
0x00000000001002b4 open
0x00000000001002c4 mprotect
0x00000000001002bc close
.text 0x00000000001002e4 0xe78 tmp/powerpc-linux.elf-main.o
0x0000000000100e48 upx_main
.text 0x00000000001002e4 0xe7c tmp/powerpc-linux.elf-main.o
0x0000000000100e4c upx_main
*(.data)
.data 0x000000000010115c 0x0 tmp/powerpc-linux.elf-fold.o
.data 0x000000000010115c 0x0 tmp/powerpc-linux.elf-main.o
.data 0x0000000000101160 0x0 tmp/powerpc-linux.elf-fold.o
.data 0x0000000000101160 0x0 tmp/powerpc-linux.elf-main.o
.data
.bss 0x000000000010115c 0x0
.bss 0x000000000010115c 0x0 tmp/powerpc-linux.elf-fold.o
.bss 0x000000000010115c 0x0 tmp/powerpc-linux.elf-main.o
.bss 0x0000000000101160 0x0
.bss 0x0000000000101160 0x0 tmp/powerpc-linux.elf-fold.o
.bss 0x0000000000101160 0x0 tmp/powerpc-linux.elf-main.o
.rela.dyn 0x000000000010115c 0x0
.rela.dyn 0x0000000000101160 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
@@ -15,7 +15,7 @@ Idx Name Size VMA LMA File off Algn
10 CFLUSH 00000024 0000000000000000 0000000000000000 00002c98 2**0 CONTENTS, READONLY
11 ELFMAINY 00000012 0000000000000000 0000000000000000 00002cbc 2**0 CONTENTS, RELOC, READONLY
12 ELFMAINZe 00000018 0000000000000000 0000000000000000 00002cd0 2**3 CONTENTS, RELOC, READONLY
13 ELFMAINZ 0000024c 0000000000000000 0000000000000000 00002ce8 2**2 CONTENTS, RELOC, READONLY
13 ELFMAINZ 00000248 0000000000000000 0000000000000000 00002ce8 2**2 CONTENTS, RELOC, READONLY
SYMBOL TABLE:
0000000000000000 l d LZMA_DEC30 0000000000000000 LZMA_DEC30
0000000000000000 l d NRV_TAIL 0000000000000000 NRV_TAIL
@@ -67,4 +67,4 @@ RELOCATION RECORDS FOR [ELFMAINZ]:
OFFSET TYPE VALUE
0000000000000074 R_PPC64_REL14 ELFMAINY
00000000000000f8 R_PPC64_REL14 ELFMAINY
0000000000000248 R_PPC64_ADDR32 O_BINFO
0000000000000244 R_PPC64_ADDR32 O_BINFO
+40 -40
View File
@@ -9,59 +9,59 @@ Linker script and memory map
TARGET(elf64-powerpc)
0x00000000001000bc . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x00000000001000bc 0x964
.text 0x00000000001000bc 0xa58
*(.text)
.text 0x00000000001000bc 0x2ec tmp/powerpc64-linux.elf-fold.o
0x0000000000100354 exit
0x000000000010035c readlink
0x0000000000100364 brk
0x000000000010036c close
0x0000000000100374 open
0x000000000010037c munmap
0x0000000000100384 mprotect
0x000000000010038c read
0x0000000000100394 mmap
.text 0x00000000001003a8 0x678 tmp/powerpc64-linux.elf-main.o
.text 0x00000000001000bc 0x2d4 tmp/powerpc64-linux.elf-fold.o
0x000000000010033c exit
0x0000000000100344 readlink
0x000000000010034c brk
0x0000000000100354 close
0x000000000010035c open
0x0000000000100364 munmap
0x000000000010036c mprotect
0x0000000000100374 read
0x000000000010037c mmap
.text 0x0000000000100390 0x784 tmp/powerpc64-linux.elf-main.o
*(.data)
.data 0x0000000000100a20 0x0 tmp/powerpc64-linux.elf-fold.o
.data 0x0000000000100a20 0x0 tmp/powerpc64-linux.elf-main.o
.data 0x0000000000100b14 0x0 tmp/powerpc64-linux.elf-fold.o
.data 0x0000000000100b14 0x0 tmp/powerpc64-linux.elf-main.o
.sfpr 0x0000000000100a20 0xa4
.sfpr 0x0000000000100a20 0xa4 linker stubs
0x0000000000100a20 _savegpr0_14
0x0000000000100a4c _savegpr0_25
0x0000000000100a58 _savegpr0_28
0x0000000000100a70 _restgpr0_14
0x0000000000100a9c _restgpr0_25
0x0000000000100aa8 _restgpr0_28
.sfpr 0x0000000000100b14 0xa4
.sfpr 0x0000000000100b14 0xa4 linker stubs
0x0000000000100b14 _savegpr0_14
0x0000000000100b3c _savegpr0_24
0x0000000000100b4c _savegpr0_28
0x0000000000100b64 _restgpr0_14
0x0000000000100b8c _restgpr0_24
0x0000000000100b9c _restgpr0_28
.glink 0x0000000000100ac8 0x0
.glink 0x0000000000100ac8 0x0 linker stubs
.glink 0x0000000000100bb8 0x0
.glink 0x0000000000100bb8 0x0 linker stubs
.eh_frame 0x0000000000100ac4 0x0
.eh_frame 0x0000000000100ac4 0x0 linker stubs
.eh_frame 0x0000000000100bb8 0x0
.eh_frame 0x0000000000100bb8 0x0 linker stubs
.rela.dyn 0x0000000000100ac8 0x0
.rela.iplt 0x0000000000100ac8 0x0 linker stubs
.rela.dyn 0x0000000000100bb8 0x0
.rela.iplt 0x0000000000100bb8 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 0x0000000000100ac8 0x0
.branch_lt 0x0000000000100ac8 0x0 linker stubs
.branch_lt 0x0000000000100bb8 0x0
.branch_lt 0x0000000000100bb8 0x0 linker stubs
.toc 0x0000000000100ac8 0x0
.toc 0x0000000000100ac8 0x0 tmp/powerpc64-linux.elf-main.o
.toc 0x0000000000100bb8 0x0
.toc 0x0000000000100bb8 0x0 tmp/powerpc64-linux.elf-main.o
.opd 0x0000000000100ac8 0x58
.opd 0x0000000000100ac8 0x58 tmp/powerpc64-linux.elf-main.o
0x0000000000100b08 upx_main
.opd 0x0000000000100bb8 0x58
.opd 0x0000000000100bb8 0x58 tmp/powerpc64-linux.elf-main.o
0x0000000000100bf8 upx_main
.iplt 0x0000000000100b20 0x0
.iplt 0x0000000000100b20 0x0 linker stubs
.iplt 0x0000000000100c10 0x0
.iplt 0x0000000000100c10 0x0 linker stubs
.bss 0x0000000000100b20 0x0
.bss 0x0000000000100b20 0x0 tmp/powerpc64-linux.elf-fold.o
.bss 0x0000000000100b20 0x0 tmp/powerpc64-linux.elf-main.o
.bss 0x0000000000100c10 0x0
.bss 0x0000000000100c10 0x0 tmp/powerpc64-linux.elf-fold.o
.bss 0x0000000000100c10 0x0 tmp/powerpc64-linux.elf-main.o
@@ -14,7 +14,7 @@ Idx Name Size VMA LMA File off Algn
9 NRV_TAIL 0000001c 0000000000000000 0000000000000000 0000215c 2**0 CONTENTS, READONLY
10 CFLUSH 00000024 0000000000000000 0000000000000000 00002178 2**0 CONTENTS, READONLY
11 ELFMAINY 00000012 0000000000000000 0000000000000000 0000219c 2**0 CONTENTS, RELOC, READONLY
12 ELFMAINZ 0000024c 0000000000000000 0000000000000000 000021b0 2**2 CONTENTS, RELOC, READONLY
12 ELFMAINZ 00000248 0000000000000000 0000000000000000 000021b0 2**2 CONTENTS, RELOC, READONLY
SYMBOL TABLE:
0000000000000000 l d LZMA_DEC30 0000000000000000 LZMA_DEC30
0000000000000000 l d NRV_TAIL 0000000000000000 NRV_TAIL
@@ -60,4 +60,4 @@ RELOCATION RECORDS FOR [ELFMAINZ]:
OFFSET TYPE VALUE
0000000000000074 R_PPC64_REL14 ELFMAINY
00000000000000f8 R_PPC64_REL14 ELFMAINY
0000000000000248 R_PPC64_ADDR32 O_BINFO
0000000000000244 R_PPC64_ADDR32 O_BINFO
+40 -40
View File
@@ -9,59 +9,59 @@ Linker script and memory map
TARGET(elf64-powerpcle)
0x00000000001000bc . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x00000000001000bc 0x93c
.text 0x00000000001000bc 0xa30
*(.text)
.text 0x00000000001000bc 0x2cc tmp/powerpc64le-linux.elf-fold.o
0x0000000000100334 exit
0x000000000010033c readlink
0x0000000000100344 brk
0x000000000010034c close
0x0000000000100354 open
0x000000000010035c munmap
0x0000000000100364 mprotect
0x000000000010036c read
0x0000000000100374 mmap
.text 0x0000000000100388 0x670 tmp/powerpc64le-linux.elf-main.o
.text 0x00000000001000bc 0x2b0 tmp/powerpc64le-linux.elf-fold.o
0x0000000000100318 exit
0x0000000000100320 readlink
0x0000000000100328 brk
0x0000000000100330 close
0x0000000000100338 open
0x0000000000100340 munmap
0x0000000000100348 mprotect
0x0000000000100350 read
0x0000000000100358 mmap
.text 0x000000000010036c 0x780 tmp/powerpc64le-linux.elf-main.o
*(.data)
.data 0x00000000001009f8 0x0 tmp/powerpc64le-linux.elf-fold.o
.data 0x00000000001009f8 0x0 tmp/powerpc64le-linux.elf-main.o
.data 0x0000000000100aec 0x0 tmp/powerpc64le-linux.elf-fold.o
.data 0x0000000000100aec 0x0 tmp/powerpc64le-linux.elf-main.o
.sfpr 0x00000000001009f8 0xa4
.sfpr 0x00000000001009f8 0xa4 linker stubs
0x00000000001009f8 _savegpr0_14
0x0000000000100a24 _savegpr0_25
0x0000000000100a30 _savegpr0_28
0x0000000000100a48 _restgpr0_14
0x0000000000100a74 _restgpr0_25
0x0000000000100a80 _restgpr0_28
.sfpr 0x0000000000100aec 0xa4
.sfpr 0x0000000000100aec 0xa4 linker stubs
0x0000000000100aec _savegpr0_14
0x0000000000100b14 _savegpr0_24
0x0000000000100b24 _savegpr0_28
0x0000000000100b3c _restgpr0_14
0x0000000000100b64 _restgpr0_24
0x0000000000100b74 _restgpr0_28
.glink 0x0000000000100aa0 0x0
.glink 0x0000000000100aa0 0x0 linker stubs
.glink 0x0000000000100b90 0x0
.glink 0x0000000000100b90 0x0 linker stubs
.eh_frame 0x0000000000100a9c 0x0
.eh_frame 0x0000000000100a9c 0x0 linker stubs
.eh_frame 0x0000000000100b90 0x0
.eh_frame 0x0000000000100b90 0x0 linker stubs
.rela.dyn 0x0000000000100aa0 0x0
.rela.iplt 0x0000000000100aa0 0x0 linker stubs
.rela.dyn 0x0000000000100b90 0x0
.rela.iplt 0x0000000000100b90 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 0x0000000000100aa0 0x0
.branch_lt 0x0000000000100aa0 0x0 linker stubs
.branch_lt 0x0000000000100b90 0x0
.branch_lt 0x0000000000100b90 0x0 linker stubs
.toc 0x0000000000100aa0 0x0
.toc 0x0000000000100aa0 0x0 tmp/powerpc64le-linux.elf-main.o
.toc 0x0000000000100b90 0x0
.toc 0x0000000000100b90 0x0 tmp/powerpc64le-linux.elf-main.o
.opd 0x0000000000100aa0 0x58
.opd 0x0000000000100aa0 0x58 tmp/powerpc64le-linux.elf-main.o
0x0000000000100ae0 upx_main
.opd 0x0000000000100b90 0x58
.opd 0x0000000000100b90 0x58 tmp/powerpc64le-linux.elf-main.o
0x0000000000100bd0 upx_main
.iplt 0x0000000000100af8 0x0
.iplt 0x0000000000100af8 0x0 linker stubs
.iplt 0x0000000000100be8 0x0
.iplt 0x0000000000100be8 0x0 linker stubs
.bss 0x0000000000100af8 0x0
.bss 0x0000000000100af8 0x0 tmp/powerpc64le-linux.elf-fold.o
.bss 0x0000000000100af8 0x0 tmp/powerpc64le-linux.elf-main.o
.bss 0x0000000000100be8 0x0
.bss 0x0000000000100be8 0x0 tmp/powerpc64le-linux.elf-fold.o
.bss 0x0000000000100be8 0x0 tmp/powerpc64le-linux.elf-main.o