From 7b45fa115b57d0a6424c369483b320acfe6a1de7 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 29 Jun 2018 10:47:42 +0200 Subject: pkg/csource: support fuchsia Lots of assorted heavylifting to support csource on fuchsia. --- pkg/csource/common.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'pkg/csource/common.go') diff --git a/pkg/csource/common.go b/pkg/csource/common.go index 11eff8384..a0312f619 100644 --- a/pkg/csource/common.go +++ b/pkg/csource/common.go @@ -13,12 +13,12 @@ import ( "github.com/google/syzkaller/sys/targets" ) -func createCommonHeader(p *prog.Prog, opts Options) ([]byte, error) { +func createCommonHeader(p, mmapProg *prog.Prog, opts Options) ([]byte, error) { commonHeader, err := getCommonHeader(p.Target.OS) if err != nil { return nil, err } - defines, err := defineList(p, opts) + defines, err := defineList(p, mmapProg, opts) if err != nil { return nil, err } @@ -53,7 +53,7 @@ func createCommonHeader(p *prog.Prog, opts Options) ([]byte, error) { return src, nil } -func defineList(p *prog.Prog, opts Options) ([]string, error) { +func defineList(p, mmapProg *prog.Prog, opts Options) ([]string, error) { var defines []string bitmasks, csums := prog.RequiredFeatures(p) if bitmasks { @@ -113,6 +113,9 @@ func defineList(p *prog.Prog, opts Options) ([]string, error) { for _, c := range p.Calls { defines = append(defines, "__NR_"+c.Meta.CallName) } + for _, c := range mmapProg.Calls { + defines = append(defines, "__NR_"+c.Meta.CallName) + } defines = append(defines, targets.Get(p.Target.OS, p.Target.Arch).CArch...) return defines, nil } -- cgit mrf-deployment