diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 41a231c..c2c56f2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.15.x, 1.16.x]
+        go-version: [1.16.x, 1.17.x]
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
     steps:
@@ -59,7 +59,7 @@ jobs:
   lint:
     strategy:
       matrix:
-        go-version: [1.16.x]
+        go-version: [1.17.x]
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
     steps:
diff --git a/README.md b/README.md
index bb7c904..f229b8e 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ $ go get -u github.com/mmcloughlin/avo
 
 [embedmd]:# (examples/add/asm.go)
 ```go
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/attr/make_textflag.go b/attr/make_textflag.go
index 88f1d77..0d2eb06 100644
--- a/attr/make_textflag.go
+++ b/attr/make_textflag.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/examples/add/README.md b/examples/add/README.md
index 6d19a66..68aefab 100644
--- a/examples/add/README.md
+++ b/examples/add/README.md
@@ -6,6 +6,7 @@ The [code generator](asm.go) is as follows:
 
 [embedmd]:# (asm.go)
 ```go
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/examples/add/asm.go b/examples/add/asm.go
index d372230..8c3d841 100644
--- a/examples/add/asm.go
+++ b/examples/add/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/examples/args/asm.go b/examples/args/asm.go
index 987b277..69f87e4 100644
--- a/examples/args/asm.go
+++ b/examples/args/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/examples/complex/asm.go b/examples/complex/asm.go
index 358ef80..e973565 100644
--- a/examples/complex/asm.go
+++ b/examples/complex/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/examples/data/asm.go b/examples/data/asm.go
index 29d703b..de55f32 100644
--- a/examples/data/asm.go
+++ b/examples/data/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/examples/dot/asm.go b/examples/dot/asm.go
index 62e517e..da7ddf4 100644
--- a/examples/dot/asm.go
+++ b/examples/dot/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/examples/ext/asm.go b/examples/ext/asm.go
index cd7005c..d752b38 100644
--- a/examples/ext/asm.go
+++ b/examples/ext/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/examples/fnv1a/asm.go b/examples/fnv1a/asm.go
index 5c1fb93..809a1c9 100644
--- a/examples/fnv1a/asm.go
+++ b/examples/fnv1a/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/examples/geohash/asm.go b/examples/geohash/asm.go
index 4ccd0dd..81fbacd 100644
--- a/examples/geohash/asm.go
+++ b/examples/geohash/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/examples/pragma/asm.go b/examples/pragma/asm.go
index edf1c9b..067b92f 100644
--- a/examples/pragma/asm.go
+++ b/examples/pragma/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/examples/returns/asm.go b/examples/returns/asm.go
index 0d635e2..26121d3 100644
--- a/examples/returns/asm.go
+++ b/examples/returns/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/examples/sha1/asm.go b/examples/sha1/asm.go
index 85f7f1e..509aff3 100644
--- a/examples/sha1/asm.go
+++ b/examples/sha1/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/examples/sum/asm.go b/examples/sum/asm.go
index 1cc332d..22963fe 100644
--- a/examples/sum/asm.go
+++ b/examples/sum/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/operand/make_const.go b/operand/make_const.go
index 42262c7..4297530 100644
--- a/operand/make_const.go
+++ b/operand/make_const.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/script/tools.mod b/script/tools.mod
index b8dbb94..0922d1c 100644
--- a/script/tools.mod
+++ b/script/tools.mod
@@ -5,7 +5,7 @@ go 1.14
 require (
 	github.com/campoy/embedmd v1.0.0 // indirect
 	github.com/dlespiau/covertool v0.0.0-20180314162135-b0c4c6d0583a // indirect
-	github.com/klauspost/asmfmt v1.2.1 // indirect
+	github.com/klauspost/asmfmt v1.3.1 // indirect
 	github.com/urfave/cli v1.22.5 // indirect
 	mvdan.cc/gofumpt v0.0.0-20200412215918-a91da47f375c // indirect
 )
diff --git a/script/tools.sum b/script/tools.sum
index b4f7b10..a75d359 100644
--- a/script/tools.sum
+++ b/script/tools.sum
@@ -7,6 +7,8 @@ github.com/dlespiau/covertool v0.0.0-20180314162135-b0c4c6d0583a h1:+cYgqwB++gEE
 github.com/dlespiau/covertool v0.0.0-20180314162135-b0c4c6d0583a/go.mod h1:/eQMcW3eA1bzKx23ZYI2H3tXPdJB5JWYTHzoUPBvQY4=
 github.com/klauspost/asmfmt v1.2.1 h1:LgH5hc6QnY2sDT2K+ilscIzcZpfQ1xlayuTyLxo4pOA=
 github.com/klauspost/asmfmt v1.2.1/go.mod h1:RAoUvqkWr2rUa2I19qKMEVZQe4BVtcHGTMCUOcCU2Lg=
+github.com/klauspost/asmfmt v1.3.1 h1:7xZi1N7s9gTLbqiM8KUv8TLyysavbTRGBT5/ly0bRtw=
+github.com/klauspost/asmfmt v1.3.1/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
diff --git a/tests/alloc/gp8/asm.go b/tests/alloc/gp8/asm.go
index c7c5ac3..040f7e1 100644
--- a/tests/alloc/gp8/asm.go
+++ b/tests/alloc/gp8/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/tests/alloc/masks/asm.go b/tests/alloc/masks/asm.go
index 6ff51d6..ce4bf76 100644
--- a/tests/alloc/masks/asm.go
+++ b/tests/alloc/masks/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/tests/alloc/upper32/asm.go b/tests/alloc/upper32/asm.go
index de09486..817b8ee 100644
--- a/tests/alloc/upper32/asm.go
+++ b/tests/alloc/upper32/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/tests/cast/asm.go b/tests/cast/asm.go
index 3ca65c9..6362220 100644
--- a/tests/cast/asm.go
+++ b/tests/cast/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/tests/fixedbugs/issue100/allocfail/allocfail.s b/tests/fixedbugs/issue100/allocfail/allocfail.s
index 68f9352..0f1d9bb 100644
--- a/tests/fixedbugs/issue100/allocfail/allocfail.s
+++ b/tests/fixedbugs/issue100/allocfail/allocfail.s
@@ -1,8 +1,7 @@
 // Code generated by command: go run asm.go -out allocfail.s -stubs stubs.go. DO NOT EDIT.
 
-// +build !appengine
-// +build !noasm
-// +build gc
+//go:build !appengine && !noasm && gc
+// +build !appengine,!noasm,gc
 
 #include "textflag.h"
 
diff --git a/tests/fixedbugs/issue100/allocfail/asm.go b/tests/fixedbugs/issue100/allocfail/asm.go
index 192a06c..b663962 100644
--- a/tests/fixedbugs/issue100/allocfail/asm.go
+++ b/tests/fixedbugs/issue100/allocfail/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/tests/fixedbugs/issue100/allocfail/stubs.go b/tests/fixedbugs/issue100/allocfail/stubs.go
index 34992a3..81d785c 100644
--- a/tests/fixedbugs/issue100/allocfail/stubs.go
+++ b/tests/fixedbugs/issue100/allocfail/stubs.go
@@ -1,8 +1,7 @@
 // Code generated by command: go run asm.go -out allocfail.s -stubs stubs.go. DO NOT EDIT.
 
-// +build !appengine
-// +build !noasm
-// +build gc
+//go:build !appengine && !noasm && gc
+// +build !appengine,!noasm,gc
 
 package allocfail
 
diff --git a/tests/fixedbugs/issue100/minrepro/asm.go b/tests/fixedbugs/issue100/minrepro/asm.go
index 98374e3..2af2b78 100644
--- a/tests/fixedbugs/issue100/minrepro/asm.go
+++ b/tests/fixedbugs/issue100/minrepro/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/tests/fixedbugs/issue122/asm.go b/tests/fixedbugs/issue122/asm.go
index 95a5c47..26f48b1 100644
--- a/tests/fixedbugs/issue122/asm.go
+++ b/tests/fixedbugs/issue122/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/tests/fixedbugs/issue50/asm.go b/tests/fixedbugs/issue50/asm.go
index a7a5811..26b8556 100644
--- a/tests/fixedbugs/issue50/asm.go
+++ b/tests/fixedbugs/issue50/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/tests/fixedbugs/issue62/asm.go b/tests/fixedbugs/issue62/asm.go
index dd26b87..0a9bd44 100644
--- a/tests/fixedbugs/issue62/asm.go
+++ b/tests/fixedbugs/issue62/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/tests/fixedbugs/issue65/asm.go b/tests/fixedbugs/issue65/asm.go
index 59f014a..edca6eb 100644
--- a/tests/fixedbugs/issue65/asm.go
+++ b/tests/fixedbugs/issue65/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/tests/fixedbugs/issue68/asm.go b/tests/fixedbugs/issue68/asm.go
index e9c60d8..8ef87aa 100644
--- a/tests/fixedbugs/issue68/asm.go
+++ b/tests/fixedbugs/issue68/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/tests/fixedbugs/issue76/asm.go b/tests/fixedbugs/issue76/asm.go
index 72ce4d5..7782277 100644
--- a/tests/fixedbugs/issue76/asm.go
+++ b/tests/fixedbugs/issue76/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/tests/fixedbugs/issue89/asm.go b/tests/fixedbugs/issue89/asm.go
index 809e8e9..2a6e487 100644
--- a/tests/fixedbugs/issue89/asm.go
+++ b/tests/fixedbugs/issue89/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/tests/fmt/asm.go b/tests/fmt/asm.go
index 0f9e2d4..8ef6e58 100644
--- a/tests/fmt/asm.go
+++ b/tests/fmt/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/tests/labels/asm.go b/tests/labels/asm.go
index 266159e..4db710e 100644
--- a/tests/labels/asm.go
+++ b/tests/labels/asm.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/tests/textflag/make_attrtest.go b/tests/textflag/make_attrtest.go
index 25134ba..f4e4914 100644
--- a/tests/textflag/make_attrtest.go
+++ b/tests/textflag/make_attrtest.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main