diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2018-05-16 14:13:11 +0200 |
|---|---|---|
| committer | Tobias Klauser <tobias.klauser@gmail.com> | 2018-05-16 15:32:50 +0000 |
| commit | ca3364836f6cb3645b53832379f8f8b3f5b82ae8 (patch) | |
| tree | 6e07b269f85e6675ccd7d5e451138fa0efda084a | |
| parent | dbd66fd3d07433a03da5dc6c6def8c53951ada77 (diff) | |
| download | go-ca3364836f6cb3645b53832379f8f8b3f5b82ae8.tar.gz go-ca3364836f6cb3645b53832379f8f8b3f5b82ae8.zip | |
cmd/internal/objfile, debug/macho: support disassembling arm64 Mach-O objects
Fixes #25423
Change-Id: I6bed0726b8f4c7d607a3df271b2ab1006e96fa75
Reviewed-on: https://go-review.googlesource.com/113356
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
| -rw-r--r-- | src/cmd/internal/objfile/macho.go | 2 | ||||
| -rw-r--r-- | src/debug/macho/macho.go | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/cmd/internal/objfile/macho.go b/src/cmd/internal/objfile/macho.go index 7a8999e5ba..fdb7e76dfc 100644 --- a/src/cmd/internal/objfile/macho.go +++ b/src/cmd/internal/objfile/macho.go @@ -113,6 +113,8 @@ func (f *machoFile) goarch() string { return "amd64" case macho.CpuArm: return "arm" + case macho.CpuArm64: + return "arm64" case macho.CpuPpc64: return "ppc64" } diff --git a/src/debug/macho/macho.go b/src/debug/macho/macho.go index fed8eb25a4..7bc1950bfd 100644 --- a/src/debug/macho/macho.go +++ b/src/debug/macho/macho.go @@ -60,6 +60,7 @@ const ( Cpu386 Cpu = 7 CpuAmd64 Cpu = Cpu386 | cpuArch64 CpuArm Cpu = 12 + CpuArm64 Cpu = CpuArm | cpuArch64 CpuPpc Cpu = 18 CpuPpc64 Cpu = CpuPpc | cpuArch64 ) @@ -68,6 +69,7 @@ var cpuStrings = []intName{ {uint32(Cpu386), "Cpu386"}, {uint32(CpuAmd64), "CpuAmd64"}, {uint32(CpuArm), "CpuArm"}, + {uint32(CpuArm64), "CpuArm64"}, {uint32(CpuPpc), "CpuPpc"}, {uint32(CpuPpc64), "CpuPpc64"}, } |