mirror of https://github.com/golang/go.git
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 |
||
|---|---|---|
| .. | ||
| abi | ||
| buildcfg | ||
| bytealg | ||
| cfg | ||
| cpu | ||
| execabs | ||
| fmtsort | ||
| goarch | ||
| goexperiment | ||
| goos | ||
| goroot | ||
| goversion | ||
| itoa | ||
| lazyregexp | ||
| lazytemplate | ||
| nettrace | ||
| obscuretestdata | ||
| oserror | ||
| poll | ||
| profile | ||
| race | ||
| reflectlite | ||
| singleflight | ||
| syscall | ||
| sysinfo | ||
| testenv | ||
| testlog | ||
| trace | ||
| unsafeheader | ||
| xcoff | ||