Commit e4994e71 authored by Matthew Dempsky's avatar Matthew Dempsky
Browse files

[dev.typeparams] all: merge master (c8f4e615) 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 c8f4e615 spec: correct example comment in Conversions from slice to array
+ 2021-07-19 1d91551b time: correct typo in documentation for UnixMicro
+ 2021-07-19 404127c3 cmd/compile: fix off-by-one error in traceback argument counting
+ 2021-07-19 6298cfe6 cmd/compile: fix typo in fatal message of builtinCall
+ 2021-07-19 49402bee cmd/{compile,link}: fix bug in map.zero handling
+ 2021-07-18 a66190ec test/bench/go1: fix size for RegexpMatchMedium_32
+ 2021-07-18 650fc211 text/scanner: use Go convention in Position doc comment
+ 2021-07-16 aa4e0f52 net/http:  correct capitalization in cancelTimeBody comment
+ 2021-07-15 0941dbca testing: clarify in docs that TestMain is advanced
+ 2021-07-15 69728ead cmd/go: update error messages in tests to match CL 332573
+ 2021-07-15 c1cc9f9c cmd/compile: fix lookup package of redeclared dot import symbol
+ 2021-07-15 21a04e33 doc/go1.17: mention GOARCH=loong64
+ 2021-07-14 2b00a54b go/build, runtime/internal/sys: reserve GOARCH=loong64
+ 2021-07-14 60ddf42b cmd/go: change link in error message from /wiki to /doc.
+ 2021-07-13 d8f348a5 cmd/go: remove a duplicated word from 'go help mod graph'
+ 2021-07-12 a9858971 crypto/tls: test key type when casting
+ 2021-07-12 cfbd73ba doc/go1.17: editing pass over the "Compiler" section
+ 2021-07-09 ab4085ce runtime/pprof: call runtime.GC twice in memory profile test

Change-Id: I1490a4c7e4c560659c21a4eb67d243f35d1f908e
parents c6d3d0b0 c8f4e615
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment