diff options
author | Matthew Dempsky <mdempsky@google.com> | 2021-07-20 12:46:13 -0700 |
---|---|---|
committer | Matthew Dempsky <mdempsky@google.com> | 2021-07-20 14:34:09 -0700 |
commit | e4994e71fb1809d8ce7df89e471586e05797e171 (patch) | |
tree | c48395ef73ff6e411de6512877e7d8ffd9a76e52 /src/internal | |
parent | c6d3d0b0ad10926fc1952deda913d139ed608cb3 (diff) | |
parent | c8f4e6152d5f0b767a8177b7d09884cf2279d8e6 (diff) | |
download | go-e4994e71fb1809d8ce7df89e471586e05797e171.tar.gz go-e4994e71fb1809d8ce7df89e471586e05797e171.zip |
[dev.typeparams] all: merge master (c8f4e61) into dev.typeparams
Conflicts:
- src/runtime/internal/sys/zgoarch_386.go
- src/runtime/internal/sys/zgoarch_amd64.go
- src/runtime/internal/sys/zgoarch_arm.go
- src/runtime/internal/sys/zgoarch_arm64.go
- src/runtime/internal/sys/zgoarch_arm64be.go
- src/runtime/internal/sys/zgoarch_armbe.go
- src/runtime/internal/sys/zgoarch_mips.go
- src/runtime/internal/sys/zgoarch_mips64.go
- src/runtime/internal/sys/zgoarch_mips64le.go
- src/runtime/internal/sys/zgoarch_mips64p32.go
- src/runtime/internal/sys/zgoarch_mips64p32le.go
- src/runtime/internal/sys/zgoarch_mipsle.go
- src/runtime/internal/sys/zgoarch_ppc.go
- src/runtime/internal/sys/zgoarch_ppc64.go
- src/runtime/internal/sys/zgoarch_ppc64le.go
- src/runtime/internal/sys/zgoarch_riscv.go
- src/runtime/internal/sys/zgoarch_riscv64.go
- src/runtime/internal/sys/zgoarch_s390.go
- src/runtime/internal/sys/zgoarch_s390x.go
- src/runtime/internal/sys/zgoarch_sparc.go
- src/runtime/internal/sys/zgoarch_sparc64.go
- src/runtime/internal/sys/zgoarch_wasm.go
On dev.typeparams, CL 328336 moved these files to internal/goarch;
whereas on master, CL 333909 reserved GOARCH=loong64. For this CL,
I resolved the conflict by simply running "go generate internal/goarch".
Merge List:
+ 2021-07-19 c8f4e6152d spec: correct example comment in Conversions from slice to array
+ 2021-07-19 1d91551b73 time: correct typo in documentation for UnixMicro
+ 2021-07-19 404127c30f cmd/compile: fix off-by-one error in traceback argument counting
+ 2021-07-19 6298cfe672 cmd/compile: fix typo in fatal message of builtinCall
+ 2021-07-19 49402bee36 cmd/{compile,link}: fix bug in map.zero handling
+ 2021-07-18 a66190ecee test/bench/go1: fix size for RegexpMatchMedium_32
+ 2021-07-18 650fc2117a text/scanner: use Go convention in Position doc comment
+ 2021-07-16 aa4e0f528e net/http: correct capitalization in cancelTimeBody comment
+ 2021-07-15 0941dbca6a testing: clarify in docs that TestMain is advanced
+ 2021-07-15 69728ead87 cmd/go: update error messages in tests to match CL 332573
+ 2021-07-15 c1cc9f9c3d cmd/compile: fix lookup package of redeclared dot import symbol
+ 2021-07-15 21a04e3335 doc/go1.17: mention GOARCH=loong64
+ 2021-07-14 2b00a54baf go/build, runtime/internal/sys: reserve GOARCH=loong64
+ 2021-07-14 60ddf42b46 cmd/go: change link in error message from /wiki to /doc.
+ 2021-07-13 d8f348a589 cmd/go: remove a duplicated word from 'go help mod graph'
+ 2021-07-12 a98589711d crypto/tls: test key type when casting
+ 2021-07-12 cfbd73ba33 doc/go1.17: editing pass over the "Compiler" section
+ 2021-07-09 ab4085ce84 runtime/pprof: call runtime.GC twice in memory profile test
Change-Id: I1490a4c7e4c560659c21a4eb67d243f35d1f908e
Diffstat (limited to 'src/internal')
23 files changed, 55 insertions, 0 deletions
diff --git a/src/internal/goarch/zgoarch_386.go b/src/internal/goarch/zgoarch_386.go index 7fa23b07ef..2395b80951 100644 --- a/src/internal/goarch/zgoarch_386.go +++ b/src/internal/goarch/zgoarch_386.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 0 const IsPpc64 = 0 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 0 const IsMips64 = 0 diff --git a/src/internal/goarch/zgoarch_amd64.go b/src/internal/goarch/zgoarch_amd64.go index a6bf1cc6f4..c301d279c1 100644 --- a/src/internal/goarch/zgoarch_amd64.go +++ b/src/internal/goarch/zgoarch_amd64.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 0 const IsPpc64 = 0 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 0 const IsMips64 = 0 diff --git a/src/internal/goarch/zgoarch_arm.go b/src/internal/goarch/zgoarch_arm.go index dcdaa1f44d..4a5ff37999 100644 --- a/src/internal/goarch/zgoarch_arm.go +++ b/src/internal/goarch/zgoarch_arm.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 0 const IsPpc64 = 0 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 0 const IsMips64 = 0 diff --git a/src/internal/goarch/zgoarch_arm64.go b/src/internal/goarch/zgoarch_arm64.go index dd8d9806ab..840e280f94 100644 --- a/src/internal/goarch/zgoarch_arm64.go +++ b/src/internal/goarch/zgoarch_arm64.go @@ -16,6 +16,7 @@ const IsArm64 = 1 const IsArm64be = 0 const IsPpc64 = 0 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 0 const IsMips64 = 0 diff --git a/src/internal/goarch/zgoarch_arm64be.go b/src/internal/goarch/zgoarch_arm64be.go index a37df97031..bdbe5faacf 100644 --- a/src/internal/goarch/zgoarch_arm64be.go +++ b/src/internal/goarch/zgoarch_arm64be.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 1 const IsPpc64 = 0 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 0 const IsMips64 = 0 diff --git a/src/internal/goarch/zgoarch_armbe.go b/src/internal/goarch/zgoarch_armbe.go index 909b114330..36be514a0b 100644 --- a/src/internal/goarch/zgoarch_armbe.go +++ b/src/internal/goarch/zgoarch_armbe.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 0 const IsPpc64 = 0 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 0 const IsMips64 = 0 diff --git a/src/internal/goarch/zgoarch_loong64.go b/src/internal/goarch/zgoarch_loong64.go new file mode 100644 index 0000000000..9465cf5bf5 --- /dev/null +++ b/src/internal/goarch/zgoarch_loong64.go @@ -0,0 +1,33 @@ +// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT. + +//go:build loong64 +// +build loong64 + +package goarch + +const GOARCH = `loong64` + +const Is386 = 0 +const IsAmd64 = 0 +const IsAmd64p32 = 0 +const IsArm = 0 +const IsArmbe = 0 +const IsArm64 = 0 +const IsArm64be = 0 +const IsPpc64 = 0 +const IsPpc64le = 0 +const IsLoong64 = 1 +const IsMips = 0 +const IsMipsle = 0 +const IsMips64 = 0 +const IsMips64le = 0 +const IsMips64p32 = 0 +const IsMips64p32le = 0 +const IsPpc = 0 +const IsRiscv = 0 +const IsRiscv64 = 0 +const IsS390 = 0 +const IsS390x = 0 +const IsSparc = 0 +const IsSparc64 = 0 +const IsWasm = 0 diff --git a/src/internal/goarch/zgoarch_mips.go b/src/internal/goarch/zgoarch_mips.go index 0ff91f201a..e1458c0485 100644 --- a/src/internal/goarch/zgoarch_mips.go +++ b/src/internal/goarch/zgoarch_mips.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 0 const IsPpc64 = 0 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 1 const IsMipsle = 0 const IsMips64 = 0 diff --git a/src/internal/goarch/zgoarch_mips64.go b/src/internal/goarch/zgoarch_mips64.go index 3b61356b18..7de345e321 100644 --- a/src/internal/goarch/zgoarch_mips64.go +++ b/src/internal/goarch/zgoarch_mips64.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 0 const IsPpc64 = 0 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 0 const IsMips64 = 1 diff --git a/src/internal/goarch/zgoarch_mips64le.go b/src/internal/goarch/zgoarch_mips64le.go index 14c9330cad..96b1c3c021 100644 --- a/src/internal/goarch/zgoarch_mips64le.go +++ b/src/internal/goarch/zgoarch_mips64le.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 0 const IsPpc64 = 0 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 0 const IsMips64 = 0 diff --git a/src/internal/goarch/zgoarch_mips64p32.go b/src/internal/goarch/zgoarch_mips64p32.go index b7429f2bf3..91d1f3c4df 100644 --- a/src/internal/goarch/zgoarch_mips64p32.go +++ b/src/internal/goarch/zgoarch_mips64p32.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 0 const IsPpc64 = 0 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 0 const IsMips64 = 0 diff --git a/src/internal/goarch/zgoarch_mips64p32le.go b/src/internal/goarch/zgoarch_mips64p32le.go index 35c21c1675..18f2ef2347 100644 --- a/src/internal/goarch/zgoarch_mips64p32le.go +++ b/src/internal/goarch/zgoarch_mips64p32le.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 0 const IsPpc64 = 0 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 0 const IsMips64 = 0 diff --git a/src/internal/goarch/zgoarch_mipsle.go b/src/internal/goarch/zgoarch_mipsle.go index ba7be189bc..4551de1a32 100644 --- a/src/internal/goarch/zgoarch_mipsle.go +++ b/src/internal/goarch/zgoarch_mipsle.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 0 const IsPpc64 = 0 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 1 const IsMips64 = 0 diff --git a/src/internal/goarch/zgoarch_ppc.go b/src/internal/goarch/zgoarch_ppc.go index ab19982a12..ffed58c2e5 100644 --- a/src/internal/goarch/zgoarch_ppc.go +++ b/src/internal/goarch/zgoarch_ppc.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 0 const IsPpc64 = 0 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 0 const IsMips64 = 0 diff --git a/src/internal/goarch/zgoarch_ppc64.go b/src/internal/goarch/zgoarch_ppc64.go index d3e35ca877..c369c74166 100644 --- a/src/internal/goarch/zgoarch_ppc64.go +++ b/src/internal/goarch/zgoarch_ppc64.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 0 const IsPpc64 = 1 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 0 const IsMips64 = 0 diff --git a/src/internal/goarch/zgoarch_ppc64le.go b/src/internal/goarch/zgoarch_ppc64le.go index ef24e95c4d..de5bae2a81 100644 --- a/src/internal/goarch/zgoarch_ppc64le.go +++ b/src/internal/goarch/zgoarch_ppc64le.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 0 const IsPpc64 = 0 const IsPpc64le = 1 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 0 const IsMips64 = 0 diff --git a/src/internal/goarch/zgoarch_riscv.go b/src/internal/goarch/zgoarch_riscv.go index fe6b385c50..07c9d81b39 100644 --- a/src/internal/goarch/zgoarch_riscv.go +++ b/src/internal/goarch/zgoarch_riscv.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 0 const IsPpc64 = 0 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 0 const IsMips64 = 0 diff --git a/src/internal/goarch/zgoarch_riscv64.go b/src/internal/goarch/zgoarch_riscv64.go index 85299a6b4b..24e6ef3fdf 100644 --- a/src/internal/goarch/zgoarch_riscv64.go +++ b/src/internal/goarch/zgoarch_riscv64.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 0 const IsPpc64 = 0 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 0 const IsMips64 = 0 diff --git a/src/internal/goarch/zgoarch_s390.go b/src/internal/goarch/zgoarch_s390.go index 39325c473e..429206d653 100644 --- a/src/internal/goarch/zgoarch_s390.go +++ b/src/internal/goarch/zgoarch_s390.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 0 const IsPpc64 = 0 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 0 const IsMips64 = 0 diff --git a/src/internal/goarch/zgoarch_s390x.go b/src/internal/goarch/zgoarch_s390x.go index 64d714ace2..0c59005216 100644 --- a/src/internal/goarch/zgoarch_s390x.go +++ b/src/internal/goarch/zgoarch_s390x.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 0 const IsPpc64 = 0 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 0 const IsMips64 = 0 diff --git a/src/internal/goarch/zgoarch_sparc.go b/src/internal/goarch/zgoarch_sparc.go index 9ccd362414..83a356e4c7 100644 --- a/src/internal/goarch/zgoarch_sparc.go +++ b/src/internal/goarch/zgoarch_sparc.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 0 const IsPpc64 = 0 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 0 const IsMips64 = 0 diff --git a/src/internal/goarch/zgoarch_sparc64.go b/src/internal/goarch/zgoarch_sparc64.go index 490a714eb6..7c9d40986e 100644 --- a/src/internal/goarch/zgoarch_sparc64.go +++ b/src/internal/goarch/zgoarch_sparc64.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 0 const IsPpc64 = 0 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 0 const IsMips64 = 0 diff --git a/src/internal/goarch/zgoarch_wasm.go b/src/internal/goarch/zgoarch_wasm.go index a4b4a38401..5aac1dfc47 100644 --- a/src/internal/goarch/zgoarch_wasm.go +++ b/src/internal/goarch/zgoarch_wasm.go @@ -16,6 +16,7 @@ const IsArm64 = 0 const IsArm64be = 0 const IsPpc64 = 0 const IsPpc64le = 0 +const IsLoong64 = 0 const IsMips = 0 const IsMipsle = 0 const IsMips64 = 0 |