From e6e35dba937599d098fc034eff2686e5ddc409e9 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 26 Oct 2020 10:51:06 +0100 Subject: sys/targets: add OS/Arch name consts We use strings to identify OS/Arch. These strings are duplicated throughout the code base massively. golangci-lint points to possiblity of typos and duplication. We already had to define these names in pkg/csource and disable checking for prog package. A future change triggers such warnings in another package. Add OS/Arch name consts to sys/targets so that they can be used to refer to OS/Arch. Use the consts everywhere. --- sys/syz-sysgen/sysgen.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/syz-sysgen') diff --git a/sys/syz-sysgen/sysgen.go b/sys/syz-sysgen/sysgen.go index 8dfedb6a2..62f36c3d3 100644 --- a/sys/syz-sysgen/sysgen.go +++ b/sys/syz-sysgen/sysgen.go @@ -115,7 +115,7 @@ func main() { } consts := constFile.Arch(job.Target.Arch) top := descriptions - if OS == "linux" && (job.Target.Arch == "arm" || job.Target.Arch == "riscv64") { + if OS == targets.Linux && (job.Target.Arch == targets.ARM || job.Target.Arch == targets.RiscV64) { // Hack: KVM is not supported on ARM anymore. On riscv64 it // is not supported yet but might be in the future. // Note: syz-extract also ignores this file for arm and @@ -125,7 +125,7 @@ func main() { return !strings.HasSuffix(pos.File, "_kvm.txt") }) } - if OS == "test" { + if OS == targets.TestOS { constInfo := compiler.ExtractConsts(top, job.Target, eh) compiler.FabricateSyscallConsts(job.Target, constInfo, consts) } -- cgit mrf-deployment