From bc258b506da8ceda014bf1d40d695d1890e9f785 Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Tue, 2 Jun 2020 08:17:38 +0200 Subject: pkg: support compiler triple for 'nm' and 'addr2line' In preparation to support big-endian architectures. --- pkg/report/akaros.go | 2 +- pkg/report/bsd.go | 5 +++-- pkg/report/fuchsia.go | 2 +- pkg/report/linux.go | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) (limited to 'pkg/report') diff --git a/pkg/report/akaros.go b/pkg/report/akaros.go index 8a328fce9..29c950cc4 100644 --- a/pkg/report/akaros.go +++ b/pkg/report/akaros.go @@ -49,7 +49,7 @@ func (ctx *akaros) Symbolize(rep *Report) error { if ctx.objfile == "" { return nil } - symb := symbolizer.NewSymbolizer() + symb := symbolizer.NewSymbolizer(ctx.config.target) defer symb.Close() var symbolized []byte s := bufio.NewScanner(bytes.NewReader(rep.Report)) diff --git a/pkg/report/bsd.go b/pkg/report/bsd.go index 369ffcab9..d79c36b6c 100644 --- a/pkg/report/bsd.go +++ b/pkg/report/bsd.go @@ -29,7 +29,8 @@ func ctorBSD(cfg *config, oopses []*oops, symbolizeRes []*regexp.Regexp) (Report if cfg.kernelObj != "" { kernelObject = filepath.Join(cfg.kernelObj, cfg.target.KernelObject) var err error - symbols, err = symbolizer.ReadTextSymbols(kernelObject) + symb := symbolizer.NewSymbolizer(cfg.target) + symbols, err = symb.ReadTextSymbols(kernelObject) if err != nil { return nil, err } @@ -63,7 +64,7 @@ func (ctx *bsd) Parse(output []byte) *Report { } func (ctx *bsd) Symbolize(rep *Report) error { - symb := symbolizer.NewSymbolizer() + symb := symbolizer.NewSymbolizer(ctx.config.target) defer symb.Close() var symbolized []byte s := bufio.NewScanner(bytes.NewReader(rep.Report)) diff --git a/pkg/report/fuchsia.go b/pkg/report/fuchsia.go index df64055e4..bed4d8952 100644 --- a/pkg/report/fuchsia.go +++ b/pkg/report/fuchsia.go @@ -86,7 +86,7 @@ func (ctx *fuchsia) shortenReport(report []byte) []byte { } func (ctx *fuchsia) symbolize(output []byte) []byte { - symb := symbolizer.NewSymbolizer() + symb := symbolizer.NewSymbolizer(ctx.config.target) defer symb.Close() out := new(bytes.Buffer) for s := bufio.NewScanner(bytes.NewReader(output)); s.Scan(); { diff --git a/pkg/report/linux.go b/pkg/report/linux.go index d5dac95f5..03d6b72ed 100644 --- a/pkg/report/linux.go +++ b/pkg/report/linux.go @@ -38,7 +38,8 @@ func ctorLinux(cfg *config) (Reporter, []string, error) { if cfg.kernelObj != "" { vmlinux = filepath.Join(cfg.kernelObj, cfg.target.KernelObject) var err error - symbols, err = symbolizer.ReadTextSymbols(vmlinux) + symb := symbolizer.NewSymbolizer(cfg.target) + symbols, err = symb.ReadTextSymbols(vmlinux) if err != nil { return nil, nil, err } @@ -356,7 +357,7 @@ func (ctx *linux) Symbolize(rep *Report) error { } func (ctx *linux) symbolize(rep *Report) error { - symb := symbolizer.NewSymbolizer() + symb := symbolizer.NewSymbolizer(ctx.config.target) defer symb.Close() var symbolized []byte s := bufio.NewScanner(bytes.NewReader(rep.Report)) -- cgit mrf-deployment