From 58734039bdddbdfd3c7cd4f9fc232a75f5cef32a Mon Sep 17 00:00:00 2001 From: Hyang-Ah Hana Kim Date: Fri, 23 Mar 2018 15:00:34 +0000 Subject: Revert "cmd/vendor/.../pprof: refresh from upstream@a74ae6f" This reverts commit c6e69ec7f930191022f1369761a680eecc2e89f1. Reason for revert: Broke builders. #24508 Change-Id: I66abff0dd14ec6e1f8d8d982ccfb0438633b639d Reviewed-on: https://go-review.googlesource.com/102316 Reviewed-by: Hyang-Ah Hana Kim --- .../github.com/google/pprof/internal/binutils/binutils.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/cmd/vendor/github.com/google/pprof/internal/binutils/binutils.go') diff --git a/src/cmd/vendor/github.com/google/pprof/internal/binutils/binutils.go b/src/cmd/vendor/github.com/google/pprof/internal/binutils/binutils.go index 94edd0711a..390f952feb 100644 --- a/src/cmd/vendor/github.com/google/pprof/internal/binutils/binutils.go +++ b/src/cmd/vendor/github.com/google/pprof/internal/binutils/binutils.go @@ -111,11 +111,6 @@ func initTools(b *binrep, config string) { defaultPath := paths[""] b.llvmSymbolizer, b.llvmSymbolizerFound = findExe("llvm-symbolizer", append(paths["llvm-symbolizer"], defaultPath...)) b.addr2line, b.addr2lineFound = findExe("addr2line", append(paths["addr2line"], defaultPath...)) - if !b.addr2lineFound { - // On MacOS, brew installs addr2line under gaddr2line name, so search for - // that if the tool is not found by its default name. - b.addr2line, b.addr2lineFound = findExe("gaddr2line", append(paths["addr2line"], defaultPath...)) - } b.nm, b.nmFound = findExe("nm", append(paths["nm"], defaultPath...)) b.objdump, b.objdumpFound = findExe("objdump", append(paths["objdump"], defaultPath...)) } @@ -311,9 +306,9 @@ func (f *fileNM) SourceLine(addr uint64) ([]plugin.Frame, error) { } // fileAddr2Line implements the binutils.ObjFile interface, using -// llvm-symbolizer, if that's available, or addr2line to map addresses to -// symbols (with file/line number information). It can be slow for large -// binaries with debug information. +// 'addr2line' to map addresses to symbols (with file/line number +// information). It can be slow for large binaries with debug +// information. type fileAddr2Line struct { once sync.Once file -- cgit v1.3