diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2020-06-02 12:08:12 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-06-02 13:39:30 +0200 |
| commit | d56234396c9f0204b7ca9e030353e01a3a272160 (patch) | |
| tree | 509b7456308976940ede944e6ebe1ea752646c4a /pkg | |
| parent | a0331e89e036103c95eb898742ea5d5f28a987b0 (diff) | |
pkg/cover: support coverage reports on fuchsia
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/cover/report.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkg/cover/report.go b/pkg/cover/report.go index 82f0c5721..e820ccebe 100644 --- a/pkg/cover/report.go +++ b/pkg/cover/report.go @@ -359,11 +359,7 @@ func objdumpAndSymbolize(target *targets.Target, obj string) ([]symbolizer.Frame } errc <- err }() - objdump := "objdump" - if target.Triple != "" { - objdump = target.Triple + "-" + objdump - } - cmd := osutil.Command(objdump, "-d", "--no-show-raw-insn", obj) + cmd := osutil.Command(target.Objdump, "-d", "--no-show-raw-insn", obj) stdout, err := cmd.StdoutPipe() if err != nil { return nil, err @@ -499,7 +495,8 @@ func archCallInsn(target *targets.Target) ([][]byte, [][]byte) { switch target.Arch { case "amd64": // ffffffff8100206a: callq ffffffff815cc1d0 <__sanitizer_cov_trace_pc> - return [][]byte{[]byte("\tcallq ")}, callName + // To make life more interesting, llvm-objdump does spaces slightly differently. + return [][]byte{[]byte("\tcallq "), []byte("\tcallq\t")}, callName case "386": // c1000102: call c10001f0 <__sanitizer_cov_trace_pc> return [][]byte{[]byte("\tcall ")}, callName |