Merge branch 'jreiser' into devel

This commit is contained in:
John Reiser
2017-04-02 14:56:26 -07:00
8 changed files with 388 additions and 387 deletions
+8 -8
View File
@@ -2,20 +2,20 @@ file format elf64-littleaarch64
Sections:
Idx Name Size VMA LMA File off Algn Flags
0 ELFMAINX 0000003c 0000000000000000 0000000000000000 00000040 2**2 CONTENTS, RELOC, READONLY
0 ELFMAINX 0000003c 0000000000000000 0000000000000000 00000040 2**0 CONTENTS, RELOC, READONLY
1 LUNMP000 00000000 0000000000000000 0000000000000000 0000007c 2**0 CONTENTS, READONLY
2 LUNMP001 00000000 0000000000000000 0000000000000000 0000007c 2**0 CONTENTS, READONLY
3 ELFMAINXu 000000a0 0000000000000000 0000000000000000 0000007c 2**2 CONTENTS, RELOC, READONLY
3 ELFMAINXu 000000a0 0000000000000000 0000000000000000 0000007c 2**0 CONTENTS, RELOC, READONLY
4 NRV_HEAD 00000000 0000000000000000 0000000000000000 0000011c 2**0 CONTENTS, READONLY
5 NRV_TAIL 00000000 0000000000000000 0000000000000000 0000011c 2**0 CONTENTS, READONLY
6 NRV2E 00000128 0000000000000000 0000000000000000 0000011c 2**2 CONTENTS, READONLY
7 NRV2D 0000011c 0000000000000000 0000000000000000 00000244 2**2 CONTENTS, READONLY
8 NRV2B 000000f0 0000000000000000 0000000000000000 00000360 2**2 CONTENTS, READONLY
9 LZMA_ELF00 000000d0 0000000000000000 0000000000000000 00000450 2**2 CONTENTS, RELOC, READONLY
6 NRV2E 00000128 0000000000000000 0000000000000000 0000011c 2**0 CONTENTS, READONLY
7 NRV2D 0000011c 0000000000000000 0000000000000000 00000244 2**0 CONTENTS, READONLY
8 NRV2B 000000f0 0000000000000000 0000000000000000 00000360 2**0 CONTENTS, READONLY
9 LZMA_ELF00 000000d0 0000000000000000 0000000000000000 00000450 2**0 CONTENTS, RELOC, READONLY
10 LZMA_DEC20 00000930 0000000000000000 0000000000000000 00000520 2**0 CONTENTS, READONLY
11 LZMA_DEC10 0000049c 0000000000000000 0000000000000000 00000e50 2**2 CONTENTS, READONLY
11 LZMA_DEC10 0000049c 0000000000000000 0000000000000000 00000e50 2**0 CONTENTS, READONLY
12 LZMA_DEC30 00000000 0000000000000000 0000000000000000 000012ec 2**0 CONTENTS, READONLY
13 ELFMAINY 0000003e 0000000000000000 0000000000000000 000012ec 2**2 CONTENTS, READONLY
13 ELFMAINY 0000003e 0000000000000000 0000000000000000 000012ec 2**0 CONTENTS, READONLY
14 ELFMAINZ 00000000 0000000000000000 0000000000000000 0000132a 2**0 CONTENTS, READONLY
SYMBOL TABLE:
0000000000000000 l d LZMA_DEC30 0000000000000000 LZMA_DEC30
+14 -14
View File
@@ -8,7 +8,7 @@ Linker script and memory map
0x00000000001000bc . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x00000000001000bc 0x878
.text 0x00000000001000bc 0x8a0
*(.text)
.text 0x00000000001000bc 0x258 tmp/arm64-linux.elf-fold.o
0x000000000010022c my_bkpt
@@ -26,26 +26,26 @@ Linker script and memory map
0x00000000001002b8 open
0x00000000001002d4 readlink
0x0000000000100300 __clear_cache
.text 0x0000000000100314 0x620 tmp/arm64-linux.elf-main.o
0x00000000001007c4 upx_main
.text 0x0000000000100314 0x648 tmp/arm64-linux.elf-main.o
0x00000000001007e4 upx_main
*(.data)
.data 0x0000000000100934 0x0 tmp/arm64-linux.elf-fold.o
.data 0x0000000000100934 0x0 tmp/arm64-linux.elf-main.o
.data 0x000000000010095c 0x0 tmp/arm64-linux.elf-fold.o
.data 0x000000000010095c 0x0 tmp/arm64-linux.elf-main.o
.iplt 0x0000000000100934 0x0
.iplt 0x0000000000100934 0x0 tmp/arm64-linux.elf-fold.o
.iplt 0x000000000010095c 0x0
.iplt 0x000000000010095c 0x0 tmp/arm64-linux.elf-fold.o
.rela.dyn 0x0000000000100938 0x0
.rela.iplt 0x0000000000100938 0x0 tmp/arm64-linux.elf-fold.o
.rela.dyn 0x0000000000100960 0x0
.rela.iplt 0x0000000000100960 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 0x0000000000100938 0x0
.igot.plt 0x0000000000100938 0x0 tmp/arm64-linux.elf-fold.o
.igot.plt 0x0000000000100960 0x0
.igot.plt 0x0000000000100960 0x0 tmp/arm64-linux.elf-fold.o
.bss 0x0000000000100934 0x0
.bss 0x0000000000100934 0x0 tmp/arm64-linux.elf-fold.o
.bss 0x0000000000100934 0x0 tmp/arm64-linux.elf-main.o
.bss 0x000000000010095c 0x0
.bss 0x000000000010095c 0x0 tmp/arm64-linux.elf-fold.o
.bss 0x000000000010095c 0x0 tmp/arm64-linux.elf-main.o
+8 -8
View File
@@ -2,18 +2,18 @@ file format elf64-littleaarch64
Sections:
Idx Name Size VMA LMA File off Algn Flags
0 ELFMAINX 00000024 0000000000000000 0000000000000000 00000040 2**2 CONTENTS, RELOC, READONLY
0 ELFMAINX 00000024 0000000000000000 0000000000000000 00000040 2**0 CONTENTS, RELOC, READONLY
1 NRV_HEAD 00000000 0000000000000000 0000000000000000 00000064 2**0 CONTENTS, READONLY
2 NRV_TAIL 00000000 0000000000000000 0000000000000000 00000064 2**0 CONTENTS, READONLY
3 NRV2E 00000128 0000000000000000 0000000000000000 00000064 2**2 CONTENTS, READONLY
4 NRV2D 0000011c 0000000000000000 0000000000000000 0000018c 2**2 CONTENTS, READONLY
5 NRV2B 000000f0 0000000000000000 0000000000000000 000002a8 2**2 CONTENTS, READONLY
6 LZMA_ELF00 000000d0 0000000000000000 0000000000000000 00000398 2**2 CONTENTS, RELOC, READONLY
3 NRV2E 00000128 0000000000000000 0000000000000000 00000064 2**0 CONTENTS, READONLY
4 NRV2D 0000011c 0000000000000000 0000000000000000 0000018c 2**0 CONTENTS, READONLY
5 NRV2B 000000f0 0000000000000000 0000000000000000 000002a8 2**0 CONTENTS, READONLY
6 LZMA_ELF00 000000d0 0000000000000000 0000000000000000 00000398 2**0 CONTENTS, RELOC, READONLY
7 LZMA_DEC20 00000930 0000000000000000 0000000000000000 00000468 2**0 CONTENTS, READONLY
8 LZMA_DEC10 0000049c 0000000000000000 0000000000000000 00000d98 2**2 CONTENTS, READONLY
8 LZMA_DEC10 0000049c 0000000000000000 0000000000000000 00000d98 2**0 CONTENTS, READONLY
9 LZMA_DEC30 00000000 0000000000000000 0000000000000000 00001234 2**0 CONTENTS, READONLY
10 ELFMAINY 0000003e 0000000000000000 0000000000000000 00001234 2**2 CONTENTS, READONLY
11 ELFMAINZ 000002ec 0000000000000000 0000000000000000 00001274 2**2 CONTENTS, READONLY
10 ELFMAINY 0000003e 0000000000000000 0000000000000000 00001234 2**0 CONTENTS, READONLY
11 ELFMAINZ 000002ec 0000000000000000 0000000000000000 00001272 2**0 CONTENTS, READONLY
SYMBOL TABLE:
0000000000000000 l d LZMA_DEC30 0000000000000000 LZMA_DEC30
0000000000000000 l d ELFMAINZ 0000000000000000 ELFMAINZ