runtime: move arch1_$GOARCH.go into arch_$GOARCH.go

Update #12563.

Change-Id: Id87f8e53586accd662575c31961c39787268df7a
Reviewed-on: https://go-review.googlesource.com/14471
Run-TryBot: Minux Ma <minux@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Dave Cheney <dave@cheney.net>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/runtime/arch1_386.go b/src/runtime/arch1_386.go
deleted file mode 100644 (file)
index d41696a..0000000
--- a/src/runtime/arch1_386.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package runtime
-
-const (
-       thechar        = '8'
-       _BigEndian     = 0
-       _CacheLineSize = 64
-       _PhysPageSize  = goos_nacl*65536 + (1-goos_nacl)*4096 // 4k normally; 64k on NaCl
-       _PCQuantum     = 1
-       _Int64Align    = 4
-       hugePageSize   = 1 << 21
-)

diff --git a/src/runtime/arch1_amd64.go b/src/runtime/arch1_amd64.go
deleted file mode 100644 (file)
index 15f4cc6..0000000
--- a/src/runtime/arch1_amd64.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package runtime
-
-const (
-       thechar        = '6'
-       _BigEndian     = 0
-       _CacheLineSize = 64
-       _PhysPageSize  = 4096
-       _PCQuantum     = 1
-       _Int64Align    = 8
-       hugePageSize   = 1 << 21
-)

diff --git a/src/runtime/arch1_amd64p32.go b/src/runtime/arch1_amd64p32.go
deleted file mode 100644 (file)
index 3c5456f..0000000
--- a/src/runtime/arch1_amd64p32.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package runtime
-
-const (
-       thechar        = '6'
-       _BigEndian     = 0
-       _CacheLineSize = 64
-       _PhysPageSize  = 65536*goos_nacl + 4096*(1-goos_nacl)
-       _PCQuantum     = 1
-       _Int64Align    = 8
-       hugePageSize   = 1 << 21
-)

diff --git a/src/runtime/arch1_arm.go b/src/runtime/arch1_arm.go
deleted file mode 100644 (file)
index 0ec2093..0000000
--- a/src/runtime/arch1_arm.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package runtime
-
-const (
-       thechar        = '5'
-       _BigEndian     = 0
-       _CacheLineSize = 32
-       _PhysPageSize  = 65536*goos_nacl + 4096*(1-goos_nacl)
-       _PCQuantum     = 4
-       _Int64Align    = 4
-       hugePageSize   = 0
-)

diff --git a/src/runtime/arch1_arm64.go b/src/runtime/arch1_arm64.go
deleted file mode 100644 (file)
index 29a87db..0000000
--- a/src/runtime/arch1_arm64.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package runtime
-
-const (
-       thechar        = '7'
-       _BigEndian     = 0
-       _CacheLineSize = 32
-       _PhysPageSize  = 65536
-       _PCQuantum     = 4
-       _Int64Align    = 8
-       hugePageSize   = 0
-)

diff --git a/src/runtime/arch1_ppc64.go b/src/runtime/arch1_ppc64.go
deleted file mode 100644 (file)
index de6dd91..0000000
--- a/src/runtime/arch1_ppc64.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package runtime
-
-const (
-       thechar        = '9'
-       _BigEndian     = 1
-       _CacheLineSize = 64
-       _PhysPageSize  = 65536
-       _PCQuantum     = 4
-       _Int64Align    = 8
-       hugePageSize   = 0
-)

diff --git a/src/runtime/arch1_ppc64le.go b/src/runtime/arch1_ppc64le.go
deleted file mode 100644 (file)
index 9a55c71..0000000
--- a/src/runtime/arch1_ppc64le.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package runtime
-
-const (
-       thechar        = '9'
-       _BigEndian     = 0
-       _CacheLineSize = 64
-       _PhysPageSize  = 65536
-       _PCQuantum     = 4
-       _Int64Align    = 8
-       hugePageSize   = 0
-)

diff --git a/src/runtime/arch_386.go b/src/runtime/arch_386.go
index 79d38c7ab1bcda9c65e509558293188d28eadf63..4ab00c33964812bd1011f1094bbcfa9e78901d68 100644 (file)
--- a/src/runtime/arch_386.go
+++ b/src/runtime/arch_386.go
@@ -4,5 +4,15 @@
 
 package runtime
 
+const (
+       thechar        = '8'
+       _BigEndian     = 0
+       _CacheLineSize = 64
+       _PhysPageSize  = goos_nacl*65536 + (1-goos_nacl)*4096 // 4k normally; 64k on NaCl
+       _PCQuantum     = 1
+       _Int64Align    = 4
+       hugePageSize   = 1 << 21
+)
+
 type uintreg uint32
 type intptr int32 // TODO(rsc): remove

diff --git a/src/runtime/arch_amd64.go b/src/runtime/arch_amd64.go
index 270cd7b9573b1a1f96b2735be5bca77a2f723722..b2ca077e4fb21762bacb7b7dc156c9f98ebccb9f 100644 (file)
--- a/src/runtime/arch_amd64.go
+++ b/src/runtime/arch_amd64.go
@@ -4,5 +4,15 @@
 
 package runtime
 
+const (
+       thechar        = '6'
+       _BigEndian     = 0
+       _CacheLineSize = 64
+       _PhysPageSize  = 4096
+       _PCQuantum     = 1
+       _Int64Align    = 8
+       hugePageSize   = 1 << 21
+)
+
 type uintreg uint64
 type intptr int64 // TODO(rsc): remove

diff --git a/src/runtime/arch_amd64p32.go b/src/runtime/arch_amd64p32.go
index 5c636aeab2fbc5d313528b001bf6a8389f9bb83f..3f66822445a586f158e3ef6b9e3e2320d3181dd7 100644 (file)
--- a/src/runtime/arch_amd64p32.go
+++ b/src/runtime/arch_amd64p32.go
@@ -4,5 +4,15 @@
 
 package runtime
 
+const (
+       thechar        = '6'
+       _BigEndian     = 0
+       _CacheLineSize = 64
+       _PhysPageSize  = 65536*goos_nacl + 4096*(1-goos_nacl)
+       _PCQuantum     = 1
+       _Int64Align    = 8
+       hugePageSize   = 1 << 21
+)
+
 type uintreg uint64
 type intptr int32 // TODO(rsc): remove

diff --git a/src/runtime/arch_arm.go b/src/runtime/arch_arm.go
index 79d38c7ab1bcda9c65e509558293188d28eadf63..d5d57703f68efdffc0ed1063e96cbb4f07a726c2 100644 (file)
--- a/src/runtime/arch_arm.go
+++ b/src/runtime/arch_arm.go
@@ -4,5 +4,15 @@
 
 package runtime
 
+const (
+       thechar        = '5'
+       _BigEndian     = 0
+       _CacheLineSize = 32
+       _PhysPageSize  = 65536*goos_nacl + 4096*(1-goos_nacl)
+       _PCQuantum     = 4
+       _Int64Align    = 4
+       hugePageSize   = 0
+)
+
 type uintreg uint32
 type intptr int32 // TODO(rsc): remove

diff --git a/src/runtime/arch_arm64.go b/src/runtime/arch_arm64.go
index 270cd7b9573b1a1f96b2735be5bca77a2f723722..f26227a557a68ed1387f04e25e286408f7c21c25 100644 (file)
--- a/src/runtime/arch_arm64.go
+++ b/src/runtime/arch_arm64.go
@@ -4,5 +4,15 @@
 
 package runtime
 
+const (
+       thechar        = '7'
+       _BigEndian     = 0
+       _CacheLineSize = 32
+       _PhysPageSize  = 65536
+       _PCQuantum     = 4
+       _Int64Align    = 8
+       hugePageSize   = 0
+)
+
 type uintreg uint64
 type intptr int64 // TODO(rsc): remove

diff --git a/src/runtime/arch_ppc64.go b/src/runtime/arch_ppc64.go
index 270cd7b9573b1a1f96b2735be5bca77a2f723722..a2cd85c1293ea556c2fefbf313a1c480f7cd226d 100644 (file)
--- a/src/runtime/arch_ppc64.go
+++ b/src/runtime/arch_ppc64.go
@@ -4,5 +4,15 @@
 
 package runtime
 
+const (
+       thechar        = '9'
+       _BigEndian     = 1
+       _CacheLineSize = 64
+       _PhysPageSize  = 65536
+       _PCQuantum     = 4
+       _Int64Align    = 8
+       hugePageSize   = 0
+)
+
 type uintreg uint64
 type intptr int64 // TODO(rsc): remove

diff --git a/src/runtime/arch_ppc64le.go b/src/runtime/arch_ppc64le.go
index 270cd7b9573b1a1f96b2735be5bca77a2f723722..4f89da337f5671ef307b4b7928199e0418031a13 100644 (file)
--- a/src/runtime/arch_ppc64le.go
+++ b/src/runtime/arch_ppc64le.go
@@ -4,5 +4,15 @@
 
 package runtime
 
+const (
+       thechar        = '9'
+       _BigEndian     = 0
+       _CacheLineSize = 64
+       _PhysPageSize  = 65536
+       _PCQuantum     = 4
+       _Int64Align    = 8
+       hugePageSize   = 0
+)
+
 type uintreg uint64
 type intptr int64 // TODO(rsc): remove