From 95793bce7d3eaa26fe814335010d7514e9da46fa Mon Sep 17 00:00:00 2001 From: Alexey Kardashevskiy Date: Tue, 6 Jul 2021 14:01:49 +1000 Subject: pkg: update generated files to go 1.17 "make generate" produces this diff when go 1.17 (go1.17-c95464f0ea3f==upstream) is used. Seems compatible with >=1.16. https://github.com/golang/go/commit/4d2d89ff42ca documents the syntax. https://github.com/golang/go/commit/eeadce2d8713 enforces "ignore" for unsatisfiable tags hence the pkg/csource/gen.go change. Signed-off-by: Alexey Kardashevskiy --- pkg/build/linux_nolinux.go | 1 + pkg/build/linux_test.go | 1 + pkg/cover/report_test.go | 1 + pkg/csource/gen.go | 3 ++- pkg/csource/race_test.go | 1 + pkg/host/host_akaros.go | 1 + pkg/host/host_fuchsia.go | 1 + pkg/host/syscalls_linux_test.go | 1 + pkg/ifuzz/powerpc/generated/insns.go | 1 + pkg/ifuzz/x86/generated/insns.go | 1 + pkg/ifuzz/x86/xed.go | 1 + pkg/kd/kd_test.go | 1 + pkg/osutil/osutil_akaros.go | 1 + pkg/osutil/osutil_bsd.go | 1 + pkg/osutil/osutil_fuchsia.go | 1 + pkg/osutil/osutil_unix.go | 1 + 16 files changed, 17 insertions(+), 1 deletion(-) (limited to 'pkg') diff --git a/pkg/build/linux_nolinux.go b/pkg/build/linux_nolinux.go index 1bffbeaae..7353bb275 100644 --- a/pkg/build/linux_nolinux.go +++ b/pkg/build/linux_nolinux.go @@ -1,6 +1,7 @@ // Copyright 2021 syzkaller project authors. All rights reserved. // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. +//go:build !linux // +build !linux package build diff --git a/pkg/build/linux_test.go b/pkg/build/linux_test.go index 1088641e6..0babee967 100644 --- a/pkg/build/linux_test.go +++ b/pkg/build/linux_test.go @@ -1,6 +1,7 @@ // Copyright 2019 syzkaller project authors. All rights reserved. // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. +//go:build linux // +build linux package build diff --git a/pkg/cover/report_test.go b/pkg/cover/report_test.go index 3461fcf58..1f3db475d 100644 --- a/pkg/cover/report_test.go +++ b/pkg/cover/report_test.go @@ -3,6 +3,7 @@ // It may or may not work on other OSes. // If you test on another OS and it works, enable it. +//go:build linux // +build linux package cover diff --git a/pkg/csource/gen.go b/pkg/csource/gen.go index c92c4b581..196aaf554 100644 --- a/pkg/csource/gen.go +++ b/pkg/csource/gen.go @@ -1,7 +1,8 @@ // Copyright 2017 syzkaller project authors. All rights reserved. // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. -// +build +//go:build ignore +// +build ignore package main diff --git a/pkg/csource/race_test.go b/pkg/csource/race_test.go index 6e497e552..c41cef5d3 100644 --- a/pkg/csource/race_test.go +++ b/pkg/csource/race_test.go @@ -1,6 +1,7 @@ // Copyright 2018 syzkaller project authors. All rights reserved. // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. +//go:build race // +build race package csource diff --git a/pkg/host/host_akaros.go b/pkg/host/host_akaros.go index 1eb7c360c..23668683a 100644 --- a/pkg/host/host_akaros.go +++ b/pkg/host/host_akaros.go @@ -1,6 +1,7 @@ // Copyright 2017 syzkaller project authors. All rights reserved. // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. +//go:build akaros // +build akaros package host diff --git a/pkg/host/host_fuchsia.go b/pkg/host/host_fuchsia.go index 4ef73370c..bbfb41d1d 100644 --- a/pkg/host/host_fuchsia.go +++ b/pkg/host/host_fuchsia.go @@ -1,6 +1,7 @@ // Copyright 2017 syzkaller project authors. All rights reserved. // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. +//go:build fuchsia // +build fuchsia package host diff --git a/pkg/host/syscalls_linux_test.go b/pkg/host/syscalls_linux_test.go index 70adfbae9..5fc87377c 100644 --- a/pkg/host/syscalls_linux_test.go +++ b/pkg/host/syscalls_linux_test.go @@ -1,6 +1,7 @@ // Copyright 2015 syzkaller project authors. All rights reserved. // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. +//go:build linux // +build linux package host diff --git a/pkg/ifuzz/powerpc/generated/insns.go b/pkg/ifuzz/powerpc/generated/insns.go index ba85eaae0..32ffde285 100644 --- a/pkg/ifuzz/powerpc/generated/insns.go +++ b/pkg/ifuzz/powerpc/generated/insns.go @@ -1,5 +1,6 @@ // Code generated by ./powerisa30_to_syz. DO NOT EDIT. +//go:build !codeanalysis // +build !codeanalysis package generated diff --git a/pkg/ifuzz/x86/generated/insns.go b/pkg/ifuzz/x86/generated/insns.go index e66b34d72..3a7153a09 100644 --- a/pkg/ifuzz/x86/generated/insns.go +++ b/pkg/ifuzz/x86/generated/insns.go @@ -1,5 +1,6 @@ // Code generated by pkg/ifuzz/gen. DO NOT EDIT. +//go:build !codeanalysis // +build !codeanalysis package generated diff --git a/pkg/ifuzz/x86/xed.go b/pkg/ifuzz/x86/xed.go index 769ea8b68..6adf45314 100644 --- a/pkg/ifuzz/x86/xed.go +++ b/pkg/ifuzz/x86/xed.go @@ -7,6 +7,7 @@ // -I $INTELXED/build/obj" CGO_LDFLAGS="$INTELXED/build/obj/libxed.a" \ // go test -v -tags xed +//go:build xed // +build xed package x86 diff --git a/pkg/kd/kd_test.go b/pkg/kd/kd_test.go index 9ffeaf315..5c55ffd29 100644 --- a/pkg/kd/kd_test.go +++ b/pkg/kd/kd_test.go @@ -1,6 +1,7 @@ // Copyright 2017 syzkaller project authors. All rights reserved. // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. +//go:build !s390x // +build !s390x package kd diff --git a/pkg/osutil/osutil_akaros.go b/pkg/osutil/osutil_akaros.go index d1001a37e..210a208e8 100644 --- a/pkg/osutil/osutil_akaros.go +++ b/pkg/osutil/osutil_akaros.go @@ -1,6 +1,7 @@ // Copyright 2017 syzkaller project authors. All rights reserved. // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. +//go:build akaros // +build akaros package osutil diff --git a/pkg/osutil/osutil_bsd.go b/pkg/osutil/osutil_bsd.go index 68bcfa415..221f86054 100644 --- a/pkg/osutil/osutil_bsd.go +++ b/pkg/osutil/osutil_bsd.go @@ -1,6 +1,7 @@ // Copyright 2017 syzkaller project authors. All rights reserved. // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. +//go:build freebsd || netbsd || openbsd // +build freebsd netbsd openbsd package osutil diff --git a/pkg/osutil/osutil_fuchsia.go b/pkg/osutil/osutil_fuchsia.go index 31d5ca419..da596d47a 100644 --- a/pkg/osutil/osutil_fuchsia.go +++ b/pkg/osutil/osutil_fuchsia.go @@ -1,6 +1,7 @@ // Copyright 2017 syzkaller project authors. All rights reserved. // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. +//go:build fuchsia // +build fuchsia package osutil diff --git a/pkg/osutil/osutil_unix.go b/pkg/osutil/osutil_unix.go index 3ab025e1a..0ab5dfd05 100644 --- a/pkg/osutil/osutil_unix.go +++ b/pkg/osutil/osutil_unix.go @@ -1,6 +1,7 @@ // Copyright 2017 syzkaller project authors. All rights reserved. // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. +//go:build freebsd || netbsd || openbsd || linux || darwin // +build freebsd netbsd openbsd linux darwin package osutil -- cgit mrf-deployment