From: Shenghou Ma Date: Thu, 10 Sep 2015 03:31:10 +0000 (-0400) Subject: runtime: move arch1_$GOARCH.go into arch_$GOARCH.go X-Git-Tag: go1.6beta1~1122 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1cf05ee61267b8f98494ac1ca0b75e831c53f32e;p=gostls13.git 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 TryBot-Result: Gobot Gobot Reviewed-by: Dave Cheney Reviewed-by: Brad Fitzpatrick --- diff --git a/src/runtime/arch1_386.go b/src/runtime/arch1_386.go deleted file mode 100644 index d41696a6d6..0000000000 --- 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 index 15f4cc65fe..0000000000 --- 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 index 3c5456f933..0000000000 --- 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 index 0ec2093881..0000000000 --- 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 index 29a87dbdb8..0000000000 --- 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 index de6dd91401..0000000000 --- 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 index 9a55c71101..0000000000 --- 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 79d38c7ab1..4ab00c3396 100644 --- 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 270cd7b957..b2ca077e4f 100644 --- 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 5c636aeab2..3f66822445 100644 --- 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 79d38c7ab1..d5d57703f6 100644 --- 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 270cd7b957..f26227a557 100644 --- 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 270cd7b957..a2cd85c129 100644 --- 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 270cd7b957..4f89da337f 100644 --- 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