From: WANG Xuerui <git@xen0n.name>
Date: Mon, 6 Sep 2021 07:17:11 +0000 (+0800)
Subject: cmd/internal/sys: fix placement of loong64 definition
X-Git-Tag: go1.18beta1~1469
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=20a71c9a1d7e0d246dfad2c2a2057c954324217d;p=gostls13.git

cmd/internal/sys: fix placement of loong64 definition

In rebasing the patch series up to CL 339015, the branches were messed
up by me, and changes from v3 to v4 of CL 339009 was lost. Fix the
ordering to restore alphabetical order per original review.

Change-Id: I8e57c96e996c4f962cab684a9d305a8dbdeea43b
Reviewed-on: https://go-review.googlesource.com/c/go/+/347731
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Trust: Meng Zhuo <mzh@golangcn.org>
---

diff --git a/src/cmd/internal/sys/arch.go b/src/cmd/internal/sys/arch.go
index e7063fde89..4b2b4c38a0 100644
--- a/src/cmd/internal/sys/arch.go
+++ b/src/cmd/internal/sys/arch.go
@@ -16,13 +16,13 @@ const (
 	ARM
 	ARM64
 	I386
+	Loong64
 	MIPS
 	MIPS64
 	PPC64
 	RISCV64
 	S390X
 	Wasm
-	Loong64
 )
 
 // Arch represents an individual architecture.
@@ -100,6 +100,16 @@ var ArchARM64 = &Arch{
 	Alignment: 1,
 }
 
+var ArchLoong64 = &Arch{
+	Name:      "loong64",
+	Family:    Loong64,
+	ByteOrder: binary.LittleEndian,
+	PtrSize:   8,
+	RegSize:   8,
+	MinLC:     4,
+	Alignment: 8, // Unaligned accesses are not guaranteed to be fast
+}
+
 var ArchMIPS = &Arch{
 	Name:      "mips",
 	Family:    MIPS,
@@ -190,21 +200,12 @@ var ArchWasm = &Arch{
 	Alignment: 1,
 }
 
-var ArchLoong64 = &Arch{
-	Name:      "loong64",
-	Family:    Loong64,
-	ByteOrder: binary.LittleEndian,
-	PtrSize:   8,
-	RegSize:   8,
-	MinLC:     4,
-	Alignment: 8, // Unaligned accesses are not guaranteed to be fast
-}
-
 var Archs = [...]*Arch{
 	Arch386,
 	ArchAMD64,
 	ArchARM,
 	ArchARM64,
+	ArchLoong64,
 	ArchMIPS,
 	ArchMIPSLE,
 	ArchMIPS64,
@@ -214,5 +215,4 @@ var Archs = [...]*Arch{
 	ArchRISCV64,
 	ArchS390X,
 	ArchWasm,
-	ArchLoong64,
 }