Merge branch 'devel' into jreiser

This commit is contained in:
John Reiser
2017-03-23 13:27:09 -07:00
40 changed files with 4488 additions and 4262 deletions
@@ -8,13 +8,13 @@ Idx Name Size VMA LMA File off Algn
3 NRV2D 00000144 0000000000000000 0000000000000000 000001b0 2**0 CONTENTS, RELOC, READONLY
4 NRV2B 00000118 0000000000000000 0000000000000000 000002f4 2**0 CONTENTS, RELOC, READONLY
5 LZMA_ELF00 0000008c 0000000000000000 0000000000000000 0000040c 2**0 CONTENTS, RELOC, READONLY
6 LZMA_DEC10 0000099c 0000000000000000 0000000000000000 00000498 2**0 CONTENTS, READONLY
7 LZMA_DEC20 0000099c 0000000000000000 0000000000000000 00000e34 2**0 CONTENTS, READONLY
8 LZMA_DEC30 00000020 0000000000000000 0000000000000000 000017d0 2**0 CONTENTS, READONLY
9 NRV_TAIL 0000001c 0000000000000000 0000000000000000 000017f0 2**0 CONTENTS, READONLY
10 CFLUSH 00000024 0000000000000000 0000000000000000 0000180c 2**0 CONTENTS, READONLY
11 ELFMAINY 00000000 0000000000000000 0000000000000000 00001830 2**0 CONTENTS, READONLY
12 ELFMAINZ 000002e8 0000000000000000 0000000000000000 00001830 2**0 CONTENTS, READONLY
6 LZMA_DEC10 00000bb8 0000000000000000 0000000000000000 00000498 2**0 CONTENTS, READONLY
7 LZMA_DEC20 00000c28 0000000000000000 0000000000000000 00001050 2**0 CONTENTS, READONLY
8 LZMA_DEC30 00000020 0000000000000000 0000000000000000 00001c78 2**0 CONTENTS, READONLY
9 NRV_TAIL 0000001c 0000000000000000 0000000000000000 00001c98 2**0 CONTENTS, READONLY
10 CFLUSH 00000024 0000000000000000 0000000000000000 00001cb4 2**0 CONTENTS, READONLY
11 ELFMAINY 00000000 0000000000000000 0000000000000000 00001cd8 2**0 CONTENTS, READONLY
12 ELFMAINZ 000002e8 0000000000000000 0000000000000000 00001cd8 2**0 CONTENTS, READONLY
SYMBOL TABLE:
0000000000000000 l d LZMA_DEC30 0000000000000000 LZMA_DEC30
0000000000000000 l d NRV_TAIL 0000000000000000 NRV_TAIL
@@ -8,13 +8,13 @@ Idx Name Size VMA LMA File off Algn
3 NRV2D 00000144 0000000000000000 0000000000000000 000001ac 2**0 CONTENTS, RELOC, READONLY
4 NRV2B 00000118 0000000000000000 0000000000000000 000002f0 2**0 CONTENTS, RELOC, READONLY
5 LZMA_ELF00 0000008c 0000000000000000 0000000000000000 00000408 2**0 CONTENTS, RELOC, READONLY
6 LZMA_DEC10 0000099c 0000000000000000 0000000000000000 00000494 2**0 CONTENTS, READONLY
7 LZMA_DEC20 0000099c 0000000000000000 0000000000000000 00000e30 2**0 CONTENTS, READONLY
8 LZMA_DEC30 00000020 0000000000000000 0000000000000000 000017cc 2**0 CONTENTS, READONLY
9 NRV_TAIL 0000001c 0000000000000000 0000000000000000 000017ec 2**0 CONTENTS, READONLY
10 CFLUSH 00000024 0000000000000000 0000000000000000 00001808 2**0 CONTENTS, READONLY
11 ELFMAINY 00000000 0000000000000000 0000000000000000 0000182c 2**0 CONTENTS, READONLY
12 ELFMAINZ 00000054 0000000000000000 0000000000000000 0000182c 2**0 CONTENTS, READONLY
6 LZMA_DEC10 00000bb8 0000000000000000 0000000000000000 00000494 2**0 CONTENTS, READONLY
7 LZMA_DEC20 00000c28 0000000000000000 0000000000000000 0000104c 2**0 CONTENTS, READONLY
8 LZMA_DEC30 00000020 0000000000000000 0000000000000000 00001c74 2**0 CONTENTS, READONLY
9 NRV_TAIL 0000001c 0000000000000000 0000000000000000 00001c94 2**0 CONTENTS, READONLY
10 CFLUSH 00000024 0000000000000000 0000000000000000 00001cb0 2**0 CONTENTS, READONLY
11 ELFMAINY 00000000 0000000000000000 0000000000000000 00001cd4 2**0 CONTENTS, READONLY
12 ELFMAINZ 00000054 0000000000000000 0000000000000000 00001cd4 2**0 CONTENTS, READONLY
SYMBOL TABLE:
0000000000000000 l d LZMA_DEC30 0000000000000000 LZMA_DEC30
0000000000000000 l d NRV_TAIL 0000000000000000 NRV_TAIL
+61 -29
View File
@@ -70,13 +70,13 @@ LOAD tmp/powerpc64le-darwin.macho-main.o
.plt.got
*(.plt.got)
.text 0x0000000008048000 0x884
.text 0x0000000008048000 0x928
*(.text.unlikely .text.*_unlikely .text.unlikely.*)
*(.text.exit .text.exit.*)
*(.text.startup .text.startup.*)
*(.text.hot .text.hot.*)
*(.text .stub .text.* .gnu.linkonce.t.*)
.text 0x0000000008048000 0x134 tmp/powerpc64le-darwin.macho-fold.o
.text 0x0000000008048000 0x1d8 tmp/powerpc64le-darwin.macho-fold.o
0x0000000008048000 _start
0x00000000080480e4 pread
0x00000000080480f4 mmap
@@ -85,7 +85,39 @@ LOAD tmp/powerpc64le-darwin.macho-main.o
0x000000000804811c open
0x0000000008048124 close
0x000000000804812c mprotect
.text 0x0000000008048134 0x750 tmp/powerpc64le-darwin.macho-main.o
0x0000000008048134 _savegpr0_14
0x0000000008048138 _savegpr0_15
0x000000000804813c _savegpr0_16
0x0000000008048140 _savegpr0_17
0x0000000008048144 _savegpr0_18
0x0000000008048148 _savegpr0_19
0x000000000804814c _savegpr0_20
0x0000000008048150 _savegpr0_21
0x0000000008048154 _savegpr0_22
0x0000000008048158 _savegpr0_23
0x000000000804815c _savegpr0_24
0x0000000008048160 _savegpr0_25
0x0000000008048164 _savegpr0_26
0x0000000008048168 _savegpr0_27
0x000000000804816c _savegpr0_28
0x0000000008048170 _savegpr0_29
0x0000000008048184 _restgpr0_14
0x0000000008048188 _restgpr0_15
0x000000000804818c _restgpr0_16
0x0000000008048190 _restgpr0_17
0x0000000008048194 _restgpr0_18
0x0000000008048198 _restgpr0_19
0x000000000804819c _restgpr0_20
0x00000000080481a0 _restgpr0_21
0x00000000080481a4 _restgpr0_22
0x00000000080481a8 _restgpr0_23
0x00000000080481ac _restgpr0_24
0x00000000080481b0 _restgpr0_25
0x00000000080481b4 _restgpr0_26
0x00000000080481b8 _restgpr0_27
0x00000000080481bc _restgpr0_28
0x00000000080481c0 _restgpr0_29
.text 0x00000000080481d8 0x750 tmp/powerpc64le-darwin.macho-main.o
*(.gnu.warning)
.fini
@@ -116,7 +148,7 @@ LOAD tmp/powerpc64le-darwin.macho-main.o
.exception_ranges
*(.exception_ranges .exception_ranges*)
0x0000000008049884 . = DATA_SEGMENT_ALIGN (0x1000, 0x1000)
0x0000000008049928 . = DATA_SEGMENT_ALIGN (0x1000, 0x1000)
.eh_frame
*(.eh_frame)
@@ -138,18 +170,18 @@ LOAD tmp/powerpc64le-darwin.macho-main.o
*(.tbss .tbss.* .gnu.linkonce.tb.*)
*(.tcommon)
.preinit_array 0x0000000008049884 0x0
.preinit_array 0x0000000008049928 0x0
[!provide] PROVIDE (__preinit_array_start, .)
*(.preinit_array)
[!provide] PROVIDE (__preinit_array_end, .)
.init_array 0x0000000008049884 0x0
.init_array 0x0000000008049928 0x0
[!provide] PROVIDE (__init_array_start, .)
*(SORT(.init_array.*) SORT(.ctors.*))
*(.init_array EXCLUDE_FILE(*crtend?.o *crtend.o *crtbegin?.o *crtbegin.o) .ctors)
[!provide] PROVIDE (__init_array_end, .)
.fini_array 0x0000000008049884 0x0
.fini_array 0x0000000008049928 0x0
[!provide] PROVIDE (__fini_array_start, .)
*(SORT(.fini_array.*) SORT(.dtors.*))
*(.fini_array EXCLUDE_FILE(*crtend?.o *crtend.o *crtbegin?.o *crtbegin.o) .dtors)
@@ -182,44 +214,44 @@ LOAD tmp/powerpc64le-darwin.macho-main.o
.got
*(.got)
*(.igot)
0x0000000008049884 . = DATA_SEGMENT_RELRO_END (., (SIZEOF (.got.plt) >= 0xc)?0xc:0x0)
0x0000000008049928 . = DATA_SEGMENT_RELRO_END (., (SIZEOF (.got.plt) >= 0xc)?0xc:0x0)
.got.plt 0x0000000008049884 0x0
.got.plt 0x0000000008049928 0x0
*(.got.plt)
*(.igot.plt)
.data 0x0000000008049884 0x0
.data 0x0000000008049928 0x0
*(.data .data.* .gnu.linkonce.d.*)
.data 0x0000000008049884 0x0 tmp/powerpc64le-darwin.macho-fold.o
.data 0x0000000008049884 0x0 tmp/powerpc64le-darwin.macho-main.o
.data 0x0000000008049928 0x0 tmp/powerpc64le-darwin.macho-fold.o
.data 0x0000000008049928 0x0 tmp/powerpc64le-darwin.macho-main.o
.toc 0x0000000008049884 0x0
.toc 0x0000000008049884 0x0 tmp/powerpc64le-darwin.macho-main.o
.toc 0x0000000008049928 0x0
.toc 0x0000000008049928 0x0 tmp/powerpc64le-darwin.macho-main.o
.opd 0x0000000008049888 0x40
.opd 0x0000000008049888 0x40 tmp/powerpc64le-darwin.macho-main.o
0x00000000080498b8 upx_main
.opd 0x0000000008049928 0x40
.opd 0x0000000008049928 0x40 tmp/powerpc64le-darwin.macho-main.o
0x0000000008049958 upx_main
.data1
*(.data1)
0x00000000080498c8 _edata = .
0x0000000008049968 _edata = .
[!provide] PROVIDE (edata, .)
0x00000000080498c8 . = .
0x00000000080498c8 __bss_start = .
0x0000000008049968 . = .
0x0000000008049968 __bss_start = .
.bss 0x00000000080498c8 0x0
.bss 0x0000000008049968 0x0
*(.dynbss)
*(.bss .bss.* .gnu.linkonce.b.*)
.bss 0x00000000080498c8 0x0 tmp/powerpc64le-darwin.macho-fold.o
.bss 0x00000000080498c8 0x0 tmp/powerpc64le-darwin.macho-main.o
.bss 0x0000000008049968 0x0 tmp/powerpc64le-darwin.macho-fold.o
.bss 0x0000000008049968 0x0 tmp/powerpc64le-darwin.macho-main.o
*(COMMON)
0x00000000080498c8 . = ALIGN ((. != 0x0)?0x4:0x1)
0x00000000080498c8 . = ALIGN (0x4)
0x00000000080498c8 . = SEGMENT_START ("ldata-segment", .)
0x00000000080498c8 . = ALIGN (0x4)
0x00000000080498c8 _end = .
0x0000000008049968 . = ALIGN ((. != 0x0)?0x4:0x1)
0x0000000008049968 . = ALIGN (0x4)
0x0000000008049968 . = SEGMENT_START ("ldata-segment", .)
0x0000000008049968 . = ALIGN (0x4)
0x0000000008049968 _end = .
[!provide] PROVIDE (end, .)
0x00000000080498c8 . = DATA_SEGMENT_END (.)
0x0000000008049968 . = DATA_SEGMENT_END (.)
.stab
*(.stab)
@@ -8,13 +8,13 @@ Idx Name Size VMA LMA File off Algn
3 NRV2D 00000144 0000000000000000 0000000000000000 000001ac 2**0 CONTENTS, RELOC, READONLY
4 NRV2B 00000118 0000000000000000 0000000000000000 000002f0 2**0 CONTENTS, RELOC, READONLY
5 LZMA_ELF00 0000008c 0000000000000000 0000000000000000 00000408 2**0 CONTENTS, RELOC, READONLY
6 LZMA_DEC10 0000099c 0000000000000000 0000000000000000 00000494 2**0 CONTENTS, READONLY
7 LZMA_DEC20 0000099c 0000000000000000 0000000000000000 00000e30 2**0 CONTENTS, READONLY
8 LZMA_DEC30 00000020 0000000000000000 0000000000000000 000017cc 2**0 CONTENTS, READONLY
9 NRV_TAIL 0000001c 0000000000000000 0000000000000000 000017ec 2**0 CONTENTS, READONLY
10 CFLUSH 00000024 0000000000000000 0000000000000000 00001808 2**0 CONTENTS, READONLY
11 ELFMAINY 00000022 0000000000000000 0000000000000000 0000182c 2**0 CONTENTS, RELOC, READONLY
12 ELFMAINZ 00000108 0000000000000000 0000000000000000 0000184e 2**0 CONTENTS, RELOC, READONLY
6 LZMA_DEC10 00000bb8 0000000000000000 0000000000000000 00000494 2**0 CONTENTS, READONLY
7 LZMA_DEC20 00000c28 0000000000000000 0000000000000000 0000104c 2**0 CONTENTS, READONLY
8 LZMA_DEC30 00000020 0000000000000000 0000000000000000 00001c74 2**0 CONTENTS, READONLY
9 NRV_TAIL 0000001c 0000000000000000 0000000000000000 00001c94 2**0 CONTENTS, READONLY
10 CFLUSH 00000024 0000000000000000 0000000000000000 00001cb0 2**0 CONTENTS, READONLY
11 ELFMAINY 00000030 0000000000000000 0000000000000000 00001ce0 2**4 CONTENTS, RELOC, READONLY
12 ELFMAINZ 00000108 0000000000000000 0000000000000000 00001d10 2**0 CONTENTS, RELOC, READONLY
SYMBOL TABLE:
0000000000000000 l d LZMA_DEC30 0000000000000000 LZMA_DEC30
0000000000000000 l d NRV_TAIL 0000000000000000 NRV_TAIL
+39 -39
View File
@@ -9,58 +9,58 @@ Linker script and memory map
TARGET(elf64-powerpcle)
0x00000000001000bc . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x00000000001000bc 0x7f0
.text 0x00000000001000bc 0x810
*(.text)
.text 0x00000000001000bc 0x1a0 tmp/powerpc64le-linux.elf-fold.o
0x0000000000100210 mmap
0x0000000000100224 exit
0x000000000010022c read
0x0000000000100234 open
0x000000000010023c close
0x0000000000100244 mprotect
0x000000000010024c munmap
0x0000000000100254 brk
.text 0x000000000010025c 0x650 tmp/powerpc64le-linux.elf-main.o
.text 0x00000000001000bc 0x1a4 tmp/powerpc64le-linux.elf-fold.o
0x0000000000100214 mmap
0x0000000000100228 exit
0x0000000000100230 read
0x0000000000100238 open
0x0000000000100240 close
0x0000000000100248 mprotect
0x0000000000100250 munmap
0x0000000000100258 brk
.text 0x0000000000100260 0x66c tmp/powerpc64le-linux.elf-main.o
*(.data)
.data 0x00000000001008ac 0x0 tmp/powerpc64le-linux.elf-fold.o
.data 0x00000000001008ac 0x0 tmp/powerpc64le-linux.elf-main.o
.data 0x00000000001008cc 0x0 tmp/powerpc64le-linux.elf-fold.o
.data 0x00000000001008cc 0x0 tmp/powerpc64le-linux.elf-main.o
.sfpr 0x00000000001008ac 0x9c
.sfpr 0x00000000001008ac 0x9c linker stubs
0x00000000001008ac _savegpr0_15
0x00000000001008dc _savegpr0_27
0x00000000001008e0 _savegpr0_28
0x00000000001008f8 _restgpr0_15
0x0000000000100928 _restgpr0_27
0x000000000010092c _restgpr0_28
.sfpr 0x00000000001008cc 0xa4
.sfpr 0x00000000001008cc 0xa4 linker stubs
0x00000000001008cc _savegpr0_14
0x0000000000100900 _savegpr0_27
0x0000000000100904 _savegpr0_28
0x000000000010091c _restgpr0_14
0x0000000000100950 _restgpr0_27
0x0000000000100954 _restgpr0_28
.glink 0x0000000000100948 0x0
.glink 0x0000000000100948 0x0 linker stubs
.glink 0x0000000000100970 0x0
.glink 0x0000000000100970 0x0 linker stubs
.eh_frame 0x0000000000100948 0x0
.eh_frame 0x0000000000100948 0x0 linker stubs
.eh_frame 0x0000000000100970 0x0
.eh_frame 0x0000000000100970 0x0 linker stubs
.rela.dyn 0x0000000000100948 0x0
.rela.iplt 0x0000000000100948 0x0 linker stubs
.rela.dyn 0x0000000000100970 0x0
.rela.iplt 0x0000000000100970 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 0x0000000000100948 0x0
.branch_lt 0x0000000000100948 0x0 linker stubs
.branch_lt 0x0000000000100970 0x0
.branch_lt 0x0000000000100970 0x0 linker stubs
.toc 0x0000000000100948 0x0
.toc 0x0000000000100948 0x0 tmp/powerpc64le-linux.elf-main.o
.toc 0x0000000000100970 0x0
.toc 0x0000000000100970 0x0 tmp/powerpc64le-linux.elf-main.o
.opd 0x0000000000100948 0x58
.opd 0x0000000000100948 0x58 tmp/powerpc64le-linux.elf-main.o
0x0000000000100988 upx_main
.opd 0x0000000000100970 0x58
.opd 0x0000000000100970 0x58 tmp/powerpc64le-linux.elf-main.o
0x00000000001009b0 upx_main
.iplt 0x00000000001009a0 0x0
.iplt 0x00000000001009a0 0x0 linker stubs
.iplt 0x00000000001009c8 0x0
.iplt 0x00000000001009c8 0x0 linker stubs
.bss 0x00000000001009a0 0x0
.bss 0x00000000001009a0 0x0 tmp/powerpc64le-linux.elf-fold.o
.bss 0x00000000001009a0 0x0 tmp/powerpc64le-linux.elf-main.o
.bss 0x00000000001009c8 0x0
.bss 0x00000000001009c8 0x0 tmp/powerpc64le-linux.elf-fold.o
.bss 0x00000000001009c8 0x0 tmp/powerpc64le-linux.elf-main.o
@@ -13,10 +13,10 @@ Idx Name Size VMA LMA File off Algn
8 CFLUSH 00000024 0000000000000000 0000000000000000 00000494 2**0 CONTENTS, READONLY
9 LZMA 00000000 0000000000000000 0000000000000000 000004b8 2**0 CONTENTS, READONLY
10 LZMA_ELF00 0000008c 0000000000000000 0000000000000000 000004b8 2**0 CONTENTS, RELOC, READONLY
11 LZMA_DEC10 0000099c 0000000000000000 0000000000000000 00000544 2**0 CONTENTS, READONLY
12 LZMA_DEC20 0000099c 0000000000000000 0000000000000000 00000ee0 2**0 CONTENTS, READONLY
13 LZMA_DEC30 00000020 0000000000000000 0000000000000000 0000187c 2**0 CONTENTS, READONLY
14 UPX1HEAD 00000020 0000000000000000 0000000000000000 0000189c 2**0 CONTENTS, READONLY
11 LZMA_DEC10 00000bb8 0000000000000000 0000000000000000 00000544 2**0 CONTENTS, READONLY
12 LZMA_DEC20 00000c28 0000000000000000 0000000000000000 000010fc 2**0 CONTENTS, READONLY
13 LZMA_DEC30 00000020 0000000000000000 0000000000000000 00001d24 2**0 CONTENTS, READONLY
14 UPX1HEAD 00000020 0000000000000000 0000000000000000 00001d44 2**0 CONTENTS, READONLY
SYMBOL TABLE:
0000000000000000 l d LINUX020 0000000000000000 LINUX020
0000000000000000 l d LINUX030 0000000000000000 LINUX030