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
+45 -45
View File
@@ -67,7 +67,7 @@ LOAD tmp/arm64-darwin.macho-main.o
*(.iplt)
.iplt 0x0000000000400080 0x0 tmp/arm64-darwin.macho-fold.o
.text 0x0000000000400078 0x7d8
.text 0x0000000000400078 0x860
*(.text.unlikely .text.*_unlikely .text.unlikely.*)
*(.text.exit .text.exit.*)
*(.text.startup .text.startup.*)
@@ -87,16 +87,16 @@ LOAD tmp/arm64-darwin.macho-main.o
0x000000000040018c mmap
0x0000000000400198 pread
0x00000000004001a4 bswap
.text 0x00000000004001d0 0x680 tmp/arm64-darwin.macho-main.o
.text 0x00000000004001d0 0x708 tmp/arm64-darwin.macho-main.o
0x000000000040037c do_xmap
0x0000000000400674 upx_main
0x00000000004006fc upx_main
*(.gnu.warning)
.fini
*(SORT(.fini))
0x0000000000400850 PROVIDE (__etext, .)
0x0000000000400850 PROVIDE (_etext, .)
0x0000000000400850 PROVIDE (etext, .)
0x00000000004008d8 PROVIDE (__etext, .)
0x00000000004008d8 PROVIDE (_etext, .)
0x00000000004008d8 PROVIDE (etext, .)
.rodata
*(.rodata .rodata.* .gnu.linkonce.r.*)
@@ -107,18 +107,18 @@ LOAD tmp/arm64-darwin.macho-main.o
.eh_frame_hdr
*(.eh_frame_hdr)
.eh_frame 0x0000000000400850 0x110
.eh_frame 0x00000000004008d8 0x108
*(.eh_frame)
.eh_frame 0x0000000000400850 0x110 tmp/arm64-darwin.macho-main.o
0x108 (size before relaxing)
.eh_frame 0x00000000004008d8 0x108 tmp/arm64-darwin.macho-main.o
0x100 (size before relaxing)
.gcc_except_table
*(.gcc_except_table .gcc_except_table.*)
.exception_ranges
*(.exception_ranges .exception_ranges*)
0x0000000000400960 . = (ALIGN (0x10000) - ((0x10000 - .) & 0xffff))
0x0000000000410960 . = DATA_SEGMENT_ALIGN (0x10000, 0x1000)
0x00000000004009e0 . = (ALIGN (0x10000) - ((0x10000 - .) & 0xffff))
0x00000000004109e0 . = DATA_SEGMENT_ALIGN (0x10000, 0x1000)
.eh_frame
*(.eh_frame)
@@ -136,22 +136,22 @@ LOAD tmp/arm64-darwin.macho-main.o
*(.tbss .tbss.* .gnu.linkonce.tb.*)
*(.tcommon)
.preinit_array 0x0000000000410960 0x0
0x0000000000410960 PROVIDE (__preinit_array_start, .)
.preinit_array 0x00000000004109e0 0x0
0x00000000004109e0 PROVIDE (__preinit_array_start, .)
*(.preinit_array)
0x0000000000410960 PROVIDE (__preinit_array_end, .)
0x00000000004109e0 PROVIDE (__preinit_array_end, .)
.init_array 0x0000000000410960 0x0
0x0000000000410960 PROVIDE (__init_array_start, .)
.init_array 0x00000000004109e0 0x0
0x00000000004109e0 PROVIDE (__init_array_start, .)
*(SORT(.init_array.*))
*(.init_array)
0x0000000000410960 PROVIDE (__init_array_end, .)
0x00000000004109e0 PROVIDE (__init_array_end, .)
.fini_array 0x0000000000410960 0x0
0x0000000000410960 PROVIDE (__fini_array_start, .)
.fini_array 0x00000000004109e0 0x0
0x00000000004109e0 PROVIDE (__fini_array_start, .)
*(SORT(.fini_array.*))
*(.fini_array)
0x0000000000410960 PROVIDE (__fini_array_end, .)
0x00000000004109e0 PROVIDE (__fini_array_end, .)
.ctors
*crtbegin.o(.ctors)
@@ -180,43 +180,43 @@ LOAD tmp/arm64-darwin.macho-main.o
.got
*(.got)
*(.igot)
0x0000000000410960 . = DATA_SEGMENT_RELRO_END (., 0x18)
0x00000000004109e0 . = DATA_SEGMENT_RELRO_END (., 0x18)
.got.plt 0x0000000000410960 0x0
.got.plt 0x00000000004109e0 0x0
*(.got.plt)
*(.igot.plt)
.igot.plt 0x0000000000410960 0x0 tmp/arm64-darwin.macho-fold.o
.igot.plt 0x00000000004109e0 0x0 tmp/arm64-darwin.macho-fold.o
.data 0x0000000000410960 0x0
0x0000000000410960 PROVIDE (__data_start, .)
.data 0x00000000004109e0 0x0
0x00000000004109e0 PROVIDE (__data_start, .)
*(.data .data.* .gnu.linkonce.d.*)
.data 0x0000000000410960 0x0 tmp/arm64-darwin.macho-fold.o
.data 0x0000000000410960 0x0 tmp/arm64-darwin.macho-main.o
.data 0x00000000004109e0 0x0 tmp/arm64-darwin.macho-fold.o
.data 0x00000000004109e0 0x0 tmp/arm64-darwin.macho-main.o
.data1
*(.data1)
0x0000000000410960 _edata = .
0x0000000000410960 PROVIDE (edata, .)
0x0000000000410960 . = .
0x0000000000410960 __bss_start = .
0x0000000000410960 __bss_start__ = .
0x00000000004109e0 _edata = .
0x00000000004109e0 PROVIDE (edata, .)
0x00000000004109e0 . = .
0x00000000004109e0 __bss_start = .
0x00000000004109e0 __bss_start__ = .
.bss 0x0000000000410960 0x0
.bss 0x00000000004109e0 0x0
*(.dynbss)
*(.bss .bss.* .gnu.linkonce.b.*)
.bss 0x0000000000410960 0x0 tmp/arm64-darwin.macho-fold.o
.bss 0x0000000000410960 0x0 tmp/arm64-darwin.macho-main.o
.bss 0x00000000004109e0 0x0 tmp/arm64-darwin.macho-fold.o
.bss 0x00000000004109e0 0x0 tmp/arm64-darwin.macho-main.o
*(COMMON)
0x0000000000410960 . = ALIGN ((. != 0x0)?0x8:0x1)
0x0000000000410960 _bss_end__ = .
0x0000000000410960 __bss_end__ = .
0x0000000000410960 . = ALIGN (0x8)
0x0000000000410960 . = SEGMENT_START ("ldata-segment", .)
0x0000000000410960 . = ALIGN (0x8)
0x0000000000410960 __end__ = .
0x0000000000410960 _end = .
0x0000000000410960 PROVIDE (end, .)
0x0000000000410960 . = DATA_SEGMENT_END (.)
0x00000000004109e0 . = ALIGN ((. != 0x0)?0x8:0x1)
0x00000000004109e0 _bss_end__ = .
0x00000000004109e0 __bss_end__ = .
0x00000000004109e0 . = ALIGN (0x8)
0x00000000004109e0 . = SEGMENT_START ("ldata-segment", .)
0x00000000004109e0 . = ALIGN (0x8)
0x00000000004109e0 __end__ = .
0x00000000004109e0 _end = .
0x00000000004109e0 PROVIDE (end, .)
0x00000000004109e0 . = DATA_SEGMENT_END (.)
.stab
*(.stab)