Fix some AT_PHDR problems, at least on x86*.

modified:   stub/src/amd64-linux.elf-main.c
	modified:   stub/src/i386-linux.elf-main.c

	modified:   ../.github/travis_testsuite_1.sh
	plus many *.elf-fold.h and *.elf-fold.map
This commit is contained in:
John Reiser
2017-09-18 19:54:27 -07:00
parent 6d9f3adc86
commit 08627e9df5
23 changed files with 1008 additions and 1056 deletions
+10 -10
View File
@@ -8,7 +8,7 @@ Linker script and memory map
0x00000000001000bc . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x00000000001000bc 0x77c
.text 0x00000000001000bc 0x748
*(.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 0x5e1 tmp/amd64-linux.elf-main.o
0x000000000010066a upx_main
.text 0x0000000000100254 0x5ae tmp/amd64-linux.elf-main.o
0x00000000001006bf upx_main
*(.data)
*fill* 0x0000000000100835 0x3 00
.data 0x0000000000100838 0x0 tmp/amd64-linux.elf-fold.o
.data 0x0000000000100838 0x0 tmp/amd64-linux.elf-main.o
*fill* 0x0000000000100802 0x2 00
.data 0x0000000000100804 0x0 tmp/amd64-linux.elf-fold.o
.data 0x0000000000100804 0x0 tmp/amd64-linux.elf-main.o
.data
.bss 0x0000000000100838 0x0
.bss 0x0000000000100838 0x0 tmp/amd64-linux.elf-fold.o
.bss 0x0000000000100838 0x0 tmp/amd64-linux.elf-main.o
.bss 0x0000000000100804 0x0
.bss 0x0000000000100804 0x0 tmp/amd64-linux.elf-fold.o
.bss 0x0000000000100804 0x0 tmp/amd64-linux.elf-main.o
.rela.dyn 0x0000000000100838 0x0
.rela.dyn 0x0000000000100808 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
+8 -8
View File
@@ -9,7 +9,7 @@ Linker script and memory map
TARGET(elf32-littlearm)
0x0000000000008080 . = ((0x8000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000008080 0xa68
.text 0x0000000000008080 0xa14
*(.text)
.text 0x0000000000008080 0x324 tmp/arm.v4a-linux.elf-fold.o
0x00000000000082e8 munmap
@@ -29,18 +29,18 @@ TARGET(elf32-littlearm)
0x0000000000008348 div10
0x00000000000082f0 mprotect
0x00000000000082c0 close
.text 0x00000000000083a4 0x744 tmp/arm.v4a-linux.elf-main.o
.text 0x00000000000083a4 0x6f0 tmp/arm.v4a-linux.elf-main.o
0x00000000000083c4 get_page_mask
0x0000000000008918 upx_main
0x0000000000008960 upx_main
*(.data)
.data 0x0000000000008ae8 0x0 tmp/arm.v4a-linux.elf-fold.o
.data 0x0000000000008ae8 0x0 tmp/arm.v4a-linux.elf-main.o
.data 0x0000000000008a94 0x0 tmp/arm.v4a-linux.elf-fold.o
.data 0x0000000000008a94 0x0 tmp/arm.v4a-linux.elf-main.o
.data
.bss 0x0000000000008ae8 0x0
.bss 0x0000000000008ae8 0x0 tmp/arm.v4a-linux.elf-fold.o
.bss 0x0000000000008ae8 0x0 tmp/arm.v4a-linux.elf-main.o
.bss 0x0000000000008a94 0x0
.bss 0x0000000000008a94 0x0 tmp/arm.v4a-linux.elf-fold.o
.bss 0x0000000000008a94 0x0 tmp/arm.v4a-linux.elf-main.o
LOAD tmp/arm.v4a-linux.elf-fold.o
LOAD tmp/arm.v4a-linux.elf-main.o
OUTPUT(tmp/arm.v4a-linux.elf-fold.bin elf32-littlearm)
+8 -8
View File
@@ -9,7 +9,7 @@ Linker script and memory map
TARGET(elf32-littlearm)
0x0000000000008080 . = ((0x8000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000008080 0xb04
.text 0x0000000000008080 0xab0
*(.text)
.text 0x0000000000008080 0x3c4 tmp/arm.v5a-linux.elf-fold.o
0x0000000000008354 munmap
@@ -29,18 +29,18 @@ TARGET(elf32-littlearm)
0x00000000000083e8 div10
0x0000000000008368 mprotect
0x00000000000082f0 close
.text 0x0000000000008444 0x740 tmp/armel-linux.elf-main.o
.text 0x0000000000008444 0x6ec tmp/armel-linux.elf-main.o
0x0000000000008464 get_page_mask
0x00000000000089b4 upx_main
0x00000000000089fc upx_main
*(.data)
.data 0x0000000000008b84 0x0 tmp/arm.v5a-linux.elf-fold.o
.data 0x0000000000008b84 0x0 tmp/armel-linux.elf-main.o
.data 0x0000000000008b30 0x0 tmp/arm.v5a-linux.elf-fold.o
.data 0x0000000000008b30 0x0 tmp/armel-linux.elf-main.o
.data
.bss 0x0000000000008b84 0x0
.bss 0x0000000000008b84 0x0 tmp/arm.v5a-linux.elf-fold.o
.bss 0x0000000000008b84 0x0 tmp/armel-linux.elf-main.o
.bss 0x0000000000008b30 0x0
.bss 0x0000000000008b30 0x0 tmp/arm.v5a-linux.elf-fold.o
.bss 0x0000000000008b30 0x0 tmp/armel-linux.elf-main.o
LOAD tmp/arm.v5a-linux.elf-fold.o
LOAD tmp/armel-linux.elf-main.o
OUTPUT(tmp/arm.v5a-linux.elf-fold.bin elf32-littlearm)
+8 -8
View File
@@ -9,7 +9,7 @@ Linker script and memory map
TARGET(elf32-bigarm)
0x0000000000008080 . = ((0x8000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000008080 0xa68
.text 0x0000000000008080 0xa14
*(.text)
.text 0x0000000000008080 0x324 tmp/armeb.v4a-linux.elf-fold.o
0x00000000000082e8 munmap
@@ -29,18 +29,18 @@ TARGET(elf32-bigarm)
0x0000000000008348 div10
0x00000000000082f0 mprotect
0x00000000000082c0 close
.text 0x00000000000083a4 0x744 tmp/armeb.v4a-linux.elf-main.o
.text 0x00000000000083a4 0x6f0 tmp/armeb.v4a-linux.elf-main.o
0x00000000000083c4 get_page_mask
0x0000000000008918 upx_main
0x0000000000008960 upx_main
*(.data)
.data 0x0000000000008ae8 0x0 tmp/armeb.v4a-linux.elf-fold.o
.data 0x0000000000008ae8 0x0 tmp/armeb.v4a-linux.elf-main.o
.data 0x0000000000008a94 0x0 tmp/armeb.v4a-linux.elf-fold.o
.data 0x0000000000008a94 0x0 tmp/armeb.v4a-linux.elf-main.o
.data
.bss 0x0000000000008ae8 0x0
.bss 0x0000000000008ae8 0x0 tmp/armeb.v4a-linux.elf-fold.o
.bss 0x0000000000008ae8 0x0 tmp/armeb.v4a-linux.elf-main.o
.bss 0x0000000000008a94 0x0
.bss 0x0000000000008a94 0x0 tmp/armeb.v4a-linux.elf-fold.o
.bss 0x0000000000008a94 0x0 tmp/armeb.v4a-linux.elf-main.o
LOAD tmp/armeb.v4a-linux.elf-fold.o
LOAD tmp/armeb.v4a-linux.elf-main.o
OUTPUT(tmp/armeb.v4a-linux.elf-fold.bin elf32-bigarm)
+10 -10
View File
@@ -9,25 +9,25 @@ Linker script and memory map
TARGET(elf32-i386)
0x0000000000c01080 . = ((0xc01000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000c01080 0x6d8
.text 0x0000000000c01080 0x6bc
*(.text)
.text 0x0000000000c01080 0x154 tmp/i386-linux.elf-fold.o
0x0000000000c011a5 mmap
.text 0x0000000000c011d4 0x583 tmp/i386-linux.elf-main.o
.text 0x0000000000c011d4 0x565 tmp/i386-linux.elf-main.o
0x0000000000c012fc get_page_mask
0x0000000000c015e4 upx_main
0x0000000000c01634 upx_main
*(.data)
*fill* 0x0000000000c01757 0x1 00
.data 0x0000000000c01758 0x0 tmp/i386-linux.elf-fold.o
.data 0x0000000000c01758 0x0 tmp/i386-linux.elf-main.o
*fill* 0x0000000000c01739 0x3 00
.data 0x0000000000c0173c 0x0 tmp/i386-linux.elf-fold.o
.data 0x0000000000c0173c 0x0 tmp/i386-linux.elf-main.o
.data
.bss 0x0000000000c01758 0x0
.bss 0x0000000000c01758 0x0 tmp/i386-linux.elf-fold.o
.bss 0x0000000000c01758 0x0 tmp/i386-linux.elf-main.o
.bss 0x0000000000c0173c 0x0
.bss 0x0000000000c0173c 0x0 tmp/i386-linux.elf-fold.o
.bss 0x0000000000c0173c 0x0 tmp/i386-linux.elf-main.o
.rel.dyn 0x0000000000c01758 0x0
.rel.dyn 0x0000000000c0173c 0x0
.rel.text 0x0000000000000000 0x0 tmp/i386-linux.elf-fold.o
LOAD tmp/i386-linux.elf-fold.o
LOAD tmp/i386-linux.elf-main.o
+8 -8
View File
@@ -9,21 +9,21 @@ Linker script and memory map
TARGET(elf32-bigmips)
0x0000000000100080 . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000100080 0x9d0
.text 0x0000000000100080 0x980
*(.text)
.text 0x0000000000100080 0x130 tmp/mips.r3000-linux.elf-fold.o
.text 0x00000000001001b0 0x8a0 tmp/mips.r3000-linux.elf-main.o
.text 0x00000000001001b0 0x850 tmp/mips.r3000-linux.elf-main.o
0x0000000000100424 get_page_mask
0x0000000000100820 upx_main
0x0000000000100870 upx_main
*(.data)
.data 0x0000000000100a50 0x0 tmp/mips.r3000-linux.elf-fold.o
.data 0x0000000000100a50 0x0 tmp/mips.r3000-linux.elf-main.o
.data 0x0000000000100a00 0x0 tmp/mips.r3000-linux.elf-fold.o
.data 0x0000000000100a00 0x0 tmp/mips.r3000-linux.elf-main.o
.data
.bss 0x0000000000100a50 0x0
.bss 0x0000000000100a50 0x0 tmp/mips.r3000-linux.elf-fold.o
.bss 0x0000000000100a50 0x0 tmp/mips.r3000-linux.elf-main.o
.bss 0x0000000000100a00 0x0
.bss 0x0000000000100a00 0x0 tmp/mips.r3000-linux.elf-fold.o
.bss 0x0000000000100a00 0x0 tmp/mips.r3000-linux.elf-main.o
LOAD tmp/mips.r3000-linux.elf-fold.o
LOAD tmp/mips.r3000-linux.elf-main.o
OUTPUT(tmp/mips.r3000-linux.elf-fold.bin elf32-bigmips)
+8 -8
View File
@@ -9,21 +9,21 @@ Linker script and memory map
TARGET(elf32-littlemips)
0x0000000000100080 . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000100080 0x9d0
.text 0x0000000000100080 0x980
*(.text)
.text 0x0000000000100080 0x130 tmp/mipsel.r3000-linux.elf-fold.o
.text 0x00000000001001b0 0x8a0 tmp/mipsel.r3000-linux.elf-main.o
.text 0x00000000001001b0 0x850 tmp/mipsel.r3000-linux.elf-main.o
0x0000000000100424 get_page_mask
0x0000000000100820 upx_main
0x0000000000100870 upx_main
*(.data)
.data 0x0000000000100a50 0x0 tmp/mipsel.r3000-linux.elf-fold.o
.data 0x0000000000100a50 0x0 tmp/mipsel.r3000-linux.elf-main.o
.data 0x0000000000100a00 0x0 tmp/mipsel.r3000-linux.elf-fold.o
.data 0x0000000000100a00 0x0 tmp/mipsel.r3000-linux.elf-main.o
.data
.bss 0x0000000000100a50 0x0
.bss 0x0000000000100a50 0x0 tmp/mipsel.r3000-linux.elf-fold.o
.bss 0x0000000000100a50 0x0 tmp/mipsel.r3000-linux.elf-main.o
.bss 0x0000000000100a00 0x0
.bss 0x0000000000100a00 0x0 tmp/mipsel.r3000-linux.elf-fold.o
.bss 0x0000000000100a00 0x0 tmp/mipsel.r3000-linux.elf-main.o
LOAD tmp/mipsel.r3000-linux.elf-fold.o
LOAD tmp/mipsel.r3000-linux.elf-main.o
OUTPUT(tmp/mipsel.r3000-linux.elf-fold.bin elf32-littlemips)
+9 -9
View File
@@ -9,7 +9,7 @@ Linker script and memory map
TARGET(elf32-powerpc)
0x0000000000100080 . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x0000000000100080 0x10e0
.text 0x0000000000100080 0x105c
*(.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 0xe7c tmp/powerpc-linux.elf-main.o
0x0000000000100e4c upx_main
.text 0x00000000001002e4 0xdf8 tmp/powerpc-linux.elf-main.o
0x0000000000100ecc upx_main
*(.data)
.data 0x0000000000101160 0x0 tmp/powerpc-linux.elf-fold.o
.data 0x0000000000101160 0x0 tmp/powerpc-linux.elf-main.o
.data 0x00000000001010dc 0x0 tmp/powerpc-linux.elf-fold.o
.data 0x00000000001010dc 0x0 tmp/powerpc-linux.elf-main.o
.data
.bss 0x0000000000101160 0x0
.bss 0x0000000000101160 0x0 tmp/powerpc-linux.elf-fold.o
.bss 0x0000000000101160 0x0 tmp/powerpc-linux.elf-main.o
.bss 0x00000000001010dc 0x0
.bss 0x00000000001010dc 0x0 tmp/powerpc-linux.elf-fold.o
.bss 0x00000000001010dc 0x0 tmp/powerpc-linux.elf-main.o
.rela.dyn 0x0000000000101160 0x0
.rela.dyn 0x00000000001010dc 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
+30 -30
View File
@@ -9,7 +9,7 @@ Linker script and memory map
TARGET(elf64-powerpc)
0x00000000001000bc . = ((0x100000 + SIZEOF_HEADERS) + 0xc)
.text 0x00000000001000bc 0xa58
.text 0x00000000001000bc 0xa04
*(.text)
.text 0x00000000001000bc 0x2d4 tmp/powerpc64-linux.elf-fold.o
0x000000000010033c exit
@@ -21,47 +21,47 @@ TARGET(elf64-powerpc)
0x000000000010036c mprotect
0x0000000000100374 read
0x000000000010037c mmap
.text 0x0000000000100390 0x784 tmp/powerpc64-linux.elf-main.o
.text 0x0000000000100390 0x730 tmp/powerpc64-linux.elf-main.o
*(.data)
.data 0x0000000000100b14 0x0 tmp/powerpc64-linux.elf-fold.o
.data 0x0000000000100b14 0x0 tmp/powerpc64-linux.elf-main.o
.data 0x0000000000100ac0 0x0 tmp/powerpc64-linux.elf-fold.o
.data 0x0000000000100ac0 0x0 tmp/powerpc64-linux.elf-main.o
.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
.sfpr 0x0000000000100ac0 0xa4
.sfpr 0x0000000000100ac0 0xa4 linker stubs
0x0000000000100ac0 _savegpr0_14
0x0000000000100aec _savegpr0_25
0x0000000000100af8 _savegpr0_28
0x0000000000100b10 _restgpr0_14
0x0000000000100b3c _restgpr0_25
0x0000000000100b48 _restgpr0_28
.glink 0x0000000000100bb8 0x0
.glink 0x0000000000100bb8 0x0 linker stubs
.glink 0x0000000000100b68 0x0
.glink 0x0000000000100b68 0x0 linker stubs
.eh_frame 0x0000000000100bb8 0x0
.eh_frame 0x0000000000100bb8 0x0 linker stubs
.eh_frame 0x0000000000100b64 0x0
.eh_frame 0x0000000000100b64 0x0 linker stubs
.rela.dyn 0x0000000000100bb8 0x0
.rela.iplt 0x0000000000100bb8 0x0 linker stubs
.rela.dyn 0x0000000000100b68 0x0
.rela.iplt 0x0000000000100b68 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 0x0000000000100bb8 0x0
.branch_lt 0x0000000000100bb8 0x0 linker stubs
.branch_lt 0x0000000000100b68 0x0
.branch_lt 0x0000000000100b68 0x0 linker stubs
.toc 0x0000000000100bb8 0x0
.toc 0x0000000000100bb8 0x0 tmp/powerpc64-linux.elf-main.o
.toc 0x0000000000100b68 0x0
.toc 0x0000000000100b68 0x0 tmp/powerpc64-linux.elf-main.o
.opd 0x0000000000100bb8 0x58
.opd 0x0000000000100bb8 0x58 tmp/powerpc64-linux.elf-main.o
0x0000000000100bf8 upx_main
.opd 0x0000000000100b68 0x58
.opd 0x0000000000100b68 0x58 tmp/powerpc64-linux.elf-main.o
0x0000000000100ba8 upx_main
.iplt 0x0000000000100c10 0x0
.iplt 0x0000000000100c10 0x0 linker stubs
.iplt 0x0000000000100bc0 0x0
.iplt 0x0000000000100bc0 0x0 linker stubs
.bss 0x0000000000100c10 0x0
.bss 0x0000000000100c10 0x0 tmp/powerpc64-linux.elf-fold.o
.bss 0x0000000000100c10 0x0 tmp/powerpc64-linux.elf-main.o
.bss 0x0000000000100bc0 0x0
.bss 0x0000000000100bc0 0x0 tmp/powerpc64-linux.elf-fold.o
.bss 0x0000000000100bc0 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 0xa30
.text 0x00000000001000bc 0x9dc
*(.text)
.text 0x00000000001000bc 0x2b0 tmp/powerpc64le-linux.elf-fold.o
0x0000000000100318 exit
@@ -21,47 +21,47 @@ TARGET(elf64-powerpcle)
0x0000000000100348 mprotect
0x0000000000100350 read
0x0000000000100358 mmap
.text 0x000000000010036c 0x780 tmp/powerpc64le-linux.elf-main.o
.text 0x000000000010036c 0x72c tmp/powerpc64le-linux.elf-main.o
*(.data)
.data 0x0000000000100aec 0x0 tmp/powerpc64le-linux.elf-fold.o
.data 0x0000000000100aec 0x0 tmp/powerpc64le-linux.elf-main.o
.data 0x0000000000100a98 0x0 tmp/powerpc64le-linux.elf-fold.o
.data 0x0000000000100a98 0x0 tmp/powerpc64le-linux.elf-main.o
.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
.sfpr 0x0000000000100a98 0xa4
.sfpr 0x0000000000100a98 0xa4 linker stubs
0x0000000000100a98 _savegpr0_14
0x0000000000100ac4 _savegpr0_25
0x0000000000100ad0 _savegpr0_28
0x0000000000100ae8 _restgpr0_14
0x0000000000100b14 _restgpr0_25
0x0000000000100b20 _restgpr0_28
.glink 0x0000000000100b90 0x0
.glink 0x0000000000100b90 0x0 linker stubs
.glink 0x0000000000100b40 0x0
.glink 0x0000000000100b40 0x0 linker stubs
.eh_frame 0x0000000000100b90 0x0
.eh_frame 0x0000000000100b90 0x0 linker stubs
.eh_frame 0x0000000000100b3c 0x0
.eh_frame 0x0000000000100b3c 0x0 linker stubs
.rela.dyn 0x0000000000100b90 0x0
.rela.iplt 0x0000000000100b90 0x0 linker stubs
.rela.dyn 0x0000000000100b40 0x0
.rela.iplt 0x0000000000100b40 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 0x0000000000100b90 0x0
.branch_lt 0x0000000000100b90 0x0 linker stubs
.branch_lt 0x0000000000100b40 0x0
.branch_lt 0x0000000000100b40 0x0 linker stubs
.toc 0x0000000000100b90 0x0
.toc 0x0000000000100b90 0x0 tmp/powerpc64le-linux.elf-main.o
.toc 0x0000000000100b40 0x0
.toc 0x0000000000100b40 0x0 tmp/powerpc64le-linux.elf-main.o
.opd 0x0000000000100b90 0x58
.opd 0x0000000000100b90 0x58 tmp/powerpc64le-linux.elf-main.o
0x0000000000100bd0 upx_main
.opd 0x0000000000100b40 0x58
.opd 0x0000000000100b40 0x58 tmp/powerpc64le-linux.elf-main.o
0x0000000000100b80 upx_main
.iplt 0x0000000000100be8 0x0
.iplt 0x0000000000100be8 0x0 linker stubs
.iplt 0x0000000000100b98 0x0
.iplt 0x0000000000100b98 0x0 linker stubs
.bss 0x0000000000100be8 0x0
.bss 0x0000000000100be8 0x0 tmp/powerpc64le-linux.elf-fold.o
.bss 0x0000000000100be8 0x0 tmp/powerpc64le-linux.elf-main.o
.bss 0x0000000000100b98 0x0
.bss 0x0000000000100b98 0x0 tmp/powerpc64le-linux.elf-fold.o
.bss 0x0000000000100b98 0x0 tmp/powerpc64le-linux.elf-main.o