From 8140a605feee9058e28195fcb047d3f1906e77e5 Mon Sep 17 00:00:00 2001 From: Robert Findley Date: Fri, 22 Apr 2022 11:47:11 -0400 Subject: [PATCH] go/types, types2: add loong64 to gcArchSizes Values are taken from cmd/internal/sys/arch.go. Also fix some incorrect alphabetical sorting to put arm > amd. Updates #46229 Fixes #52495 Change-Id: If7d2c675238093692060358003915f1649792cf5 Reviewed-on: https://go-review.googlesource.com/c/go/+/401576 Run-TryBot: Robert Findley TryBot-Result: Gopher Robot Reviewed-by: Ian Lance Taylor Reviewed-by: WANG Xuerui Reviewed-by: xiaodong liu --- src/cmd/compile/internal/types2/sizes.go | 7 ++++--- src/go/types/sizes.go | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/cmd/compile/internal/types2/sizes.go b/src/cmd/compile/internal/types2/sizes.go index f530849a9d..6133e15924 100644 --- a/src/cmd/compile/internal/types2/sizes.go +++ b/src/cmd/compile/internal/types2/sizes.go @@ -166,10 +166,11 @@ func (s *StdSizes) Sizeof(T Type) int64 { // common architecture word sizes and alignments var gcArchSizes = map[string]*StdSizes{ "386": {4, 4}, - "arm": {4, 4}, - "arm64": {8, 8}, "amd64": {8, 8}, "amd64p32": {4, 8}, + "arm": {4, 4}, + "arm64": {8, 8}, + "loong64": {8, 8}, "mips": {4, 4}, "mipsle": {4, 4}, "mips64": {8, 8}, @@ -188,7 +189,7 @@ var gcArchSizes = map[string]*StdSizes{ // The result is nil if a compiler/architecture pair is not known. // // Supported architectures for compiler "gc": -// "386", "arm", "arm64", "amd64", "amd64p32", "mips", "mipsle", +// "386", "amd64", "amd64p32", "arm", "arm64", "loong64", "mips", "mipsle", // "mips64", "mips64le", "ppc64", "ppc64le", "riscv64", "s390x", "sparc64", "wasm". func SizesFor(compiler, arch string) Sizes { var m map[string]*StdSizes diff --git a/src/go/types/sizes.go b/src/go/types/sizes.go index 494e045477..7b67dca2b8 100644 --- a/src/go/types/sizes.go +++ b/src/go/types/sizes.go @@ -166,10 +166,11 @@ func (s *StdSizes) Sizeof(T Type) int64 { // common architecture word sizes and alignments var gcArchSizes = map[string]*StdSizes{ "386": {4, 4}, - "arm": {4, 4}, - "arm64": {8, 8}, "amd64": {8, 8}, "amd64p32": {4, 8}, + "arm": {4, 4}, + "arm64": {8, 8}, + "loong64": {8, 8}, "mips": {4, 4}, "mipsle": {4, 4}, "mips64": {8, 8}, @@ -188,7 +189,7 @@ var gcArchSizes = map[string]*StdSizes{ // The result is nil if a compiler/architecture pair is not known. // // Supported architectures for compiler "gc": -// "386", "arm", "arm64", "amd64", "amd64p32", "mips", "mipsle", +// "386", "amd64", "amd64p32", "arm", "arm64", "loong64", "mips", "mipsle", // "mips64", "mips64le", "ppc64", "ppc64le", "riscv64", "s390x", "sparc64", "wasm". func SizesFor(compiler, arch string) Sizes { var m map[string]*StdSizes -- 2.50.0