Preserve Mach_segment_header.flags; fix non-PIE main programs on MacOS.

https://github.com/upx/upx/issues/222
	modified:   p_mach.cpp
	modified:   p_mach.h
	modified:   stub/src/amd64-darwin.macho-entry.S
	also *.macho-*.h, *.macho-fold.map, amd64-darwin.macho-entry.bin.dump
This commit is contained in:
John Reiser
2018-09-22 18:45:44 -07:00
parent c1cfde21d7
commit 4d1c754af9
11 changed files with 737 additions and 700 deletions
+33 -33
View File
@@ -72,7 +72,7 @@ LOAD tmp/arm.v5a-darwin.macho-main.o
.plt
*(.plt)
.text 0x0000000008048000 0x94c
.text 0x0000000008048000 0x978
*(.text .stub .text.* .gnu.linkonce.t.*)
.text 0x0000000008048000 0x22c tmp/arm.v5a-darwin.macho-fold.o
0x0000000008048128 munmap
@@ -90,17 +90,17 @@ LOAD tmp/arm.v5a-darwin.macho-main.o
0x00000000080481d0 div10
0x000000000804813c mprotect
0x0000000008048100 close
.text 0x000000000804822c 0x720 tmp/arm.v5a-darwin.macho-main.o
.text 0x000000000804822c 0x74c tmp/arm.v5a-darwin.macho-main.o
0x00000000080483e4 do_xmap
0x0000000008048794 upx_main
0x00000000080487c0 upx_main
*(.text.*personality*)
*(.gnu.warning)
.fini
*(.fini)
0x000000000804894c PROVIDE (__etext, .)
0x000000000804894c PROVIDE (_etext, .)
0x000000000804894c PROVIDE (etext, .)
0x0000000008048978 PROVIDE (__etext, .)
0x0000000008048978 PROVIDE (_etext, .)
0x0000000008048978 PROVIDE (etext, .)
.rodata
*(.rodata .rodata.* .gnu.linkonce.r.*)
@@ -116,8 +116,8 @@ LOAD tmp/arm.v5a-darwin.macho-main.o
.gcc_except_table
*(.gcc_except_table .gcc_except_table.*)
0x000000000804894c . = (ALIGN (0x1000) - ((0x1000 - .) & 0xfff))
0x000000000804994c . = (0x1000 DATA_SEGMENT_ALIGN 0x1000)
0x0000000008048978 . = (ALIGN (0x1000) - ((0x1000 - .) & 0xfff))
0x0000000008049978 . = (0x1000 DATA_SEGMENT_ALIGN 0x1000)
.eh_frame
*(.eh_frame)
@@ -132,22 +132,22 @@ LOAD tmp/arm.v5a-darwin.macho-main.o
*(.tbss .tbss.* .gnu.linkonce.tb.*)
*(.tcommon)
.preinit_array 0x000000000804994c 0x0
0x000000000804994c PROVIDE (__preinit_array_start, .)
.preinit_array 0x0000000008049978 0x0
0x0000000008049978 PROVIDE (__preinit_array_start, .)
*(.preinit_array)
0x000000000804994c PROVIDE (__preinit_array_end, .)
0x0000000008049978 PROVIDE (__preinit_array_end, .)
.init_array 0x000000000804994c 0x0
0x000000000804994c PROVIDE (__init_array_start, .)
.init_array 0x0000000008049978 0x0
0x0000000008049978 PROVIDE (__init_array_start, .)
*(SORT(.init_array.*))
*(.init_array)
0x000000000804994c PROVIDE (__init_array_end, .)
0x0000000008049978 PROVIDE (__init_array_end, .)
.fini_array 0x000000000804994c 0x0
0x000000000804994c PROVIDE (__fini_array_start, .)
.fini_array 0x0000000008049978 0x0
0x0000000008049978 PROVIDE (__fini_array_start, .)
*(.fini_array)
*(SORT(.fini_array.*))
0x000000000804994c PROVIDE (__fini_array_end, .)
0x0000000008049978 PROVIDE (__fini_array_end, .)
.ctors
*crtbegin*.o(.ctors)
@@ -173,35 +173,35 @@ LOAD tmp/arm.v5a-darwin.macho-main.o
.got
*(.got)
0x000000000804994c . = (. DATA_SEGMENT_RELRO_END 0xc)
0x0000000008049978 . = (. DATA_SEGMENT_RELRO_END 0xc)
.got.plt
*(.got.plt)
.data 0x000000000804994c 0x0
.data 0x0000000008049978 0x0
*(.data .data.* .gnu.linkonce.d.*)
.data 0x000000000804994c 0x0 tmp/arm.v5a-darwin.macho-fold.o
.data 0x000000000804994c 0x0 tmp/arm.v5a-darwin.macho-main.o
.data 0x0000000008049978 0x0 tmp/arm.v5a-darwin.macho-fold.o
.data 0x0000000008049978 0x0 tmp/arm.v5a-darwin.macho-main.o
*(.gnu.linkonce.d.*personality*)
.data1
*(.data1)
0x000000000804994c _edata = .
0x000000000804994c PROVIDE (edata, .)
0x000000000804994c __bss_start = .
0x0000000008049978 _edata = .
0x0000000008049978 PROVIDE (edata, .)
0x0000000008049978 __bss_start = .
.bss 0x000000000804994c 0x0
.bss 0x0000000008049978 0x0
*(.dynbss)
*(.bss .bss.* .gnu.linkonce.b.*)
.bss 0x000000000804994c 0x0 tmp/arm.v5a-darwin.macho-fold.o
.bss 0x000000000804994c 0x0 tmp/arm.v5a-darwin.macho-main.o
.bss 0x0000000008049978 0x0 tmp/arm.v5a-darwin.macho-fold.o
.bss 0x0000000008049978 0x0 tmp/arm.v5a-darwin.macho-main.o
*(COMMON)
0x000000000804994c . = ALIGN ((. != 0x0)?0x4:0x1)
0x000000000804994c . = ALIGN (0x4)
0x000000000804994c . = ALIGN (0x4)
0x000000000804994c _end = .
0x000000000804994c PROVIDE (end, .)
0x000000000804994c . = DATA_SEGMENT_END (.)
0x0000000008049978 . = ALIGN ((. != 0x0)?0x4:0x1)
0x0000000008049978 . = ALIGN (0x4)
0x0000000008049978 . = ALIGN (0x4)
0x0000000008049978 _end = .
0x0000000008049978 PROVIDE (end, .)
0x0000000008049978 . = DATA_SEGMENT_END (.)
.stab
*(.stab)