From f63eeee99fd125d095eaacf0c0739ac14a6e473d Mon Sep 17 00:00:00 2001 From: Julia Hansbrough Date: Wed, 21 Mar 2018 02:26:33 -0700 Subject: fuchsia: Update syzkaller to build with current Fuchsia API. (#543) * fuchsia: Fix the `extractor` tool. The include path in Zircon has changed; updated syz-extract/fuchsia.go to include this, and re-ran extract to get updated *.const files. * fuchsia: Update syzkaller to build with current Fuchsia API. Fuchsia doesn't have a stable API right now, so alas, this will probably continue to change until that's nailed down. But, useful to get this up-to-date at least. Relevant notes: * zx_channel_call_finish and _retry aren't technically public; leave them out until we have a less-cludgy way to expose them * musl supports setjmp/longjmp but not _setjmp/_longjump * remove some unsupported syscalls * update the build invocation --- Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c334d41ae..21a4a8cec 100644 --- a/Makefile +++ b/Makefile @@ -56,11 +56,15 @@ 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-user-x86-64/sysroot -I $(SOURCEDIR)/out/build-zircon/build-user-x86-64 - export ZIRCON_BUILD_DIR=$(SOURCEDIR)/out/build-zircon/build-user-x86-64 + ADDCFLAGS = --target=x86_64-fuchsia -lfdio -lzircon --sysroot $(SOURCEDIR)/out/build-zircon/build-x64/sysroot + export GOROOT=$(SOURCEDIR)/out/debug-x64/goroot + # Required by the goroot. + export ZIRCON_BUILD_DIR=$(SOURCEDIR)/out/build-zircon/build-x64 else ifeq ("$(TARGETARCH)", "arm64") - ADDCFLAGS = --target=aarch64-fuchsia -lfdio -lzircon --sysroot $(SOURCEDIR)/out/build-zircon/build-user-arm64/sysroot -I $(SOURCEDIR)/out/build-zircon/build-user-arm64 - export ZIRCON_BUILD_DIR=$(SOURCEDIR)/out/build-zircon/build-user-arm64 + ADDCFLAGS = --target=aarch64-fuchsia -lfdio -lzircon --sysroot $(SOURCEDIR)/out/build-zircon/build-arm64/sysroot + export GOROOT=$(SOURCEDIR)/out/debug-arm64/goroot + # Required by the goroot. + export ZIRCON_BUILD_DIR=$(SOURCEDIR)/out/build-zircon/build-arm64 endif endif -- cgit mrf-deployment