Updating go build constraints.

cloudflare · Sep 9, 2021 · 8e341dc · 8e341dc
1 parent db701c7
commit 8e341dc
Show file tree

Hide file tree

Showing 63 changed files with 65 additions and 3 deletions.
diff --git a/dh/csidh/fp511_amd64.go b/dh/csidh/fp511_amd64.go
@@ -1,3 +1,4 @@
+//go:build amd64 && !noasm
 // +build amd64,!noasm
 
 package csidh

diff --git a/dh/csidh/fp511_noasm.go b/dh/csidh/fp511_noasm.go
@@ -1,3 +1,4 @@
+//go:build !amd64 || purego
 // +build !amd64 purego
 
 package csidh

diff --git a/dh/sidh/internal/p434/arith_amd64_test.go b/dh/sidh/internal/p434/arith_amd64_test.go
diff --git a/dh/sidh/internal/p434/arith_decl.go b/dh/sidh/internal/p434/arith_decl.go
diff --git a/dh/sidh/internal/p434/arith_generic.go b/dh/sidh/internal/p434/arith_generic.go
diff --git a/dh/sidh/internal/p503/arith_amd64_test.go b/dh/sidh/internal/p503/arith_amd64_test.go
diff --git a/dh/sidh/internal/p503/arith_decl.go b/dh/sidh/internal/p503/arith_decl.go
diff --git a/dh/sidh/internal/p503/arith_generic.go b/dh/sidh/internal/p503/arith_generic.go
diff --git a/dh/sidh/internal/p751/arith_amd64_test.go b/dh/sidh/internal/p751/arith_amd64_test.go
diff --git a/dh/sidh/internal/p751/arith_decl.go b/dh/sidh/internal/p751/arith_decl.go
diff --git a/dh/sidh/internal/p751/arith_generic.go b/dh/sidh/internal/p751/arith_generic.go
diff --git a/dh/sidh/internal/templates/arith_decl.gotemp b/dh/sidh/internal/templates/arith_decl.gotemp
@@ -1,6 +1,7 @@
 // Code generated by go generate; DO NOT EDIT.
 // This file was generated by robots.
 
+//go:build {{if .OPT_ARM}}({{end}}amd64 && !noasm{{if .OPT_ARM}}) || (arm64 && !noasm){{end}}
 // +build amd64,!noasm{{if .OPT_ARM}} arm64,!noasm{{end}}
 
 package {{ .PACKAGE}}

diff --git a/dh/sidh/internal/templates/arith_generic.gotemp b/dh/sidh/internal/templates/arith_generic.gotemp
@@ -1,6 +1,7 @@
 // Code generated by go generate; DO NOT EDIT.
 // This file was generated by robots.
 
+//go:build {{if .OPT_ARM}}noasm || (!amd64 && !arm64){{else}}noasm || !amd64{{end}}
 // +build {{if .OPT_ARM}}noasm !amd64,!arm64{{else}}noasm !amd64{{end}}
 
 package {{ .PACKAGE}}

diff --git a/dh/sidh/internal/templates/gen.go b/dh/sidh/internal/templates/gen.go
@@ -1,5 +1,6 @@
 // The following directive is necessary to make the package coherent:
 
+//go:build ignore
 // +build ignore
 
 // This program generates contributors.go. It can be invoked by running

diff --git a/dh/x25519/curve_amd64.go b/dh/x25519/curve_amd64.go
@@ -1,3 +1,4 @@
+//go:build amd64 && !purego
 // +build amd64,!purego
 
 package x25519

diff --git a/dh/x25519/curve_noasm.go b/dh/x25519/curve_noasm.go
@@ -1,3 +1,4 @@
+//go:build !amd64 || purego
 // +build !amd64 purego
 
 package x25519

diff --git a/dh/x448/curve_amd64.go b/dh/x448/curve_amd64.go
@@ -1,3 +1,4 @@
+//go:build amd64 && !purego
 // +build amd64,!purego
 
 package x448

diff --git a/dh/x448/curve_noasm.go b/dh/x448/curve_noasm.go
@@ -1,3 +1,4 @@
+//go:build !amd64 || purego
 // +build !amd64 purego
 
 package x448

diff --git a/ecc/bls12381/ff/gen.go b/ecc/bls12381/ff/gen.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 // Code Generation using fiat-crypto

diff --git a/ecc/fourq/fp_amd64.go b/ecc/fourq/fp_amd64.go
@@ -1,3 +1,4 @@
+//go:build amd64 && !purego
 // +build amd64,!purego
 
 package fourq

diff --git a/ecc/fourq/fp_generic.go b/ecc/fourq/fp_generic.go
@@ -1,3 +1,4 @@
+//go:build go1.12
 // +build go1.12
 
 package fourq

diff --git a/ecc/fourq/fp_noasm.go b/ecc/fourq/fp_noasm.go
@@ -1,3 +1,4 @@
+//go:build !amd64 || purego
 // +build !amd64 purego
 
 package fourq

diff --git a/ecc/fourq/fq_amd64.go b/ecc/fourq/fq_amd64.go
@@ -1,3 +1,4 @@
+//go:build amd64 && !purego
 // +build amd64,!purego
 
 package fourq

diff --git a/ecc/fourq/fq_noasm.go b/ecc/fourq/fq_noasm.go
@@ -1,3 +1,4 @@
+//go:build !amd64 || purego
 // +build !amd64 purego
 
 package fourq

diff --git a/ecc/fourq/point_amd64.go b/ecc/fourq/point_amd64.go
@@ -1,3 +1,4 @@
+//go:build amd64 && !purego
 // +build amd64,!purego
 
 package fourq

diff --git a/ecc/fourq/point_generic.go b/ecc/fourq/point_generic.go
@@ -1,3 +1,4 @@
+//go:build !amd64 || purego
 // +build !amd64 purego
 
 package fourq

diff --git a/ecc/fourq/point_noasm.go b/ecc/fourq/point_noasm.go
@@ -1,3 +1,4 @@
+//go:build !amd64 || purego
 // +build !amd64 purego
 
 package fourq

diff --git a/ecc/p384/arith.go b/ecc/p384/arith.go
@@ -1,3 +1,4 @@
+//go:build (!noasm && arm64) || (!noasm && amd64)
 // +build !noasm,arm64 !noasm,amd64
 
 package p384

diff --git a/ecc/p384/arith_amd64.go b/ecc/p384/arith_amd64.go
@@ -1,3 +1,4 @@
+//go:build amd64 && !noasm
 // +build amd64,!noasm
 
 package p384

diff --git a/ecc/p384/arith_test.go b/ecc/p384/arith_test.go
@@ -1,3 +1,4 @@
+//go:build (!noasm && arm64) || (!noasm && amd64)
 // +build !noasm,arm64 !noasm,amd64
 
 package p384

diff --git a/ecc/p384/opt_test.go b/ecc/p384/opt_test.go
@@ -1,3 +1,4 @@
+//go:build (!noasm && arm64) || (!noasm && amd64)
 // +build !noasm,arm64 !noasm,amd64
 
 package p384

diff --git a/ecc/p384/p384_generic.go b/ecc/p384/p384_generic.go
@@ -1,3 +1,4 @@
+//go:build noasm || (!amd64 && !arm64)
 // +build noasm !amd64,!arm64
 
 package p384

diff --git a/ecc/p384/p384opt.go b/ecc/p384/p384opt.go
@@ -1,3 +1,4 @@
+//go:build (!noasm && arm64) || (!noasm && amd64)
 // +build !noasm,arm64 !noasm,amd64
 
 package p384

diff --git a/ecc/p384/point.go b/ecc/p384/point.go
@@ -1,3 +1,4 @@
+//go:build (!noasm && arm64) || (!noasm && amd64)
 // +build !noasm,arm64 !noasm,amd64
 
 package p384

diff --git a/ecc/p384/point_test.go b/ecc/p384/point_test.go
@@ -1,3 +1,4 @@
+//go:build (!noasm && arm64) || (!noasm && amd64)
 // +build !noasm,arm64 !noasm,amd64
 
 package p384

diff --git a/ecc/p384/tableBase.go b/ecc/p384/tableBase.go
@@ -1,3 +1,4 @@
+//go:build (!noasm && arm64) || (!noasm && amd64)
 // +build !noasm,arm64 !noasm,amd64
 
 package p384

diff --git a/internal/sha3/keccakf.go b/internal/sha3/keccakf.go
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//  +build !amd64 appengine gccgo
+//go:build !amd64 || appengine || gccgo
+// +build !amd64 appengine gccgo
 
 package sha3
 

diff --git a/internal/sha3/keccakf_amd64.go b/internal/sha3/keccakf_amd64.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build amd64 && !appengine && !gccgo
 // +build amd64,!appengine,!gccgo
 
 package sha3

diff --git a/internal/sha3/xor.go b/internal/sha3/xor.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build (!amd64 && !386 && !ppc64le) || appengine
 // +build !amd64,!386,!ppc64le appengine
 
 package sha3

diff --git a/internal/sha3/xor_unaligned.go b/internal/sha3/xor_unaligned.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build (amd64 || 386 || ppc64le) && !appengine
 // +build amd64 386 ppc64le
 // +build !appengine
 

diff --git a/kem/kyber/gen.go b/kem/kyber/gen.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 // Autogenerates wrappers from templates to prevent too much duplicated code

diff --git a/kem/sike/gen.go b/kem/sike/gen.go
@@ -1,12 +1,13 @@
+//go:build ignore
 // +build ignore
 
 // Autogenerates wrappers from templates to prevent too much duplicated code
 // between the code for different modes.
 package main
 
 import (
-	"fmt"
 	"bytes"
+	"fmt"
 	"io/ioutil"
 	"strings"
 	"text/template"
@@ -28,7 +29,6 @@ func (m Instance) Field() string {
 	return fmt.Sprintf("Fp%d", m.Bits)
 }
 
-
 var (
 	Instances = []Instance{
 		{Bits: 434},

diff --git a/math/fp25519/fp_amd64.go b/math/fp25519/fp_amd64.go
@@ -1,3 +1,4 @@
+//go:build amd64 && !purego
 // +build amd64,!purego
 
 package fp25519

diff --git a/math/fp25519/fp_noasm.go b/math/fp25519/fp_noasm.go
@@ -1,3 +1,4 @@
+//go:build !amd64 || purego
 // +build !amd64 purego
 
 package fp25519

diff --git a/math/fp448/fp_amd64.go b/math/fp448/fp_amd64.go
@@ -1,3 +1,4 @@
+//go:build amd64 && !purego
 // +build amd64,!purego
 
 package fp448

diff --git a/math/fp448/fp_noasm.go b/math/fp448/fp_noasm.go
@@ -1,3 +1,4 @@
+//go:build !amd64 || purego
 // +build !amd64 purego
 
 package fp448

diff --git a/math/fp448/fuzzer.go b/math/fp448/fuzzer.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 // How to run the fuzzer:

diff --git a/pke/kyber/gen.go b/pke/kyber/gen.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 // Autogenerates wrappers from templates to prevent too much duplicated code

diff --git a/pke/kyber/internal/common/amd64.go b/pke/kyber/internal/common/amd64.go
@@ -1,3 +1,4 @@
+//go:build amd64
 // +build amd64
 
 package common

diff --git a/pke/kyber/internal/common/asm/src.go b/pke/kyber/internal/common/asm/src.go
@@ -1,4 +1,5 @@
 //go:generate go run src.go -out ../amd64.s -stubs ../stubs_amd64.go -pkg common
+//go:build ignore
 // +build ignore
 
 // AVX2 optimized version of polynomial operations.  See the comments on the

diff --git a/pke/kyber/internal/common/generic.go b/pke/kyber/internal/common/generic.go
@@ -1,3 +1,4 @@
+//go:build !amd64
 // +build !amd64
 
 package common

diff --git a/pke/kyber/internal/common/stubs_amd64.go b/pke/kyber/internal/common/stubs_amd64.go
diff --git a/sign/dilithium/gen.go b/sign/dilithium/gen.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 // Autogenerates wrappers from templates to prevent too much duplicated code

diff --git a/sign/dilithium/internal/common/amd64.go b/sign/dilithium/internal/common/amd64.go
@@ -1,3 +1,4 @@
+//go:build amd64
 // +build amd64
 
 package common

diff --git a/sign/dilithium/internal/common/asm/src.go b/sign/dilithium/internal/common/asm/src.go
@@ -1,4 +1,5 @@
 //go:generate go run src.go -out ../amd64.s -stubs ../stubs_amd64.go -pkg common
+//go:build ignore
 // +build ignore
 
 // AVX2 optimized version of Poly.[Inv]NTT().  See the comments on the generic

diff --git a/sign/dilithium/internal/common/generic.go b/sign/dilithium/internal/common/generic.go
@@ -1,3 +1,4 @@
+//go:build !amd64
 // +build !amd64
 
 package common

diff --git a/sign/dilithium/internal/common/stubs_amd64.go b/sign/dilithium/internal/common/stubs_amd64.go
diff --git a/sign/ed25519/pubkey.go b/sign/ed25519/pubkey.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 package ed25519

diff --git a/sign/ed25519/pubkey112.go b/sign/ed25519/pubkey112.go
@@ -1,3 +1,4 @@
+//go:build !go1.13
 // +build !go1.13
 
 package ed25519

diff --git a/simd/keccakf1600/f1600x2_arm64.go b/simd/keccakf1600/f1600x2_arm64.go
@@ -1,3 +1,4 @@
+//go:build arm64 && go1.16
 // +build arm64,go1.16
 
 package keccakf1600

diff --git a/simd/keccakf1600/f1600x4stubs_amd64.go b/simd/keccakf1600/f1600x4stubs_amd64.go
diff --git a/simd/keccakf1600/fallback.go b/simd/keccakf1600/fallback.go
@@ -1,3 +1,4 @@
+//go:build (!amd64 && !arm64) || (arm64 && !go1.16)
 // +build !amd64,!arm64 arm64,!go1.16
 
 package keccakf1600

diff --git a/simd/keccakf1600/internal/asm/src.go b/simd/keccakf1600/internal/asm/src.go
@@ -1,4 +1,5 @@
 //go:generate go run src.go -out ../../f1600x4_amd64.s -stubs ../../f1600x4stubs_amd64.go -pkg keccakf1600
+//go:build ignore
 // +build ignore
 
 // AVX2 fourway parallelized Keccak-f[1600].