Makefile: don't compile all targets into target binaries

Currently target binaries contain support for all OS/arch combinations. However, obviously a fuchsia target binary won't test windows. For target binaries we need support only for a single target (with the exception of 386/arm target in amd64/arm64 binaries). So compile in only _the_ target into target binaries. This reduces akaros/amd64 fuzzer binary from 33 to 7 MB and execprog from 28 to 2 MB.
google · Aug 2, 2018 · d9a893a · d9a893a
1 parent 5cbdd9f
commit d9a893a
Show file tree

Hide file tree

Showing 34 changed files with 190 additions and 119 deletions.
diff --git a/Makefile b/Makefile
@@ -49,11 +49,6 @@ ifeq ("$(TARGETOS)", "fuchsia")
 	GO = "$(SOURCEDIR)/scripts/devshell/go"
 endif
 
-ifeq ("$(TARGETOS)", "akaros")
-	TARGETGOOS := $(HOSTOS)
-	TARGETGOARCH := $(HOSTARCH)
-endif
-
 GITREV=$(shell git rev-parse HEAD)
 ifeq ("$(shell git diff --shortstat)", "")
 	REV=$(GITREV)
@@ -66,8 +61,16 @@ endif
 # That's only needed if you use gdb or nm.
 # If you need that, build manually without these flags.
 GOFLAGS := "-ldflags=-s -w -X github.com/google/syzkaller/sys.GitRevision=$(REV)"
+GOHOSTFLAGS := $(GOFLAGS)
+GOTARGETFLAGS := $(GOFLAGS)
 ifneq ("$(GOTAGS)", "")
-	GOFLAGS += "-tags=$(GOTAGS)"
+	GOHOSTFLAGS += "-tags=$(GOTAGS)"
+endif
+GOTARGETFLAGS += "-tags=syz_target syz_os_$(TARGETOS) syz_arch_$(TARGETVMARCH) $(GOTAGS)"
+
+ifeq ("$(TARGETOS)", "akaros")
+	TARGETGOOS := $(HOSTOS)
+	TARGETGOARCH := $(HOSTARCH)
 endif
 
 .PHONY: all host target \
@@ -103,42 +106,42 @@ executor:
 		-DGOOS_$(TARGETOS)=1 -DGOARCH_$(TARGETARCH)=1  -DGIT_REVISION=\"$(REV)\"
 
 manager:
-	GOOS=$(HOSTOS) GOARCH=$(HOSTARCH) $(HOSTGO) build $(GOFLAGS) -o ./bin/syz-manager github.com/google/syzkaller/syz-manager
+	GOOS=$(HOSTOS) GOARCH=$(HOSTARCH) $(HOSTGO) build $(GOHOSTFLAGS) -o ./bin/syz-manager github.com/google/syzkaller/syz-manager
 
 fuzzer:
-	GOOS=$(TARGETGOOS) GOARCH=$(TARGETGOARCH) $(GO) build $(GOFLAGS) -o ./bin/$(TARGETOS)_$(TARGETVMARCH)/syz-fuzzer$(EXE) github.com/google/syzkaller/syz-fuzzer
+	GOOS=$(TARGETGOOS) GOARCH=$(TARGETGOARCH) $(GO) build $(GOTARGETFLAGS) -o ./bin/$(TARGETOS)_$(TARGETVMARCH)/syz-fuzzer$(EXE) github.com/google/syzkaller/syz-fuzzer
 
 execprog:
-	GOOS=$(TARGETGOOS) GOARCH=$(TARGETGOARCH) $(GO) build $(GOFLAGS) -o ./bin/$(TARGETOS)_$(TARGETVMARCH)/syz-execprog$(EXE) github.com/google/syzkaller/tools/syz-execprog
+	GOOS=$(TARGETGOOS) GOARCH=$(TARGETGOARCH) $(GO) build $(GOTARGETFLAGS) -o ./bin/$(TARGETOS)_$(TARGETVMARCH)/syz-execprog$(EXE) github.com/google/syzkaller/tools/syz-execprog
 
 ci:
-	GOOS=$(HOSTOS) GOARCH=$(HOSTARCH) $(HOSTGO) build $(GOFLAGS) -o ./bin/syz-ci github.com/google/syzkaller/syz-ci
+	GOOS=$(HOSTOS) GOARCH=$(HOSTARCH) $(HOSTGO) build $(GOHOSTFLAGS) -o ./bin/syz-ci github.com/google/syzkaller/syz-ci
 
 hub:
-	GOOS=$(HOSTOS) GOARCH=$(HOSTARCH) $(HOSTGO) build $(GOFLAGS) -o ./bin/syz-hub github.com/google/syzkaller/syz-hub
+	GOOS=$(HOSTOS) GOARCH=$(HOSTARCH) $(HOSTGO) build $(GOHOSTFLAGS) -o ./bin/syz-hub github.com/google/syzkaller/syz-hub
 
 repro:
-	GOOS=$(HOSTOS) GOARCH=$(HOSTARCH) $(HOSTGO) build $(GOFLAGS) -o ./bin/syz-repro github.com/google/syzkaller/tools/syz-repro
+	GOOS=$(HOSTOS) GOARCH=$(HOSTARCH) $(HOSTGO) build $(GOHOSTFLAGS) -o ./bin/syz-repro github.com/google/syzkaller/tools/syz-repro
 
 mutate:
-	GOOS=$(HOSTOS) GOARCH=$(HOSTARCH) $(HOSTGO) build $(GOFLAGS) -o ./bin/syz-mutate github.com/google/syzkaller/tools/syz-mutate
+	GOOS=$(HOSTOS) GOARCH=$(HOSTARCH) $(HOSTGO) build $(GOHOSTFLAGS) -o ./bin/syz-mutate github.com/google/syzkaller/tools/syz-mutate
 
 prog2c:
-	GOOS=$(HOSTOS) GOARCH=$(HOSTARCH) $(HOSTGO) build $(GOFLAGS) -o ./bin/syz-prog2c github.com/google/syzkaller/tools/syz-prog2c
+	GOOS=$(HOSTOS) GOARCH=$(HOSTARCH) $(HOSTGO) build $(GOHOSTFLAGS) -o ./bin/syz-prog2c github.com/google/syzkaller/tools/syz-prog2c
 
 stress:
-	GOOS=$(TARGETGOOS) GOARCH=$(TARGETGOARCH) $(GO) build $(GOFLAGS) -o ./bin/$(TARGETOS)_$(TARGETVMARCH)/syz-stress$(EXE) github.com/google/syzkaller/tools/syz-stress
+	GOOS=$(TARGETGOOS) GOARCH=$(TARGETGOARCH) $(GO) build $(GOTARGETFLAGS) -o ./bin/$(TARGETOS)_$(TARGETVMARCH)/syz-stress$(EXE) github.com/google/syzkaller/tools/syz-stress
 
 db:
-	GOOS=$(HOSTOS) GOARCH=$(HOSTARCH) $(HOSTGO) build $(GOFLAGS) -o ./bin/syz-db github.com/google/syzkaller/tools/syz-db
+	GOOS=$(HOSTOS) GOARCH=$(HOSTARCH) $(HOSTGO) build $(GOHOSTFLAGS) -o ./bin/syz-db github.com/google/syzkaller/tools/syz-db
 
 upgrade:
-	GOOS=$(HOSTOS) GOARCH=$(HOSTARCH) $(HOSTGO) build $(GOFLAGS) -o ./bin/syz-upgrade github.com/google/syzkaller/tools/syz-upgrade
+	GOOS=$(HOSTOS) GOARCH=$(HOSTARCH) $(HOSTGO) build $(GOHOSTFLAGS) -o ./bin/syz-upgrade github.com/google/syzkaller/tools/syz-upgrade
 
 extract: bin/syz-extract
 	bin/syz-extract -build -os=$(TARGETOS) -sourcedir=$(SOURCEDIR) $(FILES)
 bin/syz-extract:
-	GOOS=$(HOSTOS) GOARCH=$(HOSTARCH) $(HOSTGO) build $(GOFLAGS) -o $@ ./sys/syz-extract
+	GOOS=$(HOSTOS) GOARCH=$(HOSTARCH) $(HOSTGO) build $(GOHOSTFLAGS) -o $@ ./sys/syz-extract
 
 generate: generate_go generate_sys
 	$(MAKE) format
@@ -150,7 +153,7 @@ generate_sys: bin/syz-sysgen
 	bin/syz-sysgen
 
 bin/syz-sysgen:
-	$(GO) build $(GOFLAGS) -o $@ ./sys/syz-sysgen
+	$(GO) build $(GOHOSTFLAGS) -o $@ ./sys/syz-sysgen
 
 format: format_go format_cpp format_sys
 
@@ -170,7 +173,7 @@ format_sys: bin/syz-fmt
 	bin/syz-fmt sys/windows
 
 bin/syz-fmt:
-	$(GO) build $(GOFLAGS) -o $@ ./tools/syz-fmt
+	$(GO) build $(GOHOSTFLAGS) -o $@ ./tools/syz-fmt
 
 tidy:
 	# A single check is enabled for now. But it's always fixable and proved to be useful.

diff --git a/executor/defs.h b/executor/defs.h
@@ -5,7 +5,7 @@
 
 #if GOARCH_amd64
 #define GOARCH "amd64"
-#define SYZ_REVISION "36f0e5da1becfe451b2936a2b8b1739deb53c609"
+#define SYZ_REVISION "0dd50d0ed02c0d84fb296a804d96c2f758c18e11"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 1
 #define SYZ_EXECUTOR_USES_SHMEM 0
 #define SYZ_PAGE_SIZE 4096
@@ -20,7 +20,7 @@
 
 #if GOARCH_amd64
 #define GOARCH "amd64"
-#define SYZ_REVISION "fd7de83a3ebf8e454b041bbfe7513ed4a139d44d"
+#define SYZ_REVISION "89eac40a68a14ffc0af9fc9b181147236b82d00b"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 1
 #define SYZ_EXECUTOR_USES_SHMEM 1
 #define SYZ_PAGE_SIZE 4096
@@ -35,7 +35,7 @@
 
 #if GOARCH_amd64
 #define GOARCH "amd64"
-#define SYZ_REVISION "9540132f74bbe9bfb7e8f215844bdb3a88b9a665"
+#define SYZ_REVISION "4cc56cb437136b65655dd3e0d9389be66131c7d1"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 0
 #define SYZ_EXECUTOR_USES_SHMEM 0
 #define SYZ_PAGE_SIZE 4096
@@ -45,7 +45,7 @@
 
 #if GOARCH_arm64
 #define GOARCH "arm64"
-#define SYZ_REVISION "ebb425942f2bbfd2db293e4a2a0a417f6aaafb1c"
+#define SYZ_REVISION "42ba25aa193b27b48c8f8ade1c9186cb89c7ca61"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 0
 #define SYZ_EXECUTOR_USES_SHMEM 0
 #define SYZ_PAGE_SIZE 4096
@@ -60,7 +60,7 @@
 
 #if GOARCH_386
 #define GOARCH "386"
-#define SYZ_REVISION "d16df4bd3b5d63c53207d8d48f0e7aa8375ae471"
+#define SYZ_REVISION "c026c82f557e0fb27209b060f233071e8ba38eab"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 1
 #define SYZ_EXECUTOR_USES_SHMEM 1
 #define SYZ_PAGE_SIZE 4096
@@ -70,7 +70,7 @@
 
 #if GOARCH_amd64
 #define GOARCH "amd64"
-#define SYZ_REVISION "22bac64bd4f91440dd851726a290b9eb1f1ae092"
+#define SYZ_REVISION "c06fc3bdc53ae8ee708128ddd51d14a679aa12f0"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 1
 #define SYZ_EXECUTOR_USES_SHMEM 1
 #define SYZ_PAGE_SIZE 4096
@@ -80,7 +80,7 @@
 
 #if GOARCH_arm
 #define GOARCH "arm"
-#define SYZ_REVISION "c46361b24a9d8c4d25f99c6a74ed373b73b0cdd1"
+#define SYZ_REVISION "b4f6cbe7c414a45bfaf3dcccf7f1040502de3980"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 1
 #define SYZ_EXECUTOR_USES_SHMEM 1
 #define SYZ_PAGE_SIZE 4096
@@ -90,7 +90,7 @@
 
 #if GOARCH_arm64
 #define GOARCH "arm64"
-#define SYZ_REVISION "e1ce203bf0cb9e092e65fc6ca9cd1cde96e19316"
+#define SYZ_REVISION "70ff2aa900dc3911170ab814adc6a362bb014580"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 1
 #define SYZ_EXECUTOR_USES_SHMEM 1
 #define SYZ_PAGE_SIZE 4096
@@ -100,7 +100,7 @@
 
 #if GOARCH_ppc64le
 #define GOARCH "ppc64le"
-#define SYZ_REVISION "1ccba534d5c6adaffc5ebfbea33c22833f5cb846"
+#define SYZ_REVISION "be0af9fd447e9ac157423f3260f414d60066f653"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 1
 #define SYZ_EXECUTOR_USES_SHMEM 1
 #define SYZ_PAGE_SIZE 4096
@@ -115,7 +115,7 @@
 
 #if GOARCH_amd64
 #define GOARCH "amd64"
-#define SYZ_REVISION "cea6c87ab1f9e36df1927913a619e71cd29abcbf"
+#define SYZ_REVISION "c05720ceb16e651f6ae9addd1f5be83497d861e3"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 1
 #define SYZ_EXECUTOR_USES_SHMEM 1
 #define SYZ_PAGE_SIZE 4096
@@ -130,7 +130,7 @@
 
 #if GOARCH_32_fork_shmem
 #define GOARCH "32_fork_shmem"
-#define SYZ_REVISION "f3f80dea03f2b372f892da4a49e6af7f47106120"
+#define SYZ_REVISION "18f983f4760ca5ac41eaf7c18bd9f487f6dde42b"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 1
 #define SYZ_EXECUTOR_USES_SHMEM 1
 #define SYZ_PAGE_SIZE 4096
@@ -140,7 +140,7 @@
 
 #if GOARCH_32_shmem
 #define GOARCH "32_shmem"
-#define SYZ_REVISION "9819b8a5a8ea14bf3a71d86bb2012bafd6ab25b6"
+#define SYZ_REVISION "9d4e8ff9d9c38d5fe7cdc046adcde8be29782e6b"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 0
 #define SYZ_EXECUTOR_USES_SHMEM 1
 #define SYZ_PAGE_SIZE 8192
@@ -150,7 +150,7 @@
 
 #if GOARCH_64
 #define GOARCH "64"
-#define SYZ_REVISION "96964f599c9870f5d27e4d6054b0d16011652c81"
+#define SYZ_REVISION "981444b6842c8896801fdf67dc75c454cad9e594"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 0
 #define SYZ_EXECUTOR_USES_SHMEM 0
 #define SYZ_PAGE_SIZE 4096
@@ -160,7 +160,7 @@
 
 #if GOARCH_64_fork
 #define GOARCH "64_fork"
-#define SYZ_REVISION "96f1f19d85a4d091cba7b036633c3b48ccfe4439"
+#define SYZ_REVISION "1c9fe1f1a1f6f871fc5c088ca80174655322aca4"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 1
 #define SYZ_EXECUTOR_USES_SHMEM 0
 #define SYZ_PAGE_SIZE 8192
@@ -175,7 +175,7 @@
 
 #if GOARCH_amd64
 #define GOARCH "amd64"
-#define SYZ_REVISION "e9562f6b9973e9e9a9522fd8ec12b4e913f13b4c"
+#define SYZ_REVISION "f2b48fb82a68b0cb24b2ab9638add66deb9542dd"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 0
 #define SYZ_EXECUTOR_USES_SHMEM 0
 #define SYZ_PAGE_SIZE 4096

diff --git a/sys/akaros/gen/amd64.go b/sys/akaros/gen/amd64.go
@@ -1,10 +1,14 @@
 // AUTOGENERATED FILE
+// +build !syz_target syz_target,syz_os_akaros,syz_arch_amd64
 
 package gen
 
 import . "github.com/google/syzkaller/prog"
+import . "github.com/google/syzkaller/sys/akaros"
 
-var Target_amd64 = &Target{OS: "akaros", Arch: "amd64", Revision: revision_amd64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_amd64, Resources: resources_amd64, Structs: structDescs_amd64, Consts: consts_amd64}
+func init() {
+	RegisterTarget(&Target{OS: "akaros", Arch: "amd64", Revision: revision_amd64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_amd64, Resources: resources_amd64, Structs: structDescs_amd64, Consts: consts_amd64}, InitTarget)
+}
 
 var resources_amd64 = []*ResourceDesc{
 	{Name: "fd", Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", TypeSize: 4}}}, Kind: []string{"fd"}, Values: []uint64{18446744073709551615, 18446744073709551516}},
@@ -1536,4 +1540,4 @@ var consts_amd64 = []ConstValue{
 	{Name: "WUNTRACED", Value: 2},
 }
 
-const revision_amd64 = "36f0e5da1becfe451b2936a2b8b1739deb53c609"
+const revision_amd64 = "0dd50d0ed02c0d84fb296a804d96c2f758c18e11"
diff --git a/sys/akaros/gen/empty.go b/sys/akaros/gen/empty.go
@@ -0,0 +1,3 @@
+// AUTOGENERATED FILE
+// This file is needed if OS is completely excluded by build tags.
+package gen
diff --git a/sys/akaros/init.go b/sys/akaros/init.go
@@ -5,19 +5,14 @@ package akaros
 
 import (
 	"github.com/google/syzkaller/prog"
-	"github.com/google/syzkaller/sys/akaros/gen"
 	"github.com/google/syzkaller/sys/targets"
 )
 
-func init() {
-	prog.RegisterTarget(gen.Target_amd64, initTarget)
-}
-
 type arch struct {
 	unix *targets.UnixSanitizer
 }
 
-func initTarget(target *prog.Target) {
+func InitTarget(target *prog.Target) {
 	arch := &arch{
 		unix: targets.MakeUnixSanitizer(target),
 	}

diff --git a/sys/freebsd/gen/amd64.go b/sys/freebsd/gen/amd64.go
@@ -1,10 +1,14 @@
 // AUTOGENERATED FILE
+// +build !syz_target syz_target,syz_os_freebsd,syz_arch_amd64
 
 package gen
 
 import . "github.com/google/syzkaller/prog"
+import . "github.com/google/syzkaller/sys/freebsd"
 
-var Target_amd64 = &Target{OS: "freebsd", Arch: "amd64", Revision: revision_amd64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_amd64, Resources: resources_amd64, Structs: structDescs_amd64, Consts: consts_amd64}
+func init() {
+	RegisterTarget(&Target{OS: "freebsd", Arch: "amd64", Revision: revision_amd64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_amd64, Resources: resources_amd64, Structs: structDescs_amd64, Consts: consts_amd64}, InitTarget)
+}
 
 var resources_amd64 = []*ResourceDesc{
 	{Name: "fd", Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", TypeSize: 4}}}, Kind: []string{"fd"}, Values: []uint64{18446744073709551615, 18446744073709551516}},
@@ -2439,4 +2443,4 @@ var consts_amd64 = []ConstValue{
 	{Name: "WUNTRACED", Value: 2},
 }
 
-const revision_amd64 = "fd7de83a3ebf8e454b041bbfe7513ed4a139d44d"
+const revision_amd64 = "89eac40a68a14ffc0af9fc9b181147236b82d00b"
diff --git a/sys/freebsd/gen/empty.go b/sys/freebsd/gen/empty.go
@@ -0,0 +1,3 @@
+// AUTOGENERATED FILE
+// This file is needed if OS is completely excluded by build tags.
+package gen
diff --git a/sys/freebsd/init.go b/sys/freebsd/init.go
@@ -5,15 +5,10 @@ package freebsd
 
 import (
 	"github.com/google/syzkaller/prog"
-	"github.com/google/syzkaller/sys/freebsd/gen"
 	"github.com/google/syzkaller/sys/targets"
 )
 
-func init() {
-	prog.RegisterTarget(gen.Target_amd64, initTarget)
-}
-
-func initTarget(target *prog.Target) {
+func InitTarget(target *prog.Target) {
 	arch := &arch{
 		unix: targets.MakeUnixSanitizer(target),
 	}

diff --git a/sys/fuchsia/gen/amd64.go b/sys/fuchsia/gen/amd64.go
@@ -1,10 +1,14 @@
 // AUTOGENERATED FILE
+// +build !syz_target syz_target,syz_os_fuchsia,syz_arch_amd64
 
 package gen
 
 import . "github.com/google/syzkaller/prog"
+import . "github.com/google/syzkaller/sys/fuchsia"
 
-var Target_amd64 = &Target{OS: "fuchsia", Arch: "amd64", Revision: revision_amd64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_amd64, Resources: resources_amd64, Structs: structDescs_amd64, Consts: consts_amd64}
+func init() {
+	RegisterTarget(&Target{OS: "fuchsia", Arch: "amd64", Revision: revision_amd64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_amd64, Resources: resources_amd64, Structs: structDescs_amd64, Consts: consts_amd64}, InitTarget)
+}
 
 var resources_amd64 = []*ResourceDesc{
 	{Name: "fd", Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", TypeSize: 4}}}, Kind: []string{"fd"}, Values: []uint64{18446744073709551615, 18446744073709551516}},
@@ -1317,4 +1321,4 @@ var consts_amd64 = []ConstValue{
 	{Name: "ZX_WAIT_ASYNC_REPEATING", Value: 1},
 }
 
-const revision_amd64 = "9540132f74bbe9bfb7e8f215844bdb3a88b9a665"
+const revision_amd64 = "4cc56cb437136b65655dd3e0d9389be66131c7d1"
diff --git a/sys/fuchsia/gen/arm64.go b/sys/fuchsia/gen/arm64.go
@@ -1,10 +1,14 @@
 // AUTOGENERATED FILE
+// +build !syz_target syz_target,syz_os_fuchsia,syz_arch_arm64
 
 package gen
 
 import . "github.com/google/syzkaller/prog"
+import . "github.com/google/syzkaller/sys/fuchsia"
 
-var Target_arm64 = &Target{OS: "fuchsia", Arch: "arm64", Revision: revision_arm64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_arm64, Resources: resources_arm64, Structs: structDescs_arm64, Consts: consts_arm64}
+func init() {
+	RegisterTarget(&Target{OS: "fuchsia", Arch: "arm64", Revision: revision_arm64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_arm64, Resources: resources_arm64, Structs: structDescs_arm64, Consts: consts_arm64}, InitTarget)
+}
 
 var resources_arm64 = []*ResourceDesc{
 	{Name: "fd", Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", TypeSize: 4}}}, Kind: []string{"fd"}, Values: []uint64{18446744073709551615, 18446744073709551516}},
@@ -1317,4 +1321,4 @@ var consts_arm64 = []ConstValue{
 	{Name: "ZX_WAIT_ASYNC_REPEATING", Value: 1},
 }
 
-const revision_arm64 = "ebb425942f2bbfd2db293e4a2a0a417f6aaafb1c"
+const revision_arm64 = "42ba25aa193b27b48c8f8ade1c9186cb89c7ca61"
diff --git a/sys/fuchsia/gen/empty.go b/sys/fuchsia/gen/empty.go
@@ -0,0 +1,3 @@
+// AUTOGENERATED FILE
+// This file is needed if OS is completely excluded by build tags.
+package gen
diff --git a/sys/fuchsia/init.go b/sys/fuchsia/init.go
@@ -5,15 +5,9 @@ package fuchsia
 
 import (
 	"github.com/google/syzkaller/prog"
-	"github.com/google/syzkaller/sys/fuchsia/gen"
 	"github.com/google/syzkaller/sys/targets"
 )
 
-func init() {
-	prog.RegisterTarget(gen.Target_amd64, initTarget)
-	prog.RegisterTarget(gen.Target_arm64, initTarget)
-}
-
-func initTarget(target *prog.Target) {
+func InitTarget(target *prog.Target) {
 	target.MakeMmap = targets.MakeSyzMmap(target)
 }