runtime/internal/atomic: delete arch1_*.go files

I made a copy of the per-arch _CacheLineSize definitons when checking in
runtime/internal/atomic. Now that runtime/internal/sys is checked in,
we can use the definition there.

Change-Id: I7242f6b633e4164f033b67ff471416b9d71c64d2
Reviewed-on: https://go-review.googlesource.com/16847
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/cmd/dist/deps.go b/src/cmd/dist/deps.go
index 4e20b5600be0845151c3ce606ec822229279bdac..ba360e5b3b062dca8863faea62029717d5f9bee8 100644 (file)
--- a/src/cmd/dist/deps.go
+++ b/src/cmd/dist/deps.go
@@ -41,7 +41,7 @@ var builddeps = map[string][]string{
        "regexp":                  {"bytes", "errors", "io", "math", "regexp/syntax", "runtime", "runtime/internal/atomic", "runtime/internal/sys", "sort", "strconv", "strings", "sync", "sync/atomic", "unicode", "unicode/utf8"},
        "regexp/syntax":           {"bytes", "errors", "io", "math", "runtime", "runtime/internal/atomic", "runtime/internal/sys", "sort", "strconv", "strings", "sync", "sync/atomic", "unicode", "unicode/utf8"},
        "runtime":                 {"runtime/internal/atomic", "runtime/internal/sys"},
-       "runtime/internal/atomic": {},
+       "runtime/internal/atomic": {"runtime/internal/sys"},
        "runtime/internal/sys":    {},
        "sort":                    {"runtime", "runtime/internal/atomic", "runtime/internal/sys"},
        "strconv":                 {"errors", "math", "runtime", "runtime/internal/atomic", "runtime/internal/sys", "unicode/utf8"},

diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index 4575b4426013800a9d137e6326738e2cee0dfbeb..58d7d377e09dfab7eef93b1310e14882e9c3b763 100644 (file)
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@ -38,7 +38,7 @@ var pkgDeps = map[string][]string{
        "io":                      {"errors", "sync"},
        "runtime":                 {"unsafe", "runtime/internal/atomic", "runtime/internal/sys"},
        "runtime/internal/sys":    {},
-       "runtime/internal/atomic": {"unsafe"},
+       "runtime/internal/atomic": {"unsafe", "runtime/internal/sys"},
        "sync":        {"runtime", "sync/atomic", "unsafe"},
        "sync/atomic": {"unsafe"},
        "unsafe":      {},

diff --git a/src/runtime/internal/atomic/arch1_386.go b/src/runtime/internal/atomic/arch1_386.go
deleted file mode 100644 (file)
index 76a9e2e..0000000
--- a/src/runtime/internal/atomic/arch1_386.go
+++ /dev/null
@@ -1,9 +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 atomic
-
-const (
-       _CacheLineSize = 64
-)

diff --git a/src/runtime/internal/atomic/arch1_amd64.go b/src/runtime/internal/atomic/arch1_amd64.go
deleted file mode 100644 (file)
index 76a9e2e..0000000
--- a/src/runtime/internal/atomic/arch1_amd64.go
+++ /dev/null
@@ -1,9 +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 atomic
-
-const (
-       _CacheLineSize = 64
-)

diff --git a/src/runtime/internal/atomic/arch1_amd64p32.go b/src/runtime/internal/atomic/arch1_amd64p32.go
deleted file mode 100644 (file)
index 7bb6e1a..0000000
--- a/src/runtime/internal/atomic/arch1_amd64p32.go
+++ /dev/null
@@ -1,14 +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 atomic
-
-const (
-       thechar        = '6'
-       _BigEndian     = 0
-       _CacheLineSize = 64
-       _PCQuantum     = 1
-       _Int64Align    = 8
-       hugePageSize   = 1 << 21
-)

diff --git a/src/runtime/internal/atomic/arch1_arm.go b/src/runtime/internal/atomic/arch1_arm.go
deleted file mode 100644 (file)
index d9b997c..0000000
--- a/src/runtime/internal/atomic/arch1_arm.go
+++ /dev/null
@@ -1,9 +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 atomic
-
-const (
-       _CacheLineSize = 32
-)

diff --git a/src/runtime/internal/atomic/arch1_arm64.go b/src/runtime/internal/atomic/arch1_arm64.go
deleted file mode 100644 (file)
index d9b997c..0000000
--- a/src/runtime/internal/atomic/arch1_arm64.go
+++ /dev/null
@@ -1,9 +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 atomic
-
-const (
-       _CacheLineSize = 32
-)

diff --git a/src/runtime/internal/atomic/arch1_mips64.go b/src/runtime/internal/atomic/arch1_mips64.go
deleted file mode 100644 (file)
index 0fd9510..0000000
--- a/src/runtime/internal/atomic/arch1_mips64.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2015 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 atomic
-
-const (
-       _CacheLineSize = 32
-)

diff --git a/src/runtime/internal/atomic/arch1_mips64le.go b/src/runtime/internal/atomic/arch1_mips64le.go
deleted file mode 100644 (file)
index 0fd9510..0000000
--- a/src/runtime/internal/atomic/arch1_mips64le.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2015 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 atomic
-
-const (
-       _CacheLineSize = 32
-)

diff --git a/src/runtime/internal/atomic/arch1_ppc64.go b/src/runtime/internal/atomic/arch1_ppc64.go
deleted file mode 100644 (file)
index 815a584..0000000
--- a/src/runtime/internal/atomic/arch1_ppc64.go
+++ /dev/null
@@ -1,9 +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 atomic
-
-const (
-       _CacheLineSize = 64
-)

diff --git a/src/runtime/internal/atomic/arch1_ppc64le.go b/src/runtime/internal/atomic/arch1_ppc64le.go
deleted file mode 100644 (file)
index 815a584..0000000
--- a/src/runtime/internal/atomic/arch1_ppc64le.go
+++ /dev/null
@@ -1,9 +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 atomic
-
-const (
-       _CacheLineSize = 64
-)

diff --git a/src/runtime/internal/atomic/atomic_arm.go b/src/runtime/internal/atomic/atomic_arm.go
index 1f33eef3c46e29d7429b62b3c39bded917faefb4..c361aef3821f9b3945a4addd9340253b363956c1 100644 (file)
--- a/src/runtime/internal/atomic/atomic_arm.go
+++ b/src/runtime/internal/atomic/atomic_arm.go
@@ -6,7 +6,10 @@
 
 package atomic
 
-import "unsafe"
+import (
+       "runtime/internal/sys"
+       "unsafe"
+)
 
 type spinlock struct {
        v uint32
@@ -28,7 +31,7 @@ func (l *spinlock) unlock() {
 
 var locktab [57]struct {
        l   spinlock
-       pad [_CacheLineSize - unsafe.Sizeof(spinlock{})]byte
+       pad [sys.CacheLineSize - unsafe.Sizeof(spinlock{})]byte
 }
 
 func addrLock(addr *uint64) *spinlock {