Fix stub for MacOS El Capitan, which has "pre-linked" /usr/bin/dyld

https://github.com/upx/upx/issues/218
https://github.com/Homebrew/homebrew-core/pull/31846
	modified:   src/amd64-darwin.macho-main.c
	    also *-darwin.mach-fold.{h,map}
This commit is contained in:
John Reiser
2018-09-09 15:35:16 -07:00
parent 4bba1e6cb7
commit 9bb6854e64
7 changed files with 485 additions and 407 deletions
+33 -33
View File
@@ -72,7 +72,7 @@ LOAD tmp/amd64-darwin.macho-main.o
.plt
*(.plt)
.text 0x0000000008048000 0x740
.text 0x0000000008048000 0x7a7
*(.text .stub .text.* .gnu.linkonce.t.*)
.text 0x0000000008048000 0x157 tmp/amd64-darwin.macho-fold.o
0x00000000080480b8 munmap
@@ -87,17 +87,17 @@ LOAD tmp/amd64-darwin.macho-main.o
0x00000000080480b4 mprotect
0x00000000080480c0 close
*fill* 0x0000000008048157 0x1 90909090
.text 0x0000000008048158 0x5e8 tmp/amd64-darwin.macho-main.o
.text 0x0000000008048158 0x64f tmp/amd64-darwin.macho-main.o
0x00000000080482d4 do_xmap
0x00000000080485ab upx_main
0x0000000008048612 upx_main
*(.text.*personality*)
*(.gnu.warning)
.fini
*(.fini)
0x0000000008048740 PROVIDE (__etext, .)
0x0000000008048740 PROVIDE (_etext, .)
0x0000000008048740 PROVIDE (etext, .)
0x00000000080487a7 PROVIDE (__etext, .)
0x00000000080487a7 PROVIDE (_etext, .)
0x00000000080487a7 PROVIDE (etext, .)
.rodata
*(.rodata .rodata.* .gnu.linkonce.r.*)
@@ -113,8 +113,8 @@ LOAD tmp/amd64-darwin.macho-main.o
.gcc_except_table
*(.gcc_except_table .gcc_except_table.*)
0x0000000008048740 . = (ALIGN (0x1000) - ((0x1000 - .) & 0xfff))
0x0000000008049740 . = (0x1000 DATA_SEGMENT_ALIGN 0x1000)
0x00000000080487a7 . = (ALIGN (0x1000) - ((0x1000 - .) & 0xfff))
0x00000000080497a7 . = (0x1000 DATA_SEGMENT_ALIGN 0x1000)
.eh_frame
*(.eh_frame)
@@ -129,22 +129,22 @@ LOAD tmp/amd64-darwin.macho-main.o
*(.tbss .tbss.* .gnu.linkonce.tb.*)
*(.tcommon)
.preinit_array 0x0000000008049740 0x0
0x0000000008049740 PROVIDE (__preinit_array_start, .)
.preinit_array 0x00000000080497a7 0x0
0x00000000080497a7 PROVIDE (__preinit_array_start, .)
*(.preinit_array)
0x0000000008049740 PROVIDE (__preinit_array_end, .)
0x00000000080497a7 PROVIDE (__preinit_array_end, .)
.init_array 0x0000000008049740 0x0
0x0000000008049740 PROVIDE (__init_array_start, .)
.init_array 0x00000000080497a7 0x0
0x00000000080497a7 PROVIDE (__init_array_start, .)
*(SORT(.init_array.*))
*(.init_array)
0x0000000008049740 PROVIDE (__init_array_end, .)
0x00000000080497a7 PROVIDE (__init_array_end, .)
.fini_array 0x0000000008049740 0x0
0x0000000008049740 PROVIDE (__fini_array_start, .)
.fini_array 0x00000000080497a7 0x0
0x00000000080497a7 PROVIDE (__fini_array_start, .)
*(.fini_array)
*(SORT(.fini_array.*))
0x0000000008049740 PROVIDE (__fini_array_end, .)
0x00000000080497a7 PROVIDE (__fini_array_end, .)
.ctors
*crtbegin*.o(.ctors)
@@ -170,35 +170,35 @@ LOAD tmp/amd64-darwin.macho-main.o
.got
*(.got)
0x0000000008049740 . = (. DATA_SEGMENT_RELRO_END 0xc)
0x00000000080497a7 . = (. DATA_SEGMENT_RELRO_END 0xc)
.got.plt
*(.got.plt)
.data 0x0000000008049740 0x0
.data 0x00000000080497a8 0x0
*(.data .data.* .gnu.linkonce.d.*)
.data 0x0000000008049740 0x0 tmp/amd64-darwin.macho-fold.o
.data 0x0000000008049740 0x0 tmp/amd64-darwin.macho-main.o
.data 0x00000000080497a8 0x0 tmp/amd64-darwin.macho-fold.o
.data 0x00000000080497a8 0x0 tmp/amd64-darwin.macho-main.o
*(.gnu.linkonce.d.*personality*)
.data1
*(.data1)
0x0000000008049740 _edata = .
0x0000000008049740 PROVIDE (edata, .)
0x0000000008049740 __bss_start = .
0x00000000080497a8 _edata = .
0x00000000080497a8 PROVIDE (edata, .)
0x00000000080497a8 __bss_start = .
.bss 0x0000000008049740 0x0
.bss 0x00000000080497a8 0x0
*(.dynbss)
*(.bss .bss.* .gnu.linkonce.b.*)
.bss 0x0000000008049740 0x0 tmp/amd64-darwin.macho-fold.o
.bss 0x0000000008049740 0x0 tmp/amd64-darwin.macho-main.o
.bss 0x00000000080497a8 0x0 tmp/amd64-darwin.macho-fold.o
.bss 0x00000000080497a8 0x0 tmp/amd64-darwin.macho-main.o
*(COMMON)
0x0000000008049740 . = ALIGN ((. != 0x0)?0x4:0x1)
0x0000000008049740 . = ALIGN (0x4)
0x0000000008049740 . = ALIGN (0x4)
0x0000000008049740 _end = .
0x0000000008049740 PROVIDE (end, .)
0x0000000008049740 . = DATA_SEGMENT_END (.)
0x00000000080497a8 . = ALIGN ((. != 0x0)?0x4:0x1)
0x00000000080497a8 . = ALIGN (0x4)
0x00000000080497a8 . = ALIGN (0x4)
0x00000000080497a8 _end = .
0x00000000080497a8 PROVIDE (end, .)
0x00000000080497a8 . = DATA_SEGMENT_END (.)
.stab
*(.stab)