Skip to content

Commit b6ff3c6

Browse files
committed
cmd/link: support more load commands on Mach-O
Change-Id: I74dd9170a51cc93ce3ec5e5860c2eb2912f081f5 Reviewed-on: https://go-review.googlesource.com/c/go/+/312729 Trust: Cherry Zhang <[email protected]> Run-TryBot: Cherry Zhang <[email protected]> Reviewed-by: Than McIntosh <[email protected]> TryBot-Result: Go Bot <[email protected]>
1 parent 1a56655 commit b6ff3c6

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

src/cmd/link/internal/ld/macho.go

+4
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ const (
8888
MACHO_SUBCPU_ARMV7 = 9
8989
MACHO_CPU_ARM64 = 1<<24 | 12
9090
MACHO_SUBCPU_ARM64_ALL = 0
91+
MACHO_SUBCPU_ARM64_V8 = 1
92+
MACHO_SUBCPU_ARM64E = 2
9193
MACHO32SYMSIZE = 12
9294
MACHO64SYMSIZE = 16
9395
MACHO_X86_64_RELOC_UNSIGNED = 0
@@ -178,6 +180,8 @@ const (
178180
LC_VERSION_MIN_WATCHOS = 0x30
179181
LC_VERSION_NOTE = 0x31
180182
LC_BUILD_VERSION = 0x32
183+
LC_DYLD_EXPORTS_TRIE = 0x80000033
184+
LC_DYLD_CHAINED_FIXUPS = 0x80000034
181185
)
182186

183187
const (

src/cmd/link/internal/ld/macho_combine_dwarf.go

+10-2
Original file line numberDiff line numberDiff line change
@@ -222,11 +222,19 @@ func machoCombineDwarf(ctxt *Link, exef *os.File, exem *macho.File, dsym, outexe
222222
err = machoUpdateLoadCommand(reader, linkseg, linkoffset, &macho.SymtabCmd{}, "Symoff", "Stroff")
223223
case macho.LoadCmdDysymtab:
224224
err = machoUpdateLoadCommand(reader, linkseg, linkoffset, &macho.DysymtabCmd{}, "Tocoffset", "Modtaboff", "Extrefsymoff", "Indirectsymoff", "Extreloff", "Locreloff")
225-
case LC_CODE_SIGNATURE, LC_SEGMENT_SPLIT_INFO, LC_FUNCTION_STARTS, LC_DATA_IN_CODE, LC_DYLIB_CODE_SIGN_DRS:
225+
case LC_CODE_SIGNATURE, LC_SEGMENT_SPLIT_INFO, LC_FUNCTION_STARTS, LC_DATA_IN_CODE, LC_DYLIB_CODE_SIGN_DRS,
226+
LC_DYLD_EXPORTS_TRIE, LC_DYLD_CHAINED_FIXUPS:
226227
err = machoUpdateLoadCommand(reader, linkseg, linkoffset, &linkEditDataCmd{}, "DataOff")
227228
case LC_ENCRYPTION_INFO, LC_ENCRYPTION_INFO_64:
228229
err = machoUpdateLoadCommand(reader, linkseg, linkoffset, &encryptionInfoCmd{}, "CryptOff")
229-
case macho.LoadCmdDylib, macho.LoadCmdThread, macho.LoadCmdUnixThread, LC_PREBOUND_DYLIB, LC_UUID, LC_VERSION_MIN_MACOSX, LC_VERSION_MIN_IPHONEOS, LC_SOURCE_VERSION, LC_MAIN, LC_LOAD_DYLINKER, LC_LOAD_WEAK_DYLIB, LC_REEXPORT_DYLIB, LC_RPATH, LC_ID_DYLIB, LC_SYMSEG, LC_LOADFVMLIB, LC_IDFVMLIB, LC_IDENT, LC_FVMFILE, LC_PREPAGE, LC_ID_DYLINKER, LC_ROUTINES, LC_SUB_FRAMEWORK, LC_SUB_UMBRELLA, LC_SUB_CLIENT, LC_SUB_LIBRARY, LC_TWOLEVEL_HINTS, LC_PREBIND_CKSUM, LC_ROUTINES_64, LC_LAZY_LOAD_DYLIB, LC_LOAD_UPWARD_DYLIB, LC_DYLD_ENVIRONMENT, LC_LINKER_OPTION, LC_LINKER_OPTIMIZATION_HINT, LC_VERSION_MIN_TVOS, LC_VERSION_MIN_WATCHOS, LC_VERSION_NOTE, LC_BUILD_VERSION:
230+
case macho.LoadCmdDylib, macho.LoadCmdThread, macho.LoadCmdUnixThread,
231+
LC_PREBOUND_DYLIB, LC_UUID, LC_VERSION_MIN_MACOSX, LC_VERSION_MIN_IPHONEOS, LC_SOURCE_VERSION,
232+
LC_MAIN, LC_LOAD_DYLINKER, LC_LOAD_WEAK_DYLIB, LC_REEXPORT_DYLIB, LC_RPATH, LC_ID_DYLIB,
233+
LC_SYMSEG, LC_LOADFVMLIB, LC_IDFVMLIB, LC_IDENT, LC_FVMFILE, LC_PREPAGE, LC_ID_DYLINKER,
234+
LC_ROUTINES, LC_SUB_FRAMEWORK, LC_SUB_UMBRELLA, LC_SUB_CLIENT, LC_SUB_LIBRARY, LC_TWOLEVEL_HINTS,
235+
LC_PREBIND_CKSUM, LC_ROUTINES_64, LC_LAZY_LOAD_DYLIB, LC_LOAD_UPWARD_DYLIB, LC_DYLD_ENVIRONMENT,
236+
LC_LINKER_OPTION, LC_LINKER_OPTIMIZATION_HINT, LC_VERSION_MIN_TVOS, LC_VERSION_MIN_WATCHOS,
237+
LC_VERSION_NOTE, LC_BUILD_VERSION:
230238
// Nothing to update
231239
default:
232240
err = fmt.Errorf("unknown load command 0x%x (%s)", int(cmd.Cmd), cmd.Cmd)

0 commit comments

Comments
 (0)