diff options
| author | Julia Hansbrough <flowerhack@google.com> | 2018-02-01 18:24:22 -0800 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-02-04 12:21:23 +0100 |
| commit | a1bc9d40ad7e062fd2867a8c3ecdd403dea2c6be (patch) | |
| tree | c09c8212e9da6f9218d8becc05edb7d4b7b769f0 | |
| parent | 632a8c2c6c02a29c6582875951060fce9e94ab86 (diff) | |
syz/syz-extract: Update Fuchsia extractor with current Fuchsia paths.
A change in Zircon a while back moved around where sysroots are located
in Fuchsia; this update will allow for proper extraction.
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | sys/syz-extract/fuchsia.go | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index f74a620de..02f6ff554 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -15,6 +15,7 @@ Google Inc. Willem de Bruijn Eric Biggers Atul Prakash + Julia Hansbrough Baozeng Ding Lorenzo Stoakes Jeremy Huang @@ -52,9 +52,9 @@ ifeq ("$(TARGETOS)", "fuchsia") export CGO_ENABLED=1 NOSTATIC = 1 ifeq ("$(TARGETARCH)", "amd64") - ADDCFLAGS = --target=x86_64-fuchsia -lfdio -lzircon --sysroot $(SOURCEDIR)/out/build-zircon/build-zircon-pc-x86-64/sysroot -I $(SOURCEDIR)/out/build-zircon/build-zircon-pc-x86-64 + ADDCFLAGS = --target=x86_64-fuchsia -lfdio -lzircon --sysroot $(SOURCEDIR)/out/build-zircon/build-user-x86-64/sysroot -I $(SOURCEDIR)/out/build-zircon/build-user-x86-64 else ifeq ("$(TARGETARCH)", "arm64") - ADDCFLAGS = --target=aarch64-fuchsia -lfdio -lzircon --sysroot $(SOURCEDIR)/out/build-zircon/build-zircon-pc-arm64/sysroot -I $(SOURCEDIR)/out/build-zircon/build-zircon-pc-arm64 + ADDCFLAGS = --target=aarch64-fuchsia -lfdio -lzircon --sysroot $(SOURCEDIR)/out/build-zircon/build-user-arm64/sysroot -I $(SOURCEDIR)/out/build-zircon/build-user-arm64 endif endif diff --git a/sys/syz-extract/fuchsia.go b/sys/syz-extract/fuchsia.go index d7001ce2b..b0ed84edf 100644 --- a/sys/syz-extract/fuchsia.go +++ b/sys/syz-extract/fuchsia.go @@ -26,7 +26,7 @@ func (*fuchsia) prepareArch(arch *Arch) error { func (*fuchsia) processFile(arch *Arch, info *compiler.ConstInfo) (map[string]uint64, map[string]bool, error) { dir := arch.sourceDir cc := filepath.Join(dir, "buildtools", "linux-x64", "clang", "bin", "clang") - includeDir := filepath.Join(dir, "out", "build-zircon", "build-zircon-pc-x86-64", "sysroot", "include") + includeDir := filepath.Join(dir, "out", "build-zircon", "build-user-x86-64", "sysroot", "include") args := []string{"-fmessage-length=0", "-I" + includeDir} for _, incdir := range info.Incdirs { args = append(args, "-I"+filepath.Join(dir, incdir)) |