From 05c9512268b810910595e592c68436f27594f3c1 Mon Sep 17 00:00:00 2001 From: Dmitri Shuralyov Date: Tue, 10 Oct 2023 18:35:22 -0400 Subject: [PATCH] all: update go directive to 1.18 Done with: go get go@1.18 go mod tidy go fix ./... Using go1.21.3. Also delete the build constraints that are always satisfied when using supported Go versions. For golang/go#60268. Change-Id: Iab4a7237a368b1ac05bb72a646501defb51503f1 Reviewed-on: https://go-review.googlesource.com/c/arch/+/534197 Reviewed-by: Cherry Mui LUCI-TryBot-Result: Go LUCI Reviewed-by: Dmitri Shuralyov Auto-Submit: Dmitri Shuralyov --- arm/armspec/spec.go | 4 ---- arm/armspec/specmap.go | 1 - arm64/arm64spec/spec.go | 3 --- go.mod | 2 +- ppc64/ppc64spec/spec.go | 3 --- ppc64/ppc64util/util.go | 1 - 6 files changed, 1 insertion(+), 13 deletions(-) diff --git a/arm/armspec/spec.go b/arm/armspec/spec.go index 108f7ed..f755579 100644 --- a/arm/armspec/spec.go +++ b/arm/armspec/spec.go @@ -2,10 +2,6 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build go1.6 && (!386 || go1.8) -// +build go1.6 -// +build !386 go1.8 - // ... see golang.org/issue/12840 // Armspec reads the “ARM Architecture Reference Manual” diff --git a/arm/armspec/specmap.go b/arm/armspec/specmap.go index b881082..973030f 100644 --- a/arm/armspec/specmap.go +++ b/arm/armspec/specmap.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore package main diff --git a/arm64/arm64spec/spec.go b/arm64/arm64spec/spec.go index 08b487c..ee784e5 100644 --- a/arm64/arm64spec/spec.go +++ b/arm64/arm64spec/spec.go @@ -2,9 +2,6 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build (go1.6 && amd64) || go1.8 -// +build go1.6,amd64 go1.8 - // arm64spec reads the ``ARMv8-A Reference Manual'' // to collect instruction encoding details and writes those // details to standard output in JSON format. diff --git a/go.mod b/go.mod index d29c929..355098d 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,5 @@ module golang.org/x/arch -go 1.17 +go 1.18 require rsc.io/pdf v0.1.1 diff --git a/ppc64/ppc64spec/spec.go b/ppc64/ppc64spec/spec.go index 55cb275..4167d6d 100644 --- a/ppc64/ppc64spec/spec.go +++ b/ppc64/ppc64spec/spec.go @@ -2,9 +2,6 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build (go1.6 && amd64) || go1.8 -// +build go1.6,amd64 go1.8 - // Power64spec reads the “Power ISA V2.07” Manual // to collect instruction encoding details and writes those details to standard output // in CSV format. diff --git a/ppc64/ppc64util/util.go b/ppc64/ppc64util/util.go index b2f1910..dcb8e42 100644 --- a/ppc64/ppc64util/util.go +++ b/ppc64/ppc64util/util.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore // Generate interesting test cases from ppc64 objdump via // go run util.go