runtime: migrate internal/atomic to internal/runtime

For #65355

Change-Id: I65dd090fb99de9b231af2112c5ccb0eb635db2be
Reviewed-on: https://go-review.googlesource.com/c/go/+/560155
Reviewed-by: David Chase <drchase@google.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Ibrahim Bazoka <ibrahimbazoka729@gmail.com>
Auto-Submit: Emmanuel Odeke <emmanuel@orijtech.com>

diff --git a/src/cmd/compile/internal/ssa/_gen/genericOps.go b/src/cmd/compile/internal/ssa/_gen/genericOps.go
index 69eb48ce44028f834caae09453599d8f98928f29..637e7b617cd0d79a1f152a749365015aa4dd576c 100644 (file)
--- a/src/cmd/compile/internal/ssa/_gen/genericOps.go
+++ b/src/cmd/compile/internal/ssa/_gen/genericOps.go
@@ -587,7 +587,7 @@ var genericOps = []opData{
        {name: "MakeResult", argLength: -1},               // arg0 .. are components of a "Result" (like the result from a Call). The last arg should be memory (like the result from a call).
 
        // Atomic operations used for semantically inlining sync/atomic and
-       // runtime/internal/atomic. Atomic loads return a new memory so that
+       // internal/runtime/atomic. Atomic loads return a new memory so that
        // the loads are properly ordered with respect to other loads and
        // stores.
        {name: "AtomicLoad8", argLength: 2, typ: "(UInt8,Mem)"},                                    // Load from arg0.  arg1=memory.  Returns loaded value and new memory.
@@ -650,7 +650,7 @@ var genericOps = []opData{
 //       If   [boolean Value]      [then, else]
 //    First                []   [always, never]
 //    Defer             [mem]  [nopanic, panic]                  (control opcode should be OpStaticCall to runtime.deferproc)
-//JumpTable   [integer Value]  [succ1,succ2,..]
+// JumpTable   [integer Value]  [succ1,succ2,..]
 
 var genericBlocks = []blockData{
        {name: "Plain"},                  // a single successor

diff --git a/src/cmd/compile/internal/ssagen/ssa.go b/src/cmd/compile/internal/ssagen/ssa.go
index 5174cf123c2e9ff76cdac27f31f789a51dd1fce5..37d6165e42bcc4b5178df1e6ccea192b816ed680 100644 (file)
--- a/src/cmd/compile/internal/ssagen/ssa.go
+++ b/src/cmd/compile/internal/ssagen/ssa.go
@@ -2008,7 +2008,7 @@ func (s *state) stmt(n ir.Node) {
                if base.Flag.N == 0 && rtabi.UseInterfaceSwitchCache(Arch.LinkArch.Name) {
                        // Note: we can only use the cache if we have the right atomic load instruction.
                        // Double-check that here.
-                       if _, ok := intrinsics[intrinsicKey{Arch.LinkArch.Arch, "runtime/internal/atomic", "Loadp"}]; !ok {
+                       if _, ok := intrinsics[intrinsicKey{Arch.LinkArch.Arch, "internal/runtime/atomic", "Loadp"}]; !ok {
                                s.Fatalf("atomic load not available")
                        }
                        merge = s.f.NewBlock(ssa.BlockPlain)
@@ -4286,43 +4286,43 @@ func InitTables() {
        addF("runtime/internal/sys", "PrefetchStreamed", makePrefetchFunc(ssa.OpPrefetchCacheStreamed),
                sys.AMD64, sys.ARM64, sys.PPC64)
 
-       /******** runtime/internal/atomic ********/
-       addF("runtime/internal/atomic", "Load",
+       /******** internal/runtime/atomic ********/
+       addF("internal/runtime/atomic", "Load",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        v := s.newValue2(ssa.OpAtomicLoad32, types.NewTuple(types.Types[types.TUINT32], types.TypeMem), args[0], s.mem())
                        s.vars[memVar] = s.newValue1(ssa.OpSelect1, types.TypeMem, v)
                        return s.newValue1(ssa.OpSelect0, types.Types[types.TUINT32], v)
                },
                sys.AMD64, sys.ARM64, sys.Loong64, sys.MIPS, sys.MIPS64, sys.PPC64, sys.RISCV64, sys.S390X)
-       addF("runtime/internal/atomic", "Load8",
+       addF("internal/runtime/atomic", "Load8",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        v := s.newValue2(ssa.OpAtomicLoad8, types.NewTuple(types.Types[types.TUINT8], types.TypeMem), args[0], s.mem())
                        s.vars[memVar] = s.newValue1(ssa.OpSelect1, types.TypeMem, v)
                        return s.newValue1(ssa.OpSelect0, types.Types[types.TUINT8], v)
                },
                sys.AMD64, sys.ARM64, sys.Loong64, sys.MIPS, sys.MIPS64, sys.PPC64, sys.RISCV64, sys.S390X)
-       addF("runtime/internal/atomic", "Load64",
+       addF("internal/runtime/atomic", "Load64",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        v := s.newValue2(ssa.OpAtomicLoad64, types.NewTuple(types.Types[types.TUINT64], types.TypeMem), args[0], s.mem())
                        s.vars[memVar] = s.newValue1(ssa.OpSelect1, types.TypeMem, v)
                        return s.newValue1(ssa.OpSelect0, types.Types[types.TUINT64], v)
                },
                sys.AMD64, sys.ARM64, sys.Loong64, sys.MIPS64, sys.PPC64, sys.RISCV64, sys.S390X)
-       addF("runtime/internal/atomic", "LoadAcq",
+       addF("internal/runtime/atomic", "LoadAcq",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        v := s.newValue2(ssa.OpAtomicLoadAcq32, types.NewTuple(types.Types[types.TUINT32], types.TypeMem), args[0], s.mem())
                        s.vars[memVar] = s.newValue1(ssa.OpSelect1, types.TypeMem, v)
                        return s.newValue1(ssa.OpSelect0, types.Types[types.TUINT32], v)
                },
                sys.PPC64, sys.S390X)
-       addF("runtime/internal/atomic", "LoadAcq64",
+       addF("internal/runtime/atomic", "LoadAcq64",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        v := s.newValue2(ssa.OpAtomicLoadAcq64, types.NewTuple(types.Types[types.TUINT64], types.TypeMem), args[0], s.mem())
                        s.vars[memVar] = s.newValue1(ssa.OpSelect1, types.TypeMem, v)
                        return s.newValue1(ssa.OpSelect0, types.Types[types.TUINT64], v)
                },
                sys.PPC64)
-       addF("runtime/internal/atomic", "Loadp",
+       addF("internal/runtime/atomic", "Loadp",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        v := s.newValue2(ssa.OpAtomicLoadPtr, types.NewTuple(s.f.Config.Types.BytePtr, types.TypeMem), args[0], s.mem())
                        s.vars[memVar] = s.newValue1(ssa.OpSelect1, types.TypeMem, v)
@@ -4330,51 +4330,51 @@ func InitTables() {
                },
                sys.AMD64, sys.ARM64, sys.Loong64, sys.MIPS, sys.MIPS64, sys.PPC64, sys.RISCV64, sys.S390X)
 
-       addF("runtime/internal/atomic", "Store",
+       addF("internal/runtime/atomic", "Store",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        s.vars[memVar] = s.newValue3(ssa.OpAtomicStore32, types.TypeMem, args[0], args[1], s.mem())
                        return nil
                },
                sys.AMD64, sys.ARM64, sys.Loong64, sys.MIPS, sys.MIPS64, sys.PPC64, sys.RISCV64, sys.S390X)
-       addF("runtime/internal/atomic", "Store8",
+       addF("internal/runtime/atomic", "Store8",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        s.vars[memVar] = s.newValue3(ssa.OpAtomicStore8, types.TypeMem, args[0], args[1], s.mem())
                        return nil
                },
                sys.AMD64, sys.ARM64, sys.Loong64, sys.MIPS, sys.MIPS64, sys.PPC64, sys.RISCV64, sys.S390X)
-       addF("runtime/internal/atomic", "Store64",
+       addF("internal/runtime/atomic", "Store64",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        s.vars[memVar] = s.newValue3(ssa.OpAtomicStore64, types.TypeMem, args[0], args[1], s.mem())
                        return nil
                },
                sys.AMD64, sys.ARM64, sys.Loong64, sys.MIPS64, sys.PPC64, sys.RISCV64, sys.S390X)
-       addF("runtime/internal/atomic", "StorepNoWB",
+       addF("internal/runtime/atomic", "StorepNoWB",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        s.vars[memVar] = s.newValue3(ssa.OpAtomicStorePtrNoWB, types.TypeMem, args[0], args[1], s.mem())
                        return nil
                },
                sys.AMD64, sys.ARM64, sys.Loong64, sys.MIPS, sys.MIPS64, sys.RISCV64, sys.S390X)
-       addF("runtime/internal/atomic", "StoreRel",
+       addF("internal/runtime/atomic", "StoreRel",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        s.vars[memVar] = s.newValue3(ssa.OpAtomicStoreRel32, types.TypeMem, args[0], args[1], s.mem())
                        return nil
                },
                sys.PPC64, sys.S390X)
-       addF("runtime/internal/atomic", "StoreRel64",
+       addF("internal/runtime/atomic", "StoreRel64",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        s.vars[memVar] = s.newValue3(ssa.OpAtomicStoreRel64, types.TypeMem, args[0], args[1], s.mem())
                        return nil
                },
                sys.PPC64)
 
-       addF("runtime/internal/atomic", "Xchg",
+       addF("internal/runtime/atomic", "Xchg",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        v := s.newValue3(ssa.OpAtomicExchange32, types.NewTuple(types.Types[types.TUINT32], types.TypeMem), args[0], args[1], s.mem())
                        s.vars[memVar] = s.newValue1(ssa.OpSelect1, types.TypeMem, v)
                        return s.newValue1(ssa.OpSelect0, types.Types[types.TUINT32], v)
                },
                sys.AMD64, sys.Loong64, sys.MIPS, sys.MIPS64, sys.PPC64, sys.RISCV64, sys.S390X)
-       addF("runtime/internal/atomic", "Xchg64",
+       addF("internal/runtime/atomic", "Xchg64",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        v := s.newValue3(ssa.OpAtomicExchange64, types.NewTuple(types.Types[types.TUINT64], types.TypeMem), args[0], args[1], s.mem())
                        s.vars[memVar] = s.newValue1(ssa.OpSelect1, types.TypeMem, v)
@@ -4429,21 +4429,21 @@ func InitTables() {
                s.vars[memVar] = s.newValue1(ssa.OpSelect1, types.TypeMem, v)
                s.vars[n] = s.newValue1(ssa.OpSelect0, types.Types[typ], v)
        }
-       addF("runtime/internal/atomic", "Xchg",
+       addF("internal/runtime/atomic", "Xchg",
                makeAtomicGuardedIntrinsicARM64(ssa.OpAtomicExchange32, ssa.OpAtomicExchange32Variant, types.TUINT32, types.TUINT32, atomicXchgXaddEmitterARM64),
                sys.ARM64)
-       addF("runtime/internal/atomic", "Xchg64",
+       addF("internal/runtime/atomic", "Xchg64",
                makeAtomicGuardedIntrinsicARM64(ssa.OpAtomicExchange64, ssa.OpAtomicExchange64Variant, types.TUINT64, types.TUINT64, atomicXchgXaddEmitterARM64),
                sys.ARM64)
 
-       addF("runtime/internal/atomic", "Xadd",
+       addF("internal/runtime/atomic", "Xadd",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        v := s.newValue3(ssa.OpAtomicAdd32, types.NewTuple(types.Types[types.TUINT32], types.TypeMem), args[0], args[1], s.mem())
                        s.vars[memVar] = s.newValue1(ssa.OpSelect1, types.TypeMem, v)
                        return s.newValue1(ssa.OpSelect0, types.Types[types.TUINT32], v)
                },
                sys.AMD64, sys.Loong64, sys.MIPS, sys.MIPS64, sys.PPC64, sys.RISCV64, sys.S390X)
-       addF("runtime/internal/atomic", "Xadd64",
+       addF("internal/runtime/atomic", "Xadd64",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        v := s.newValue3(ssa.OpAtomicAdd64, types.NewTuple(types.Types[types.TUINT64], types.TypeMem), args[0], args[1], s.mem())
                        s.vars[memVar] = s.newValue1(ssa.OpSelect1, types.TypeMem, v)
@@ -4451,28 +4451,28 @@ func InitTables() {
                },
                sys.AMD64, sys.Loong64, sys.MIPS64, sys.PPC64, sys.RISCV64, sys.S390X)
 
-       addF("runtime/internal/atomic", "Xadd",
+       addF("internal/runtime/atomic", "Xadd",
                makeAtomicGuardedIntrinsicARM64(ssa.OpAtomicAdd32, ssa.OpAtomicAdd32Variant, types.TUINT32, types.TUINT32, atomicXchgXaddEmitterARM64),
                sys.ARM64)
-       addF("runtime/internal/atomic", "Xadd64",
+       addF("internal/runtime/atomic", "Xadd64",
                makeAtomicGuardedIntrinsicARM64(ssa.OpAtomicAdd64, ssa.OpAtomicAdd64Variant, types.TUINT64, types.TUINT64, atomicXchgXaddEmitterARM64),
                sys.ARM64)
 
-       addF("runtime/internal/atomic", "Cas",
+       addF("internal/runtime/atomic", "Cas",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        v := s.newValue4(ssa.OpAtomicCompareAndSwap32, types.NewTuple(types.Types[types.TBOOL], types.TypeMem), args[0], args[1], args[2], s.mem())
                        s.vars[memVar] = s.newValue1(ssa.OpSelect1, types.TypeMem, v)
                        return s.newValue1(ssa.OpSelect0, types.Types[types.TBOOL], v)
                },
                sys.AMD64, sys.Loong64, sys.MIPS, sys.MIPS64, sys.PPC64, sys.RISCV64, sys.S390X)
-       addF("runtime/internal/atomic", "Cas64",
+       addF("internal/runtime/atomic", "Cas64",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        v := s.newValue4(ssa.OpAtomicCompareAndSwap64, types.NewTuple(types.Types[types.TBOOL], types.TypeMem), args[0], args[1], args[2], s.mem())
                        s.vars[memVar] = s.newValue1(ssa.OpSelect1, types.TypeMem, v)
                        return s.newValue1(ssa.OpSelect0, types.Types[types.TBOOL], v)
                },
                sys.AMD64, sys.Loong64, sys.MIPS64, sys.PPC64, sys.RISCV64, sys.S390X)
-       addF("runtime/internal/atomic", "CasRel",
+       addF("internal/runtime/atomic", "CasRel",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        v := s.newValue4(ssa.OpAtomicCompareAndSwap32, types.NewTuple(types.Types[types.TBOOL], types.TypeMem), args[0], args[1], args[2], s.mem())
                        s.vars[memVar] = s.newValue1(ssa.OpSelect1, types.TypeMem, v)
@@ -4486,32 +4486,32 @@ func InitTables() {
                s.vars[n] = s.newValue1(ssa.OpSelect0, types.Types[typ], v)
        }
 
-       addF("runtime/internal/atomic", "Cas",
+       addF("internal/runtime/atomic", "Cas",
                makeAtomicGuardedIntrinsicARM64(ssa.OpAtomicCompareAndSwap32, ssa.OpAtomicCompareAndSwap32Variant, types.TUINT32, types.TBOOL, atomicCasEmitterARM64),
                sys.ARM64)
-       addF("runtime/internal/atomic", "Cas64",
+       addF("internal/runtime/atomic", "Cas64",
                makeAtomicGuardedIntrinsicARM64(ssa.OpAtomicCompareAndSwap64, ssa.OpAtomicCompareAndSwap64Variant, types.TUINT64, types.TBOOL, atomicCasEmitterARM64),
                sys.ARM64)
 
-       addF("runtime/internal/atomic", "And8",
+       addF("internal/runtime/atomic", "And8",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        s.vars[memVar] = s.newValue3(ssa.OpAtomicAnd8, types.TypeMem, args[0], args[1], s.mem())
                        return nil
                },
                sys.AMD64, sys.MIPS, sys.MIPS64, sys.PPC64, sys.RISCV64, sys.S390X)
-       addF("runtime/internal/atomic", "And",
+       addF("internal/runtime/atomic", "And",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        s.vars[memVar] = s.newValue3(ssa.OpAtomicAnd32, types.TypeMem, args[0], args[1], s.mem())
                        return nil
                },
                sys.AMD64, sys.MIPS, sys.MIPS64, sys.PPC64, sys.RISCV64, sys.S390X)
-       addF("runtime/internal/atomic", "Or8",
+       addF("internal/runtime/atomic", "Or8",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        s.vars[memVar] = s.newValue3(ssa.OpAtomicOr8, types.TypeMem, args[0], args[1], s.mem())
                        return nil
                },
                sys.AMD64, sys.ARM64, sys.MIPS, sys.MIPS64, sys.PPC64, sys.RISCV64, sys.S390X)
-       addF("runtime/internal/atomic", "Or",
+       addF("internal/runtime/atomic", "Or",
                func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                        s.vars[memVar] = s.newValue3(ssa.OpAtomicOr32, types.TypeMem, args[0], args[1], s.mem())
                        return nil
@@ -4522,65 +4522,65 @@ func InitTables() {
                s.vars[memVar] = s.newValue3(op, types.TypeMem, args[0], args[1], s.mem())
        }
 
-       addF("runtime/internal/atomic", "And8",
+       addF("internal/runtime/atomic", "And8",
                makeAtomicGuardedIntrinsicARM64(ssa.OpAtomicAnd8, ssa.OpAtomicAnd8Variant, types.TNIL, types.TNIL, atomicAndOrEmitterARM64),
                sys.ARM64)
-       addF("runtime/internal/atomic", "And",
+       addF("internal/runtime/atomic", "And",
                makeAtomicGuardedIntrinsicARM64(ssa.OpAtomicAnd32, ssa.OpAtomicAnd32Variant, types.TNIL, types.TNIL, atomicAndOrEmitterARM64),
                sys.ARM64)
-       addF("runtime/internal/atomic", "Or8",
+       addF("internal/runtime/atomic", "Or8",
                makeAtomicGuardedIntrinsicARM64(ssa.OpAtomicOr8, ssa.OpAtomicOr8Variant, types.TNIL, types.TNIL, atomicAndOrEmitterARM64),
                sys.ARM64)
-       addF("runtime/internal/atomic", "Or",
+       addF("internal/runtime/atomic", "Or",
                makeAtomicGuardedIntrinsicARM64(ssa.OpAtomicOr32, ssa.OpAtomicOr32Variant, types.TNIL, types.TNIL, atomicAndOrEmitterARM64),
                sys.ARM64)
 
        // Aliases for atomic load operations
-       alias("runtime/internal/atomic", "Loadint32", "runtime/internal/atomic", "Load", all...)
-       alias("runtime/internal/atomic", "Loadint64", "runtime/internal/atomic", "Load64", all...)
-       alias("runtime/internal/atomic", "Loaduintptr", "runtime/internal/atomic", "Load", p4...)
-       alias("runtime/internal/atomic", "Loaduintptr", "runtime/internal/atomic", "Load64", p8...)
-       alias("runtime/internal/atomic", "Loaduint", "runtime/internal/atomic", "Load", p4...)
-       alias("runtime/internal/atomic", "Loaduint", "runtime/internal/atomic", "Load64", p8...)
-       alias("runtime/internal/atomic", "LoadAcq", "runtime/internal/atomic", "Load", lwatomics...)
-       alias("runtime/internal/atomic", "LoadAcq64", "runtime/internal/atomic", "Load64", lwatomics...)
-       alias("runtime/internal/atomic", "LoadAcquintptr", "runtime/internal/atomic", "LoadAcq", p4...)
-       alias("sync", "runtime_LoadAcquintptr", "runtime/internal/atomic", "LoadAcq", p4...) // linknamed
-       alias("runtime/internal/atomic", "LoadAcquintptr", "runtime/internal/atomic", "LoadAcq64", p8...)
-       alias("sync", "runtime_LoadAcquintptr", "runtime/internal/atomic", "LoadAcq64", p8...) // linknamed
+       alias("internal/runtime/atomic", "Loadint32", "internal/runtime/atomic", "Load", all...)
+       alias("internal/runtime/atomic", "Loadint64", "internal/runtime/atomic", "Load64", all...)
+       alias("internal/runtime/atomic", "Loaduintptr", "internal/runtime/atomic", "Load", p4...)
+       alias("internal/runtime/atomic", "Loaduintptr", "internal/runtime/atomic", "Load64", p8...)
+       alias("internal/runtime/atomic", "Loaduint", "internal/runtime/atomic", "Load", p4...)
+       alias("internal/runtime/atomic", "Loaduint", "internal/runtime/atomic", "Load64", p8...)
+       alias("internal/runtime/atomic", "LoadAcq", "internal/runtime/atomic", "Load", lwatomics...)
+       alias("internal/runtime/atomic", "LoadAcq64", "internal/runtime/atomic", "Load64", lwatomics...)
+       alias("internal/runtime/atomic", "LoadAcquintptr", "internal/runtime/atomic", "LoadAcq", p4...)
+       alias("sync", "runtime_LoadAcquintptr", "internal/runtime/atomic", "LoadAcq", p4...) // linknamed
+       alias("internal/runtime/atomic", "LoadAcquintptr", "internal/runtime/atomic", "LoadAcq64", p8...)
+       alias("sync", "runtime_LoadAcquintptr", "internal/runtime/atomic", "LoadAcq64", p8...) // linknamed
 
        // Aliases for atomic store operations
-       alias("runtime/internal/atomic", "Storeint32", "runtime/internal/atomic", "Store", all...)
-       alias("runtime/internal/atomic", "Storeint64", "runtime/internal/atomic", "Store64", all...)
-       alias("runtime/internal/atomic", "Storeuintptr", "runtime/internal/atomic", "Store", p4...)
-       alias("runtime/internal/atomic", "Storeuintptr", "runtime/internal/atomic", "Store64", p8...)
-       alias("runtime/internal/atomic", "StoreRel", "runtime/internal/atomic", "Store", lwatomics...)
-       alias("runtime/internal/atomic", "StoreRel64", "runtime/internal/atomic", "Store64", lwatomics...)
-       alias("runtime/internal/atomic", "StoreReluintptr", "runtime/internal/atomic", "StoreRel", p4...)
-       alias("sync", "runtime_StoreReluintptr", "runtime/internal/atomic", "StoreRel", p4...) // linknamed
-       alias("runtime/internal/atomic", "StoreReluintptr", "runtime/internal/atomic", "StoreRel64", p8...)
-       alias("sync", "runtime_StoreReluintptr", "runtime/internal/atomic", "StoreRel64", p8...) // linknamed
+       alias("internal/runtime/atomic", "Storeint32", "internal/runtime/atomic", "Store", all...)
+       alias("internal/runtime/atomic", "Storeint64", "internal/runtime/atomic", "Store64", all...)
+       alias("internal/runtime/atomic", "Storeuintptr", "internal/runtime/atomic", "Store", p4...)
+       alias("internal/runtime/atomic", "Storeuintptr", "internal/runtime/atomic", "Store64", p8...)
+       alias("internal/runtime/atomic", "StoreRel", "internal/runtime/atomic", "Store", lwatomics...)
+       alias("internal/runtime/atomic", "StoreRel64", "internal/runtime/atomic", "Store64", lwatomics...)
+       alias("internal/runtime/atomic", "StoreReluintptr", "internal/runtime/atomic", "StoreRel", p4...)
+       alias("sync", "runtime_StoreReluintptr", "internal/runtime/atomic", "StoreRel", p4...) // linknamed
+       alias("internal/runtime/atomic", "StoreReluintptr", "internal/runtime/atomic", "StoreRel64", p8...)
+       alias("sync", "runtime_StoreReluintptr", "internal/runtime/atomic", "StoreRel64", p8...) // linknamed
 
        // Aliases for atomic swap operations
-       alias("runtime/internal/atomic", "Xchgint32", "runtime/internal/atomic", "Xchg", all...)
-       alias("runtime/internal/atomic", "Xchgint64", "runtime/internal/atomic", "Xchg64", all...)
-       alias("runtime/internal/atomic", "Xchguintptr", "runtime/internal/atomic", "Xchg", p4...)
-       alias("runtime/internal/atomic", "Xchguintptr", "runtime/internal/atomic", "Xchg64", p8...)
+       alias("internal/runtime/atomic", "Xchgint32", "internal/runtime/atomic", "Xchg", all...)
+       alias("internal/runtime/atomic", "Xchgint64", "internal/runtime/atomic", "Xchg64", all...)
+       alias("internal/runtime/atomic", "Xchguintptr", "internal/runtime/atomic", "Xchg", p4...)
+       alias("internal/runtime/atomic", "Xchguintptr", "internal/runtime/atomic", "Xchg64", p8...)
 
        // Aliases for atomic add operations
-       alias("runtime/internal/atomic", "Xaddint32", "runtime/internal/atomic", "Xadd", all...)
-       alias("runtime/internal/atomic", "Xaddint64", "runtime/internal/atomic", "Xadd64", all...)
-       alias("runtime/internal/atomic", "Xadduintptr", "runtime/internal/atomic", "Xadd", p4...)
-       alias("runtime/internal/atomic", "Xadduintptr", "runtime/internal/atomic", "Xadd64", p8...)
+       alias("internal/runtime/atomic", "Xaddint32", "internal/runtime/atomic", "Xadd", all...)
+       alias("internal/runtime/atomic", "Xaddint64", "internal/runtime/atomic", "Xadd64", all...)
+       alias("internal/runtime/atomic", "Xadduintptr", "internal/runtime/atomic", "Xadd", p4...)
+       alias("internal/runtime/atomic", "Xadduintptr", "internal/runtime/atomic", "Xadd64", p8...)
 
        // Aliases for atomic CAS operations
-       alias("runtime/internal/atomic", "Casint32", "runtime/internal/atomic", "Cas", all...)
-       alias("runtime/internal/atomic", "Casint64", "runtime/internal/atomic", "Cas64", all...)
-       alias("runtime/internal/atomic", "Casuintptr", "runtime/internal/atomic", "Cas", p4...)
-       alias("runtime/internal/atomic", "Casuintptr", "runtime/internal/atomic", "Cas64", p8...)
-       alias("runtime/internal/atomic", "Casp1", "runtime/internal/atomic", "Cas", p4...)
-       alias("runtime/internal/atomic", "Casp1", "runtime/internal/atomic", "Cas64", p8...)
-       alias("runtime/internal/atomic", "CasRel", "runtime/internal/atomic", "Cas", lwatomics...)
+       alias("internal/runtime/atomic", "Casint32", "internal/runtime/atomic", "Cas", all...)
+       alias("internal/runtime/atomic", "Casint64", "internal/runtime/atomic", "Cas64", all...)
+       alias("internal/runtime/atomic", "Casuintptr", "internal/runtime/atomic", "Cas", p4...)
+       alias("internal/runtime/atomic", "Casuintptr", "internal/runtime/atomic", "Cas64", p8...)
+       alias("internal/runtime/atomic", "Casp1", "internal/runtime/atomic", "Cas", p4...)
+       alias("internal/runtime/atomic", "Casp1", "internal/runtime/atomic", "Cas64", p8...)
+       alias("internal/runtime/atomic", "CasRel", "internal/runtime/atomic", "Cas", lwatomics...)
 
        /******** math ********/
        addF("math", "sqrt",
@@ -5021,42 +5021,42 @@ func InitTables() {
        /******** sync/atomic ********/
 
        // Note: these are disabled by flag_race in findIntrinsic below.
-       alias("sync/atomic", "LoadInt32", "runtime/internal/atomic", "Load", all...)
-       alias("sync/atomic", "LoadInt64", "runtime/internal/atomic", "Load64", all...)
-       alias("sync/atomic", "LoadPointer", "runtime/internal/atomic", "Loadp", all...)
-       alias("sync/atomic", "LoadUint32", "runtime/internal/atomic", "Load", all...)
-       alias("sync/atomic", "LoadUint64", "runtime/internal/atomic", "Load64", all...)
-       alias("sync/atomic", "LoadUintptr", "runtime/internal/atomic", "Load", p4...)
-       alias("sync/atomic", "LoadUintptr", "runtime/internal/atomic", "Load64", p8...)
-
-       alias("sync/atomic", "StoreInt32", "runtime/internal/atomic", "Store", all...)
-       alias("sync/atomic", "StoreInt64", "runtime/internal/atomic", "Store64", all...)
+       alias("sync/atomic", "LoadInt32", "internal/runtime/atomic", "Load", all...)
+       alias("sync/atomic", "LoadInt64", "internal/runtime/atomic", "Load64", all...)
+       alias("sync/atomic", "LoadPointer", "internal/runtime/atomic", "Loadp", all...)
+       alias("sync/atomic", "LoadUint32", "internal/runtime/atomic", "Load", all...)
+       alias("sync/atomic", "LoadUint64", "internal/runtime/atomic", "Load64", all...)
+       alias("sync/atomic", "LoadUintptr", "internal/runtime/atomic", "Load", p4...)
+       alias("sync/atomic", "LoadUintptr", "internal/runtime/atomic", "Load64", p8...)
+
+       alias("sync/atomic", "StoreInt32", "internal/runtime/atomic", "Store", all...)
+       alias("sync/atomic", "StoreInt64", "internal/runtime/atomic", "Store64", all...)
        // Note: not StorePointer, that needs a write barrier.  Same below for {CompareAnd}Swap.
-       alias("sync/atomic", "StoreUint32", "runtime/internal/atomic", "Store", all...)
-       alias("sync/atomic", "StoreUint64", "runtime/internal/atomic", "Store64", all...)
-       alias("sync/atomic", "StoreUintptr", "runtime/internal/atomic", "Store", p4...)
-       alias("sync/atomic", "StoreUintptr", "runtime/internal/atomic", "Store64", p8...)
-
-       alias("sync/atomic", "SwapInt32", "runtime/internal/atomic", "Xchg", all...)
-       alias("sync/atomic", "SwapInt64", "runtime/internal/atomic", "Xchg64", all...)
-       alias("sync/atomic", "SwapUint32", "runtime/internal/atomic", "Xchg", all...)
-       alias("sync/atomic", "SwapUint64", "runtime/internal/atomic", "Xchg64", all...)
-       alias("sync/atomic", "SwapUintptr", "runtime/internal/atomic", "Xchg", p4...)
-       alias("sync/atomic", "SwapUintptr", "runtime/internal/atomic", "Xchg64", p8...)
-
-       alias("sync/atomic", "CompareAndSwapInt32", "runtime/internal/atomic", "Cas", all...)
-       alias("sync/atomic", "CompareAndSwapInt64", "runtime/internal/atomic", "Cas64", all...)
-       alias("sync/atomic", "CompareAndSwapUint32", "runtime/internal/atomic", "Cas", all...)
-       alias("sync/atomic", "CompareAndSwapUint64", "runtime/internal/atomic", "Cas64", all...)
-       alias("sync/atomic", "CompareAndSwapUintptr", "runtime/internal/atomic", "Cas", p4...)
-       alias("sync/atomic", "CompareAndSwapUintptr", "runtime/internal/atomic", "Cas64", p8...)
-
-       alias("sync/atomic", "AddInt32", "runtime/internal/atomic", "Xadd", all...)
-       alias("sync/atomic", "AddInt64", "runtime/internal/atomic", "Xadd64", all...)
-       alias("sync/atomic", "AddUint32", "runtime/internal/atomic", "Xadd", all...)
-       alias("sync/atomic", "AddUint64", "runtime/internal/atomic", "Xadd64", all...)
-       alias("sync/atomic", "AddUintptr", "runtime/internal/atomic", "Xadd", p4...)
-       alias("sync/atomic", "AddUintptr", "runtime/internal/atomic", "Xadd64", p8...)
+       alias("sync/atomic", "StoreUint32", "internal/runtime/atomic", "Store", all...)
+       alias("sync/atomic", "StoreUint64", "internal/runtime/atomic", "Store64", all...)
+       alias("sync/atomic", "StoreUintptr", "internal/runtime/atomic", "Store", p4...)
+       alias("sync/atomic", "StoreUintptr", "internal/runtime/atomic", "Store64", p8...)
+
+       alias("sync/atomic", "SwapInt32", "internal/runtime/atomic", "Xchg", all...)
+       alias("sync/atomic", "SwapInt64", "internal/runtime/atomic", "Xchg64", all...)
+       alias("sync/atomic", "SwapUint32", "internal/runtime/atomic", "Xchg", all...)
+       alias("sync/atomic", "SwapUint64", "internal/runtime/atomic", "Xchg64", all...)
+       alias("sync/atomic", "SwapUintptr", "internal/runtime/atomic", "Xchg", p4...)
+       alias("sync/atomic", "SwapUintptr", "internal/runtime/atomic", "Xchg64", p8...)
+
+       alias("sync/atomic", "CompareAndSwapInt32", "internal/runtime/atomic", "Cas", all...)
+       alias("sync/atomic", "CompareAndSwapInt64", "internal/runtime/atomic", "Cas64", all...)
+       alias("sync/atomic", "CompareAndSwapUint32", "internal/runtime/atomic", "Cas", all...)
+       alias("sync/atomic", "CompareAndSwapUint64", "internal/runtime/atomic", "Cas64", all...)
+       alias("sync/atomic", "CompareAndSwapUintptr", "internal/runtime/atomic", "Cas", p4...)
+       alias("sync/atomic", "CompareAndSwapUintptr", "internal/runtime/atomic", "Cas64", p8...)
+
+       alias("sync/atomic", "AddInt32", "internal/runtime/atomic", "Xadd", all...)
+       alias("sync/atomic", "AddInt64", "internal/runtime/atomic", "Xadd64", all...)
+       alias("sync/atomic", "AddUint32", "internal/runtime/atomic", "Xadd", all...)
+       alias("sync/atomic", "AddUint64", "internal/runtime/atomic", "Xadd64", all...)
+       alias("sync/atomic", "AddUintptr", "internal/runtime/atomic", "Xadd", p4...)
+       alias("sync/atomic", "AddUintptr", "internal/runtime/atomic", "Xadd64", p8...)
 
        /******** math/big ********/
        alias("math/big", "mulWW", "math/bits", "Mul64", p8...)
@@ -6663,7 +6663,7 @@ func (s *state) dottype1(pos src.XPos, src, dst *types.Type, iface, source, targ
                        if base.Flag.N == 0 && rtabi.UseInterfaceSwitchCache(Arch.LinkArch.Name) {
                                // Note: we can only use the cache if we have the right atomic load instruction.
                                // Double-check that here.
-                               if _, ok := intrinsics[intrinsicKey{Arch.LinkArch.Arch, "runtime/internal/atomic", "Loadp"}]; !ok {
+                               if _, ok := intrinsics[intrinsicKey{Arch.LinkArch.Arch, "internal/runtime/atomic", "Loadp"}]; !ok {
                                        s.Fatalf("atomic load not available")
                                }
                                // Pick right size ops.

diff --git a/src/cmd/compile/internal/test/inl_test.go b/src/cmd/compile/internal/test/inl_test.go
index 0ccc7b3761995d0f80d03796692ad4ee8fcf49bc..271834a595c1e72f47945240f7d4171a2633d3cf 100644 (file)
--- a/src/cmd/compile/internal/test/inl_test.go
+++ b/src/cmd/compile/internal/test/inl_test.go
@@ -254,7 +254,7 @@ func TestIntendedInlining(t *testing.T) {
                want["runtime/internal/sys"] = append(want["runtime/internal/sys"], "Bswap32")
        }
        if runtime.GOARCH == "amd64" || runtime.GOARCH == "arm64" || runtime.GOARCH == "loong64" || runtime.GOARCH == "mips" || runtime.GOARCH == "mips64" || runtime.GOARCH == "ppc64" || runtime.GOARCH == "riscv64" || runtime.GOARCH == "s390x" {
-               // runtime/internal/atomic.Loaduintptr is only intrinsified on these platforms.
+               // internal/runtime/atomic.Loaduintptr is only intrinsified on these platforms.
                want["runtime"] = append(want["runtime"], "traceAcquire")
        }
        if bits.UintSize == 64 {

diff --git a/src/cmd/compile/internal/types/size.go b/src/cmd/compile/internal/types/size.go
index 1ae8b6988a9b2dcd32e2db04b8ffa71c7227ddb0..00707fc86e6a4954b20b3d377b18fe868c1b74f5 100644 (file)
--- a/src/cmd/compile/internal/types/size.go
+++ b/src/cmd/compile/internal/types/size.go
@@ -199,7 +199,7 @@ func isAtomicStdPkg(p *Pkg) bool {
        if p.Prefix == `""` {
                panic("bad package prefix")
        }
-       return p.Prefix == "sync/atomic" || p.Prefix == "runtime/internal/atomic"
+       return p.Prefix == "sync/atomic" || p.Prefix == "internal/runtime/atomic"
 }
 
 // CalcSize calculates and stores the size, alignment, eq/hash algorithm,

diff --git a/src/cmd/compile/internal/types2/sizes.go b/src/cmd/compile/internal/types2/sizes.go
index 7d20c97010caccb5db29a7e50458a1f720befe62..7b1c00b40ab9a906de6d10db0489f3ac2a01e61d 100644 (file)
--- a/src/cmd/compile/internal/types2/sizes.go
+++ b/src/cmd/compile/internal/types2/sizes.go
@@ -120,7 +120,7 @@ func IsSyncAtomicAlign64(T Type) bool {
        return obj.Name() == "align64" &&
                obj.Pkg() != nil &&
                (obj.Pkg().Path() == "sync/atomic" ||
-                       obj.Pkg().Path() == "runtime/internal/atomic")
+                       obj.Pkg().Path() == "internal/runtime/atomic")
 }
 
 func (s *StdSizes) Offsetsof(fields []*Var) []int64 {

diff --git a/src/cmd/cover/cover.go b/src/cmd/cover/cover.go
index ba7694b3af561da891bcde06a2f3c0e1f6b89394..d4e529bcde6f8aee5cebd60195f070be3e621cc8 100644 (file)
--- a/src/cmd/cover/cover.go
+++ b/src/cmd/cover/cover.go
@@ -405,7 +405,7 @@ func (f *File) Visit(node ast.Node) ast.Visitor {
                //
                // Note that in the current implementation (Go 1.20) both
                // routines are assembly stubs that forward calls to the
-               // runtime/internal/atomic equivalents, hence the infinite
+               // internal/runtime/atomic equivalents, hence the infinite
                // loop scenario is purely theoretical (maybe if in some
                // future implementation one of these functions might be
                // written in Go). See #57445 for more details.

diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go
index fd599b5189a8f94fd3ea3af1268650fe383fae07..f241e93ee8b498e6af9a4bb374f2ee290e377fce 100644 (file)
--- a/src/cmd/go/internal/load/pkg.go
+++ b/src/cmd/go/internal/load/pkg.go
@@ -3480,11 +3480,11 @@ func SelectCoverPackages(roots []*Package, match []func(*Package) bool, op strin
                }
 
                // Silently ignore attempts to run coverage on sync/atomic
-               // and/or runtime/internal/atomic when using atomic coverage
+               // and/or internal/runtime/atomic when using atomic coverage
                // mode. Atomic coverage mode uses sync/atomic, so we can't
                // also do coverage on it.
                if cfg.BuildCoverMode == "atomic" && p.Standard &&
-                       (p.ImportPath == "sync/atomic" || p.ImportPath == "runtime/internal/atomic") {
+                       (p.ImportPath == "sync/atomic" || p.ImportPath == "internal/runtime/atomic") {
                        continue
                }
 

diff --git a/src/cmd/internal/objabi/pkgspecial.go b/src/cmd/internal/objabi/pkgspecial.go
index 6c1f460f0735b3ac1f8b274de89e5ba4b958e7fa..44f26024f7afc6c90d8e3cb60236dad72759287c 100644 (file)
--- a/src/cmd/internal/objabi/pkgspecial.go
+++ b/src/cmd/internal/objabi/pkgspecial.go
@@ -43,7 +43,7 @@ type PkgSpecial struct {
 var runtimePkgs = []string{
        "runtime",
 
-       "runtime/internal/atomic",
+       "internal/runtime/atomic",
        "runtime/internal/math",
        "runtime/internal/sys",
        "internal/runtime/syscall",

diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index 427f5a96b5af3a367f42109855b29cb1193e0d2a..59c0fdde5583872b161b88af2a7fb4c66b654b9c 100644 (file)
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@ -70,7 +70,7 @@ var depsRules = `
        < internal/unsafeheader
        < runtime/internal/sys
        < internal/runtime/syscall
-       < runtime/internal/atomic
+       < internal/runtime/atomic
        < runtime/internal/math
        < runtime
        < sync/atomic

diff --git a/src/go/types/sizes.go b/src/go/types/sizes.go
index b7a2bea0e87e54bf9153f46bb081b58a1526631e..9e377fe2dfe90358cf091e13340b2eca82f3870f 100644 (file)
--- a/src/go/types/sizes.go
+++ b/src/go/types/sizes.go
@@ -122,7 +122,7 @@ func _IsSyncAtomicAlign64(T Type) bool {
        return obj.Name() == "align64" &&
                obj.Pkg() != nil &&
                (obj.Pkg().Path() == "sync/atomic" ||
-                       obj.Pkg().Path() == "runtime/internal/atomic")
+                       obj.Pkg().Path() == "internal/runtime/atomic")
 }
 
 func (s *StdSizes) Offsetsof(fields []*Var) []int64 {

diff --git a/src/internal/coverage/pkid.go b/src/internal/coverage/pkid.go
index a7a89c03ee52058480a2a673cba58f53d777ff7d..86ff302507c70b1d408e114f214a1e0e076b537c 100644 (file)
--- a/src/internal/coverage/pkid.go
+++ b/src/internal/coverage/pkid.go
@@ -24,7 +24,7 @@ package coverage
 //    registered list:
 //    slot: 0 path='internal/cpu'  hard-coded id: 1
 //    slot: 1 path='internal/goarch'  hard-coded id: 2
-//    slot: 2 path='runtime/internal/atomic'  hard-coded id: 3
+//    slot: 2 path='internal/runtime/atomic'  hard-coded id: 3
 //    slot: 3 path='internal/goos'
 //    slot: 4 path='runtime/internal/sys'  hard-coded id: 5
 //    slot: 5 path='internal/abi'  hard-coded id: 4
@@ -47,7 +47,7 @@ package coverage
 var rtPkgs = [...]string{
        "internal/cpu",
        "internal/goarch",
-       "runtime/internal/atomic",
+       "internal/runtime/atomic",
        "internal/goos",
        "internal/chacha8rand",
        "runtime/internal/sys",

diff --git a/src/runtime/internal/atomic/atomic_386.go b/src/internal/runtime/atomic/atomic_386.go
similarity index 100%
rename from src/runtime/internal/atomic/atomic_386.go
rename to src/internal/runtime/atomic/atomic_386.go

diff --git a/src/runtime/internal/atomic/atomic_386.s b/src/internal/runtime/atomic/atomic_386.s
similarity index 100%
rename from src/runtime/internal/atomic/atomic_386.s
rename to src/internal/runtime/atomic/atomic_386.s

diff --git a/src/runtime/internal/atomic/atomic_amd64.go b/src/internal/runtime/atomic/atomic_amd64.go
similarity index 100%
rename from src/runtime/internal/atomic/atomic_amd64.go
rename to src/internal/runtime/atomic/atomic_amd64.go

diff --git a/src/runtime/internal/atomic/atomic_amd64.s b/src/internal/runtime/atomic/atomic_amd64.s
similarity index 100%
rename from src/runtime/internal/atomic/atomic_amd64.s
rename to src/internal/runtime/atomic/atomic_amd64.s

diff --git a/src/runtime/internal/atomic/atomic_andor_generic.go b/src/internal/runtime/atomic/atomic_andor_generic.go
similarity index 100%
rename from src/runtime/internal/atomic/atomic_andor_generic.go
rename to src/internal/runtime/atomic/atomic_andor_generic.go

diff --git a/src/runtime/internal/atomic/atomic_andor_test.go b/src/internal/runtime/atomic/atomic_andor_test.go
similarity index 99%
rename from src/runtime/internal/atomic/atomic_andor_test.go
rename to src/internal/runtime/atomic/atomic_andor_test.go
index a2f3b6f3a90b64813b6f3aa3f9eb3d0896765e13..631a6e637dcca9d734ad3e966ee9db3fd32e934e 100644 (file)
--- a/src/runtime/internal/atomic/atomic_andor_test.go
+++ b/src/internal/runtime/atomic/atomic_andor_test.go
@@ -7,7 +7,7 @@
 package atomic_test
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "testing"
 )
 

diff --git a/src/runtime/internal/atomic/atomic_arm.go b/src/internal/runtime/atomic/atomic_arm.go
similarity index 100%
rename from src/runtime/internal/atomic/atomic_arm.go
rename to src/internal/runtime/atomic/atomic_arm.go

diff --git a/src/runtime/internal/atomic/atomic_arm.s b/src/internal/runtime/atomic/atomic_arm.s
similarity index 100%
rename from src/runtime/internal/atomic/atomic_arm.s
rename to src/internal/runtime/atomic/atomic_arm.s

diff --git a/src/runtime/internal/atomic/atomic_arm64.go b/src/internal/runtime/atomic/atomic_arm64.go
similarity index 100%
rename from src/runtime/internal/atomic/atomic_arm64.go
rename to src/internal/runtime/atomic/atomic_arm64.go

diff --git a/src/runtime/internal/atomic/atomic_arm64.s b/src/internal/runtime/atomic/atomic_arm64.s
similarity index 100%
rename from src/runtime/internal/atomic/atomic_arm64.s
rename to src/internal/runtime/atomic/atomic_arm64.s

diff --git a/src/runtime/internal/atomic/atomic_loong64.go b/src/internal/runtime/atomic/atomic_loong64.go
similarity index 100%
rename from src/runtime/internal/atomic/atomic_loong64.go
rename to src/internal/runtime/atomic/atomic_loong64.go

diff --git a/src/runtime/internal/atomic/atomic_loong64.s b/src/internal/runtime/atomic/atomic_loong64.s
similarity index 95%
rename from src/runtime/internal/atomic/atomic_loong64.s
rename to src/internal/runtime/atomic/atomic_loong64.s
index c7452d2e11e7426ee174b7fd051e00ab9929a580..1812cb95fd4edd4a9185f4de3d3ecb4a6b55571c 100644 (file)
--- a/src/runtime/internal/atomic/atomic_loong64.s
+++ b/src/internal/runtime/atomic/atomic_loong64.s
@@ -316,7 +316,7 @@ TEXT ·Anduintptr(SB), NOSPLIT, $0-24
 TEXT ·Oruintptr(SB), NOSPLIT, $0-24
        JMP     ·Or64(SB)
 
-// uint32 runtime∕internal∕atomic·Load(uint32 volatile* ptr)
+// uint32 internal∕runtime∕atomic·Load(uint32 volatile* ptr)
 TEXT ·Load(SB),NOSPLIT|NOFRAME,$0-12
        MOVV    ptr+0(FP), R19
        DBAR
@@ -325,7 +325,7 @@ TEXT ·Load(SB),NOSPLIT|NOFRAME,$0-12
        MOVW    R19, ret+8(FP)
        RET
 
-// uint8 runtime∕internal∕atomic·Load8(uint8 volatile* ptr)
+// uint8 internal∕runtime∕atomic·Load8(uint8 volatile* ptr)
 TEXT ·Load8(SB),NOSPLIT|NOFRAME,$0-9
        MOVV    ptr+0(FP), R19
        DBAR
@@ -334,7 +334,7 @@ TEXT ·Load8(SB),NOSPLIT|NOFRAME,$0-9
        MOVB    R19, ret+8(FP)
        RET
 
-// uint64 runtime∕internal∕atomic·Load64(uint64 volatile* ptr)
+// uint64 internal∕runtime∕atomic·Load64(uint64 volatile* ptr)
 TEXT ·Load64(SB),NOSPLIT|NOFRAME,$0-16
        MOVV    ptr+0(FP), R19
        DBAR
@@ -343,7 +343,7 @@ TEXT ·Load64(SB),NOSPLIT|NOFRAME,$0-16
        MOVV    R19, ret+8(FP)
        RET
 
-// void *runtime∕internal∕atomic·Loadp(void *volatile *ptr)
+// void *internal∕runtime∕atomic·Loadp(void *volatile *ptr)
 TEXT ·Loadp(SB),NOSPLIT|NOFRAME,$0-16
        MOVV    ptr+0(FP), R19
        DBAR
@@ -352,7 +352,7 @@ TEXT ·Loadp(SB),NOSPLIT|NOFRAME,$0-16
        MOVV    R19, ret+8(FP)
        RET
 
-// uint32 runtime∕internal∕atomic·LoadAcq(uint32 volatile* ptr)
+// uint32 internal∕runtime∕atomic·LoadAcq(uint32 volatile* ptr)
 TEXT ·LoadAcq(SB),NOSPLIT|NOFRAME,$0-12
        JMP     ·Load(SB)
 

diff --git a/src/runtime/internal/atomic/atomic_mips64x.go b/src/internal/runtime/atomic/atomic_mips64x.go
similarity index 100%
rename from src/runtime/internal/atomic/atomic_mips64x.go
rename to src/internal/runtime/atomic/atomic_mips64x.go

diff --git a/src/runtime/internal/atomic/atomic_mips64x.s b/src/internal/runtime/atomic/atomic_mips64x.s
similarity index 100%
rename from src/runtime/internal/atomic/atomic_mips64x.s
rename to src/internal/runtime/atomic/atomic_mips64x.s

diff --git a/src/runtime/internal/atomic/atomic_mipsx.go b/src/internal/runtime/atomic/atomic_mipsx.go
similarity index 100%
rename from src/runtime/internal/atomic/atomic_mipsx.go
rename to src/internal/runtime/atomic/atomic_mipsx.go

diff --git a/src/runtime/internal/atomic/atomic_mipsx.s b/src/internal/runtime/atomic/atomic_mipsx.s
similarity index 100%
rename from src/runtime/internal/atomic/atomic_mipsx.s
rename to src/internal/runtime/atomic/atomic_mipsx.s

diff --git a/src/runtime/internal/atomic/atomic_ppc64x.go b/src/internal/runtime/atomic/atomic_ppc64x.go
similarity index 100%
rename from src/runtime/internal/atomic/atomic_ppc64x.go
rename to src/internal/runtime/atomic/atomic_ppc64x.go

diff --git a/src/runtime/internal/atomic/atomic_ppc64x.s b/src/internal/runtime/atomic/atomic_ppc64x.s
similarity index 100%
rename from src/runtime/internal/atomic/atomic_ppc64x.s
rename to src/internal/runtime/atomic/atomic_ppc64x.s

diff --git a/src/runtime/internal/atomic/atomic_riscv64.go b/src/internal/runtime/atomic/atomic_riscv64.go
similarity index 100%
rename from src/runtime/internal/atomic/atomic_riscv64.go
rename to src/internal/runtime/atomic/atomic_riscv64.go

diff --git a/src/runtime/internal/atomic/atomic_riscv64.s b/src/internal/runtime/atomic/atomic_riscv64.s
similarity index 100%
rename from src/runtime/internal/atomic/atomic_riscv64.s
rename to src/internal/runtime/atomic/atomic_riscv64.s

diff --git a/src/runtime/internal/atomic/atomic_s390x.go b/src/internal/runtime/atomic/atomic_s390x.go
similarity index 100%
rename from src/runtime/internal/atomic/atomic_s390x.go
rename to src/internal/runtime/atomic/atomic_s390x.go

diff --git a/src/runtime/internal/atomic/atomic_s390x.s b/src/internal/runtime/atomic/atomic_s390x.s
similarity index 100%
rename from src/runtime/internal/atomic/atomic_s390x.s
rename to src/internal/runtime/atomic/atomic_s390x.s

diff --git a/src/runtime/internal/atomic/atomic_test.go b/src/internal/runtime/atomic/atomic_test.go
similarity index 99%
rename from src/runtime/internal/atomic/atomic_test.go
rename to src/internal/runtime/atomic/atomic_test.go
index 2427bfd211ee9cd84e858783d3a2c63473b7c2fe..f28213c3ce43be6b14dae361c2a98980ffe9396d 100644 (file)
--- a/src/runtime/internal/atomic/atomic_test.go
+++ b/src/internal/runtime/atomic/atomic_test.go
@@ -6,8 +6,8 @@ package atomic_test
 
 import (
        "internal/goarch"
+       "internal/runtime/atomic"
        "runtime"
-       "runtime/internal/atomic"
        "testing"
        "unsafe"
 )

diff --git a/src/runtime/internal/atomic/atomic_wasm.go b/src/internal/runtime/atomic/atomic_wasm.go
similarity index 100%
rename from src/runtime/internal/atomic/atomic_wasm.go
rename to src/internal/runtime/atomic/atomic_wasm.go

diff --git a/src/runtime/internal/atomic/atomic_wasm.s b/src/internal/runtime/atomic/atomic_wasm.s
similarity index 100%
rename from src/runtime/internal/atomic/atomic_wasm.s
rename to src/internal/runtime/atomic/atomic_wasm.s

diff --git a/src/runtime/internal/atomic/bench_test.go b/src/internal/runtime/atomic/bench_test.go
similarity index 99%
rename from src/runtime/internal/atomic/bench_test.go
rename to src/internal/runtime/atomic/bench_test.go
index efc0531a0d3fd64cf234a1d9c18c7a0409478e45..798431cf7258c2918e99ea5f67832ee355de46ad 100644 (file)
--- a/src/runtime/internal/atomic/bench_test.go
+++ b/src/internal/runtime/atomic/bench_test.go
@@ -5,7 +5,7 @@
 package atomic_test
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "testing"
 )
 

diff --git a/src/runtime/internal/atomic/doc.go b/src/internal/runtime/atomic/doc.go
similarity index 100%
rename from src/runtime/internal/atomic/doc.go
rename to src/internal/runtime/atomic/doc.go

diff --git a/src/runtime/internal/atomic/stubs.go b/src/internal/runtime/atomic/stubs.go
similarity index 100%
rename from src/runtime/internal/atomic/stubs.go
rename to src/internal/runtime/atomic/stubs.go

diff --git a/src/runtime/internal/atomic/sys_linux_arm.s b/src/internal/runtime/atomic/sys_linux_arm.s
similarity index 100%
rename from src/runtime/internal/atomic/sys_linux_arm.s
rename to src/internal/runtime/atomic/sys_linux_arm.s

diff --git a/src/runtime/internal/atomic/sys_nonlinux_arm.s b/src/internal/runtime/atomic/sys_nonlinux_arm.s
similarity index 100%
rename from src/runtime/internal/atomic/sys_nonlinux_arm.s
rename to src/internal/runtime/atomic/sys_nonlinux_arm.s

diff --git a/src/runtime/internal/atomic/types.go b/src/internal/runtime/atomic/types.go
similarity index 100%
rename from src/runtime/internal/atomic/types.go
rename to src/internal/runtime/atomic/types.go

diff --git a/src/runtime/internal/atomic/types_64bit.go b/src/internal/runtime/atomic/types_64bit.go
similarity index 100%
rename from src/runtime/internal/atomic/types_64bit.go
rename to src/internal/runtime/atomic/types_64bit.go

diff --git a/src/runtime/internal/atomic/unaligned.go b/src/internal/runtime/atomic/unaligned.go
similarity index 100%
rename from src/runtime/internal/atomic/unaligned.go
rename to src/internal/runtime/atomic/unaligned.go

diff --git a/src/runtime/HACKING.md b/src/runtime/HACKING.md
index ce0b42a354ae4bbaa9804358ccf71e87fc08f81d..e1a43ba88e3d4978f0646e01635045debd1b0e19 100644 (file)
--- a/src/runtime/HACKING.md
+++ b/src/runtime/HACKING.md
@@ -173,7 +173,7 @@ In summary,
 Atomics
 =======
 
-The runtime uses its own atomics package at `runtime/internal/atomic`.
+The runtime uses its own atomics package at `internal/runtime/atomic`.
 This corresponds to `sync/atomic`, but functions have different names
 for historical reasons and there are a few additional functions needed
 by the runtime.

diff --git a/src/runtime/abi_test.go b/src/runtime/abi_test.go
index 4caee597c5419e9fb10f600aa5bb2e546579f243..d2e79c6dc4072b41fad5bf7f9534181fb9643f3b 100644 (file)
--- a/src/runtime/abi_test.go
+++ b/src/runtime/abi_test.go
@@ -11,11 +11,11 @@ package runtime_test
 
 import (
        "internal/abi"
+       "internal/runtime/atomic"
        "internal/testenv"
        "os"
        "os/exec"
        "runtime"
-       "runtime/internal/atomic"
        "strings"
        "testing"
        "time"

diff --git a/src/runtime/align_runtime_test.go b/src/runtime/align_runtime_test.go
index d78b0b2d39b26150f96658311a14ceb2ab786f20..6d77e0d3d4a2fb8bcd151b1ee06d9fa730c6925f 100644 (file)
--- a/src/runtime/align_runtime_test.go
+++ b/src/runtime/align_runtime_test.go
@@ -11,7 +11,7 @@ package runtime
 import "unsafe"
 
 // AtomicFields is the set of fields on which we perform 64-bit atomic
-// operations (all the *64 operations in runtime/internal/atomic).
+// operations (all the *64 operations in internal/runtime/atomic).
 var AtomicFields = []uintptr{
        unsafe.Offsetof(m{}.procid),
        unsafe.Offsetof(p{}.gcFractionalMarkTime),

diff --git a/src/runtime/arena.go b/src/runtime/arena.go
index 3fdd4cbdd604ab9db054817dd7eed71ff96a0ed7..5c3350aabf4e141e5335ca82138c1ce30cd5c616 100644 (file)
--- a/src/runtime/arena.go
+++ b/src/runtime/arena.go
@@ -85,7 +85,7 @@ package runtime
 import (
        "internal/goarch"
        "internal/goexperiment"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/math"
        "unsafe"
 )

diff --git a/src/runtime/arena_test.go b/src/runtime/arena_test.go
index 018c42371256325d50ce86d86422ebf9986433a1..ca5223b59c998352d944dca874d21657e488d71d 100644 (file)
--- a/src/runtime/arena_test.go
+++ b/src/runtime/arena_test.go
@@ -6,10 +6,10 @@ package runtime_test
 
 import (
        "internal/goarch"
+       "internal/runtime/atomic"
        "reflect"
        . "runtime"
        "runtime/debug"
-       "runtime/internal/atomic"
        "testing"
        "time"
        "unsafe"

diff --git a/src/runtime/atomic_pointer.go b/src/runtime/atomic_pointer.go
index b61bf0b8b2a193fb0a8fdb15c6808a183b77646f..e3d17b5cf86b7bb38fba661b21f617761211834a 100644 (file)
--- a/src/runtime/atomic_pointer.go
+++ b/src/runtime/atomic_pointer.go
@@ -6,7 +6,7 @@ package runtime
 
 import (
        "internal/goexperiment"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 
@@ -43,7 +43,7 @@ func atomicstorep(ptr unsafe.Pointer, new unsafe.Pointer) {
 // (like StoreNoWB but with the write barrier).
 //
 //go:nosplit
-//go:linkname atomic_storePointer runtime/internal/atomic.storePointer
+//go:linkname atomic_storePointer internal/runtime/atomic.storePointer
 func atomic_storePointer(ptr *unsafe.Pointer, new unsafe.Pointer) {
        atomicstorep(unsafe.Pointer(ptr), new)
 }
@@ -52,7 +52,7 @@ func atomic_storePointer(ptr *unsafe.Pointer, new unsafe.Pointer) {
 // (like CompareAndSwapNoWB but with the write barrier).
 //
 //go:nosplit
-//go:linkname atomic_casPointer runtime/internal/atomic.casPointer
+//go:linkname atomic_casPointer internal/runtime/atomic.casPointer
 func atomic_casPointer(ptr *unsafe.Pointer, old, new unsafe.Pointer) bool {
        if writeBarrier.enabled {
                atomicwb(ptr, new)

diff --git a/src/runtime/chan.go b/src/runtime/chan.go
index 8aca024c4ca9ca1efd3fb3921e324951d590a67d..6ce824f62cef3b6b19ddbd1e59b67b2ac741b25f 100644 (file)
--- a/src/runtime/chan.go
+++ b/src/runtime/chan.go
@@ -19,7 +19,7 @@ package runtime
 
 import (
        "internal/abi"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/math"
        "unsafe"
 )

diff --git a/src/runtime/coverage/testsupport.go b/src/runtime/coverage/testsupport.go
index f169580618a549bce1a1793be0aa1adf081778e8..a12b8589f0dd4618a29924c26ad3b29e113f4592 100644 (file)
--- a/src/runtime/coverage/testsupport.go
+++ b/src/runtime/coverage/testsupport.go
@@ -14,10 +14,10 @@ import (
        "internal/coverage/decodecounter"
        "internal/coverage/decodemeta"
        "internal/coverage/pods"
+       "internal/runtime/atomic"
        "io"
        "os"
        "path/filepath"
-       "runtime/internal/atomic"
        "strings"
        "unsafe"
 )

diff --git a/src/runtime/debug.go b/src/runtime/debug.go
index 3233ce8ee73718c1123594b28dfc71f255a9ee0b..184e4127c3b89b28a814530f967e54bd084bab3c 100644 (file)
--- a/src/runtime/debug.go
+++ b/src/runtime/debug.go
@@ -5,7 +5,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/debuglog.go b/src/runtime/debuglog.go
index 873f1b45bddc8852fd22d4546c25e735a821c7ca..545fde2b240262d8f3203bea93b14c4794820311 100644 (file)
--- a/src/runtime/debuglog.go
+++ b/src/runtime/debuglog.go
@@ -16,7 +16,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/export_test.go b/src/runtime/export_test.go
index fe79497e7fb5dce947d4e885e027630427ac9460..e71f4766c6c6d795bbcc3f2e91aafc363cd3c8fe 100644 (file)
--- a/src/runtime/export_test.go
+++ b/src/runtime/export_test.go
@@ -11,7 +11,7 @@ import (
        "internal/goarch"
        "internal/goexperiment"
        "internal/goos"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/histogram.go b/src/runtime/histogram.go
index f243667b5542a3c16bf2cbd819fa64dd66574829..95230d1f39d5a67b68d2d5e996157e9237352336 100644 (file)
--- a/src/runtime/histogram.go
+++ b/src/runtime/histogram.go
@@ -5,7 +5,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/iface.go b/src/runtime/iface.go
index 99e9a367f55740edd05a8e4099c05719ea25fa62..e28018066591c3b44498bb90d512ad7819b245e7 100644 (file)
--- a/src/runtime/iface.go
+++ b/src/runtime/iface.go
@@ -7,7 +7,7 @@ package runtime
 import (
        "internal/abi"
        "internal/goarch"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/lfstack.go b/src/runtime/lfstack.go
index a91ae64e5383ad8bfdd5c0c32099d8c11e4c591a..cbec6e84472629ddfd8b2e63a45a16c40128daca 100644 (file)
--- a/src/runtime/lfstack.go
+++ b/src/runtime/lfstack.go
@@ -7,7 +7,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/lock_futex.go b/src/runtime/lock_futex.go
index 867e2b34d0662279311ac1407f27bfda3b6a7b37..58690e45e4d5a87bf2e7ddbd9d0f213ac060fa93 100644 (file)
--- a/src/runtime/lock_futex.go
+++ b/src/runtime/lock_futex.go
@@ -7,7 +7,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/lock_sema.go b/src/runtime/lock_sema.go
index 073e7d410e4c74bceb6a0d1ca1e4cc4078df127e..32d2235ad3ab900371a8241e6ba399a348b59025 100644 (file)
--- a/src/runtime/lock_sema.go
+++ b/src/runtime/lock_sema.go
@@ -7,7 +7,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/lockrank_on.go b/src/runtime/lockrank_on.go
index b1d99997947ae4443e5542dab471f5514a3ff2a3..e95190f0b226285809648a81e2026c93e2e03134 100644 (file)
--- a/src/runtime/lockrank_on.go
+++ b/src/runtime/lockrank_on.go
@@ -7,7 +7,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/malloc.go b/src/runtime/malloc.go
index 271e4c43dbcdb266c795aab110e51b6bbc2a031b..b531eb71680e98f2339e0f419656b76208a661ff 100644 (file)
--- a/src/runtime/malloc.go
+++ b/src/runtime/malloc.go
@@ -104,7 +104,7 @@ import (
        "internal/goarch"
        "internal/goexperiment"
        "internal/goos"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/math"
        "runtime/internal/sys"
        "unsafe"

diff --git a/src/runtime/map.go b/src/runtime/map.go
index bb3ac39e9421ade6e67e7816e7f74c58f7c916ef..6a9345e0b403df0cd09c0971a28343e9d551562f 100644 (file)
--- a/src/runtime/map.go
+++ b/src/runtime/map.go
@@ -56,7 +56,7 @@ package runtime
 import (
        "internal/abi"
        "internal/goarch"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/math"
        "unsafe"
 )
@@ -1498,7 +1498,7 @@ func mapclone2(t *maptype, src *hmap) *hmap {
        dst := makemap(t, src.count, nil)
        dst.hash0 = src.hash0
        dst.nevacuate = 0
-       //flags do not need to be copied here, just like a new map has no flags.
+       // flags do not need to be copied here, just like a new map has no flags.
 
        if src.count == 0 {
                return dst

diff --git a/src/runtime/mbitmap.go b/src/runtime/mbitmap.go
index cdd1c5fc3b5b24fcd110f9e876bf7592bee3c42e..61530bbe7f8e2afbff249a82e3e76c40bc162341 100644 (file)
--- a/src/runtime/mbitmap.go
+++ b/src/runtime/mbitmap.go
@@ -6,7 +6,7 @@ package runtime
 
 import (
        "internal/goarch"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/mcache.go b/src/runtime/mcache.go
index d4b6eef13ac41fb5b84c893e1eeb1b20fe8fd034..e8da133a69490e1f274c581f667c493d43d694c5 100644 (file)
--- a/src/runtime/mcache.go
+++ b/src/runtime/mcache.go
@@ -5,7 +5,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/mcentral.go b/src/runtime/mcentral.go
index e190b56c86b3ef4c0de2569056e94a1c0dc896b6..bf597e1936da49575cb71f2017f5a042ff035d58 100644 (file)
--- a/src/runtime/mcentral.go
+++ b/src/runtime/mcentral.go
@@ -13,7 +13,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
 )
 

diff --git a/src/runtime/mcheckmark.go b/src/runtime/mcheckmark.go
index 581a5de9558018be26619fe92beae852153dc42f..258f8892727c04dc9febe728d5a5887888316d4e 100644 (file)
--- a/src/runtime/mcheckmark.go
+++ b/src/runtime/mcheckmark.go
@@ -14,7 +14,7 @@ package runtime
 
 import (
        "internal/goarch"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/mem_linux.go b/src/runtime/mem_linux.go
index 15a406d97af22bce3842c7250b616a2b8522e6e5..9aaa57ac9e71d32c59dc1f46820d11e85666db09 100644 (file)
--- a/src/runtime/mem_linux.go
+++ b/src/runtime/mem_linux.go
@@ -5,7 +5,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/mfinal.go b/src/runtime/mfinal.go
index ea3d8a4579be448b020bb0b01f59cef55c89336e..7820f50e5188652ca5452c9751091e999fc85a82 100644 (file)
--- a/src/runtime/mfinal.go
+++ b/src/runtime/mfinal.go
@@ -10,7 +10,7 @@ import (
        "internal/abi"
        "internal/goarch"
        "internal/goexperiment"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/mgc.go b/src/runtime/mgc.go
index efadcdbc4e373af8ae336eb14a667944fe9f4bae..da86fd517f97a002a3103e13ace3a072898a0694 100644 (file)
--- a/src/runtime/mgc.go
+++ b/src/runtime/mgc.go
@@ -130,7 +130,7 @@ package runtime
 
 import (
        "internal/cpu"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/mgclimit.go b/src/runtime/mgclimit.go
index ef3cc081cec3d2fce215ac7f104994c56573f98e..bd6dc37e04839fce135757eea40682a22463311a 100644 (file)
--- a/src/runtime/mgclimit.go
+++ b/src/runtime/mgclimit.go
@@ -4,7 +4,7 @@
 
 package runtime
 
-import "runtime/internal/atomic"
+import "internal/runtime/atomic"
 
 // gcCPULimiter is a mechanism to limit GC CPU utilization in situations
 // where it might become excessive and inhibit application progress (e.g.

diff --git a/src/runtime/mgcmark.go b/src/runtime/mgcmark.go
index e118ba69af0ae02ad6cfb4430d50242743c08ed5..7622d1e0d8f5d0096716caceb6d323a3296e4df7 100644 (file)
--- a/src/runtime/mgcmark.go
+++ b/src/runtime/mgcmark.go
@@ -10,7 +10,7 @@ import (
        "internal/abi"
        "internal/goarch"
        "internal/goexperiment"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/mgcpacer.go b/src/runtime/mgcpacer.go
index e9af3d60cdc2586ddb558e1572b0865188ef7b3c..cda87fe94844838bea217d6d99ca1bd776877282 100644 (file)
--- a/src/runtime/mgcpacer.go
+++ b/src/runtime/mgcpacer.go
@@ -7,7 +7,7 @@ package runtime
 import (
        "internal/cpu"
        "internal/goexperiment"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        _ "unsafe" // for go:linkname
 )
 

diff --git a/src/runtime/mgcscavenge.go b/src/runtime/mgcscavenge.go
index 9c76f8dd23d1a60f999b232d68cf2bb34f2b9ce7..dede4a1ad317a757fbeaa7e4b1421617eee95ac2 100644 (file)
--- a/src/runtime/mgcscavenge.go
+++ b/src/runtime/mgcscavenge.go
@@ -92,7 +92,7 @@ package runtime
 
 import (
        "internal/goos"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/mgcscavenge_test.go b/src/runtime/mgcscavenge_test.go
index d7624d6d725581e8379622ea95e748f3e2d079cd..9c4cf1f27793a5d054836ea36c51a5efd80f9718 100644 (file)
--- a/src/runtime/mgcscavenge_test.go
+++ b/src/runtime/mgcscavenge_test.go
@@ -7,10 +7,10 @@ package runtime_test
 import (
        "fmt"
        "internal/goos"
+       "internal/runtime/atomic"
        "math"
        "math/rand"
        . "runtime"
-       "runtime/internal/atomic"
        "testing"
        "time"
 )

diff --git a/src/runtime/mgcsweep.go b/src/runtime/mgcsweep.go
index 3dbe9bcec72fb16b62e980cc5043f1b32426eb8d..bd53ed1fe110800d17f023aac0ab3dbf15408e07 100644 (file)
--- a/src/runtime/mgcsweep.go
+++ b/src/runtime/mgcsweep.go
@@ -27,7 +27,7 @@ package runtime
 import (
        "internal/abi"
        "internal/goexperiment"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/mgcwork.go b/src/runtime/mgcwork.go
index 7ab89754d42a2668964159d4e1ad05252ff64bd6..b91a6bd464d7d523830ca4f7babef7ac508aeeb4 100644 (file)
--- a/src/runtime/mgcwork.go
+++ b/src/runtime/mgcwork.go
@@ -6,7 +6,7 @@ package runtime
 
 import (
        "internal/goarch"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/mheap.go b/src/runtime/mheap.go
index 00693283467b4e6dae5dcae047b588243f67e754..0d8f9d5ddde9dd4d766fae9179856a0610e25009 100644 (file)
--- a/src/runtime/mheap.go
+++ b/src/runtime/mheap.go
@@ -12,7 +12,7 @@ import (
        "internal/cpu"
        "internal/goarch"
        "internal/goexperiment"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/mpagealloc.go b/src/runtime/mpagealloc.go
index 7c117b0a9b3f8f809980276a86cfb71392740226..46d3ebacaf8af73ff1ffe82a77b20bd8542da2bc 100644 (file)
--- a/src/runtime/mpagealloc.go
+++ b/src/runtime/mpagealloc.go
@@ -48,7 +48,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/mprof.go b/src/runtime/mprof.go
index c0836afa8bc3434db655f78f095632a6a583eb6d..87eed8d1ddba5fcd4c71708d4e6c3276b6897897 100644 (file)
--- a/src/runtime/mprof.go
+++ b/src/runtime/mprof.go
@@ -9,7 +9,7 @@ package runtime
 
 import (
        "internal/abi"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/mranges.go b/src/runtime/mranges.go
index 6dd1a752473220f0221ddb74ca509aff234fab0e..85795a941884602cdabb30de44e2b7b301e09481 100644 (file)
--- a/src/runtime/mranges.go
+++ b/src/runtime/mranges.go
@@ -11,7 +11,7 @@ package runtime
 
 import (
        "internal/goarch"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/mspanset.go b/src/runtime/mspanset.go
index 5687627e3a20bd951d6f9db7e65ff0a0cf84bfde..3aa2b5b3937f0a7cf5b76a80c544925ac94f4927 100644 (file)
--- a/src/runtime/mspanset.go
+++ b/src/runtime/mspanset.go
@@ -7,7 +7,7 @@ package runtime
 import (
        "internal/cpu"
        "internal/goarch"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/mstats.go b/src/runtime/mstats.go
index 87afec47c8680bd158d50ca793caf90a26cd19c3..1b634bd81e607faaa5297b41212330321772daa5 100644 (file)
--- a/src/runtime/mstats.go
+++ b/src/runtime/mstats.go
@@ -7,7 +7,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/mwbbuf.go b/src/runtime/mwbbuf.go
index 7419bd291dbf2c70d54b3b5a054b4ec86a8d6579..b998d2b2bdf5f9a14ff3c0d053ba60ee316d56f1 100644 (file)
--- a/src/runtime/mwbbuf.go
+++ b/src/runtime/mwbbuf.go
@@ -24,7 +24,7 @@ package runtime
 
 import (
        "internal/goarch"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/netpoll.go b/src/runtime/netpoll.go
index 2c5c262c586eec97d779876b5e2bcadacc3005a6..6a73f709889d3278d315059ac7529f9f3f852d3b 100644 (file)
--- a/src/runtime/netpoll.go
+++ b/src/runtime/netpoll.go
@@ -7,7 +7,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/netpoll_aix.go b/src/runtime/netpoll_aix.go
index a34b4d8bcfba88301fa84407bc8956c6ee0e1953..2df5a57111455d588aa4c0bdf3bb6aeec5f105f4 100644 (file)
--- a/src/runtime/netpoll_aix.go
+++ b/src/runtime/netpoll_aix.go
@@ -5,7 +5,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/netpoll_epoll.go b/src/runtime/netpoll_epoll.go
index 63b42a00140ec7dc19e9681118dbd3c5bbdf2e01..ff6e0b5f89ccef5efea0293f9f7cdcf28324c2cd 100644 (file)
--- a/src/runtime/netpoll_epoll.go
+++ b/src/runtime/netpoll_epoll.go
@@ -7,8 +7,8 @@
 package runtime
 
 import (
+       "internal/runtime/atomic"
        "internal/runtime/syscall"
-       "runtime/internal/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/netpoll_kqueue.go b/src/runtime/netpoll_kqueue.go
index d774dce3034c1781fa657d82885642b370cb30e9..32c21a2b2bec0f43250df4b99e22cd0d9a268ae9 100644 (file)
--- a/src/runtime/netpoll_kqueue.go
+++ b/src/runtime/netpoll_kqueue.go
@@ -10,7 +10,7 @@ package runtime
 
 import (
        "internal/goarch"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/netpoll_solaris.go b/src/runtime/netpoll_solaris.go
index 41f145c86692eedc4b0a52fc9c81569d01201644..fddc29000b78643b50ccb7cb8ca35f321d21ef4f 100644 (file)
--- a/src/runtime/netpoll_solaris.go
+++ b/src/runtime/netpoll_solaris.go
@@ -6,7 +6,7 @@ package runtime
 
 import (
        "internal/goarch"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/netpoll_stub.go b/src/runtime/netpoll_stub.go
index d950661acf3dd12520ae8de3cf8080ac16aa5563..c1bda3fa8b0d6690c25cde71080eed879717fe0f 100644 (file)
--- a/src/runtime/netpoll_stub.go
+++ b/src/runtime/netpoll_stub.go
@@ -6,7 +6,7 @@
 
 package runtime
 
-import "runtime/internal/atomic"
+import "internal/runtime/atomic"
 
 var netpollInited atomic.Uint32
 

diff --git a/src/runtime/netpoll_windows.go b/src/runtime/netpoll_windows.go
index b01f5ba725f77baefa5fa99b48c98bc501517d5d..3f704294972964c6258174d5e7adfadd4845a79d 100644 (file)
--- a/src/runtime/netpoll_windows.go
+++ b/src/runtime/netpoll_windows.go
@@ -6,7 +6,7 @@ package runtime
 
 import (
        "internal/goarch"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/os3_solaris.go b/src/runtime/os3_solaris.go
index 92daf13b1a2ddc8d8e0d07267f844dbfc9bbf268..cf163a6bf401f69fafe174febdc056c10bc3c8a4 100644 (file)
--- a/src/runtime/os3_solaris.go
+++ b/src/runtime/os3_solaris.go
@@ -7,7 +7,7 @@ package runtime
 import (
        "internal/abi"
        "internal/goarch"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/os_aix.go b/src/runtime/os_aix.go
index 3a5078a64c45c0f4ece5d6a1c3d75ab215679981..93464cb997f3bea818ec9a192153156d5b133e7a 100644 (file)
--- a/src/runtime/os_aix.go
+++ b/src/runtime/os_aix.go
@@ -8,7 +8,7 @@ package runtime
 
 import (
        "internal/abi"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/os_linux.go b/src/runtime/os_linux.go
index c4f503c8c92fbfc108bfa8c6f94781e0f5f62f2e..6ce656c70e146e57f870e3227dc7c7a1862d31f2 100644 (file)
--- a/src/runtime/os_linux.go
+++ b/src/runtime/os_linux.go
@@ -7,8 +7,8 @@ package runtime
 import (
        "internal/abi"
        "internal/goarch"
+       "internal/runtime/atomic"
        "internal/runtime/syscall"
-       "runtime/internal/atomic"
        "unsafe"
 )
 
@@ -402,9 +402,9 @@ func unminit() {
 func mdestroy(mp *m) {
 }
 
-//#ifdef GOARCH_386
-//#define sa_handler k_sa_handler
-//#endif
+// #ifdef GOARCH_386
+// #define sa_handler k_sa_handler
+// #endif
 
 func sigreturn__sigaction()
 func sigtramp() // Called via C ABI

diff --git a/src/runtime/os_netbsd.go b/src/runtime/os_netbsd.go
index 8abb688aae37ddb4af5d50fa6d87343214141b89..735ace25adb3b331e6202d7b1e6a8d9ee98e29c7 100644 (file)
--- a/src/runtime/os_netbsd.go
+++ b/src/runtime/os_netbsd.go
@@ -7,7 +7,7 @@ package runtime
 import (
        "internal/abi"
        "internal/goarch"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/os_openbsd.go b/src/runtime/os_openbsd.go
index 856979910a9fb0546b01e6146ffd179c92dc159c..9a21d6a8d0522851134ffbb1733a577960e8aaa1 100644 (file)
--- a/src/runtime/os_openbsd.go
+++ b/src/runtime/os_openbsd.go
@@ -6,7 +6,7 @@ package runtime
 
 import (
        "internal/abi"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/os_openbsd_syscall2.go b/src/runtime/os_openbsd_syscall2.go
index 0b796ade43a6d292c7a1b7925787c804e09500df..072f53320dc50a1f7a3d87a6b4f9090987996012 100644 (file)
--- a/src/runtime/os_openbsd_syscall2.go
+++ b/src/runtime/os_openbsd_syscall2.go
@@ -7,7 +7,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/os_plan9.go b/src/runtime/os_plan9.go
index 77446d09d3b51e9661774fea7e6d538949d0db0a..5e355f1664503718b2e9cef684208880cc659b33 100644 (file)
--- a/src/runtime/os_plan9.go
+++ b/src/runtime/os_plan9.go
@@ -6,7 +6,7 @@ package runtime
 
 import (
        "internal/abi"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/os_wasm.go b/src/runtime/os_wasm.go
index ce260de67e5c03f16fd1c6a34682a06d39e1f51b..fbafc319b988e6ac068783ba33fa57dda39d5a55 100644 (file)
--- a/src/runtime/os_wasm.go
+++ b/src/runtime/os_wasm.go
@@ -5,7 +5,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/os_windows.go b/src/runtime/os_windows.go
index 244ab23dad180ed20025661978da97738484055d..0074b9358abdd8a7befd8ef8941c1215e6c8453e 100644 (file)
--- a/src/runtime/os_windows.go
+++ b/src/runtime/os_windows.go
@@ -7,7 +7,7 @@ package runtime
 import (
        "internal/abi"
        "internal/goarch"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/panic.go b/src/runtime/panic.go
index 99eb1c3e23a25420bc5beb1d69ab9175d1d28f23..51b57520c1875e15c39f9120623179deaa7587a6 100644 (file)
--- a/src/runtime/panic.go
+++ b/src/runtime/panic.go
@@ -7,7 +7,7 @@ package runtime
 import (
        "internal/abi"
        "internal/goarch"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/pinner.go b/src/runtime/pinner.go
index 1ede1113eecfb3f26449deecf564983fa1953dc3..f9efe237c167aea0f17f97cf2cafd5afc2e28412 100644 (file)
--- a/src/runtime/pinner.go
+++ b/src/runtime/pinner.go
@@ -5,7 +5,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/proc.go b/src/runtime/proc.go
index 7f70100538910c9f664b1200e55a84a8b96f5bcd..3b7d4f4d5dbbd9bb039951b06c7f3410e1793341 100644 (file)
--- a/src/runtime/proc.go
+++ b/src/runtime/proc.go
@@ -10,7 +10,7 @@ import (
        "internal/goarch"
        "internal/goexperiment"
        "internal/goos"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )
@@ -5269,22 +5269,22 @@ func sigprof(pc, sp, lr uintptr, gp *g, mp *m) {
        }
 
        // On mips{,le}/arm, 64bit atomics are emulated with spinlocks, in
-       // runtime/internal/atomic. If SIGPROF arrives while the program is inside
+       // internal/runtime/atomic. If SIGPROF arrives while the program is inside
        // the critical section, it creates a deadlock (when writing the sample).
        // As a workaround, create a counter of SIGPROFs while in critical section
        // to store the count, and pass it to sigprof.add() later when SIGPROF is
        // received from somewhere else (with _LostSIGPROFDuringAtomic64 as pc).
        if GOARCH == "mips" || GOARCH == "mipsle" || GOARCH == "arm" {
                if f := findfunc(pc); f.valid() {
-                       if hasPrefix(funcname(f), "runtime/internal/atomic") {
+                       if hasPrefix(funcname(f), "internal/runtime/atomic") {
                                cpuprof.lostAtomic++
                                return
                        }
                }
                if GOARCH == "arm" && goarm < 7 && GOOS == "linux" && pc&0xffff0000 == 0xffff0000 {
-                       // runtime/internal/atomic functions call into kernel
+                       // internal/runtime/atomic functions call into kernel
                        // helpers on arm < 7. See
-                       // runtime/internal/atomic/sys_linux_arm.s.
+                       // internal/runtime/atomic/sys_linux_arm.s.
                        cpuprof.lostAtomic++
                        return
                }

diff --git a/src/runtime/profbuf.go b/src/runtime/profbuf.go
index 4be4bc9208ba4b80676246e8974a19f62d30fc8b..8ae626b1b08594f947d19f2e3ead4ff193bba9db 100644 (file)
--- a/src/runtime/profbuf.go
+++ b/src/runtime/profbuf.go
@@ -5,7 +5,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/runtime.go b/src/runtime/runtime.go
index 05a2098fcdb21ec88df4657e3ed43fe7770d2127..cc6f03d2a086dfd76b80563a0f8c3646247cd55a 100644 (file)
--- a/src/runtime/runtime.go
+++ b/src/runtime/runtime.go
@@ -5,7 +5,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/runtime1.go b/src/runtime/runtime1.go
index 8c8b20aa57a0d05e7998ece86a7abfe0dc46539d..48603da60000a7a0d28de2bb7ac593940bc629ac 100644 (file)
--- a/src/runtime/runtime1.go
+++ b/src/runtime/runtime1.go
@@ -7,7 +7,7 @@ package runtime
 import (
        "internal/bytealg"
        "internal/goarch"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/runtime2.go b/src/runtime/runtime2.go
index c03e7050a2e3dc9da82589aaacbff8e93f5470b8..4a7ad271726d8fecbca1339742e52785dfd802c1 100644 (file)
--- a/src/runtime/runtime2.go
+++ b/src/runtime/runtime2.go
@@ -8,7 +8,7 @@ import (
        "internal/abi"
        "internal/chacha8rand"
        "internal/goarch"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/rwmutex.go b/src/runtime/rwmutex.go
index bf3b9a1caeae5f92928035123184cd5bb67e8579..5833d5957661b410ea89325cd4851e701f1b4f76 100644 (file)
--- a/src/runtime/rwmutex.go
+++ b/src/runtime/rwmutex.go
@@ -5,7 +5,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
 )
 
 // This is a copy of sync/rwmutex.go rewritten to work in the runtime.

diff --git a/src/runtime/sema.go b/src/runtime/sema.go
index c87fc7658e9a831d830aed765080be99d9a58add..f86a19f705a3ce30462eb57a7335c0fd51b9568f 100644 (file)
--- a/src/runtime/sema.go
+++ b/src/runtime/sema.go
@@ -21,7 +21,7 @@ package runtime
 
 import (
        "internal/cpu"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/signal_unix.go b/src/runtime/signal_unix.go
index 84391d58ed7f22404ee33ba8ecf9174b513f8890..6ca87561e8ad01c54f30e04774e5729c7455a074 100644 (file)
--- a/src/runtime/signal_unix.go
+++ b/src/runtime/signal_unix.go
@@ -8,7 +8,7 @@ package runtime
 
 import (
        "internal/abi"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/sigqueue.go b/src/runtime/sigqueue.go
index 51e424d55b645f6877a40f63170f9f61bd2f069d..62a8e8a70226feebd85b2c675bac8f7cda033f8c 100644 (file)
--- a/src/runtime/sigqueue.go
+++ b/src/runtime/sigqueue.go
@@ -33,7 +33,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        _ "unsafe" // for go:linkname
 )
 

diff --git a/src/runtime/stack.go b/src/runtime/stack.go
index 61cd0a0fddd6dbebd45b60743c839537fd4ec2ac..8acc5e9f98b008bdeabeb389a03f7197ec989c09 100644 (file)
--- a/src/runtime/stack.go
+++ b/src/runtime/stack.go
@@ -9,7 +9,7 @@ import (
        "internal/cpu"
        "internal/goarch"
        "internal/goos"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/stubs2.go b/src/runtime/stubs2.go
index 9637347a35558950a405019f23d1a876878bd2fc..39bde15b1caa18093865ea1dc29e217344e47eaa 100644 (file)
--- a/src/runtime/stubs2.go
+++ b/src/runtime/stubs2.go
@@ -7,7 +7,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/symtab.go b/src/runtime/symtab.go
index 8b9977f42850b3e48605277f90891ae274989ced..bfe415360edae7d7bf709b71d4813f168994b4d0 100644 (file)
--- a/src/runtime/symtab.go
+++ b/src/runtime/symtab.go
@@ -7,7 +7,7 @@ package runtime
 import (
        "internal/abi"
        "internal/goarch"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/sys_darwin.go b/src/runtime/sys_darwin.go
index 45175d86632a38624eca6a5b0a3a3ea451218fdb..8e728b9d177cdceac5e63d53eadf383f91d299e0 100644 (file)
--- a/src/runtime/sys_darwin.go
+++ b/src/runtime/sys_darwin.go
@@ -6,7 +6,7 @@ package runtime
 
 import (
        "internal/abi"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/sys_openbsd2.go b/src/runtime/sys_openbsd2.go
index b38e49ee6f597f12e0a9860c892b3780f4cda702..8f5242018dd08a4b4eaa568159631f1092216e6e 100644 (file)
--- a/src/runtime/sys_openbsd2.go
+++ b/src/runtime/sys_openbsd2.go
@@ -8,7 +8,7 @@ package runtime
 
 import (
        "internal/abi"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/testdata/testprognet/waiters.go b/src/runtime/testdata/testprognet/waiters.go
index a65c40bfbecc43ffca10f2ce634e6834d78a4510..42d51ddbd4815ce284e2600e116c70ab8933688c 100644 (file)
--- a/src/runtime/testdata/testprognet/waiters.go
+++ b/src/runtime/testdata/testprognet/waiters.go
@@ -9,7 +9,7 @@ import (
        "io"
        "log"
        "net"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "sync"
        "time"
        _ "unsafe" // for go:linkname

diff --git a/src/runtime/time.go b/src/runtime/time.go
index 06a56bf7aedc2fb65e99f8d853d7ccbc21286e26..7846542a80a09d3b6bd5afc4626ca4baf96682be 100644 (file)
--- a/src/runtime/time.go
+++ b/src/runtime/time.go
@@ -8,7 +8,7 @@ package runtime
 
 import (
        "internal/abi"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/trace.go b/src/runtime/trace.go
index 8d7bf088dd93a9ed114bc4cdf536e72f345db2f2..c641e2ba9fd08698c337479e9b58b2b9cd9f9591 100644 (file)
--- a/src/runtime/trace.go
+++ b/src/runtime/trace.go
@@ -18,7 +18,7 @@ import (
        "internal/abi"
        "internal/goarch"
        "internal/goos"
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/trace2.go b/src/runtime/trace2.go
index 48f969129adfc371473a1f7036f51d196c9d7e50..a5ea9b4aa1c58ebdbe4123ecfdd88508c4462cd5 100644 (file)
--- a/src/runtime/trace2.go
+++ b/src/runtime/trace2.go
@@ -22,7 +22,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/trace2map.go b/src/runtime/trace2map.go
index 195ec0bbe729b8c1ba87a5702cefd117eaa1d94c..fc41d4f3c87b8cda5d2cbb0e0036915ea1c3a18c 100644 (file)
--- a/src/runtime/trace2map.go
+++ b/src/runtime/trace2map.go
@@ -18,7 +18,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "runtime/internal/sys"
        "unsafe"
 )

diff --git a/src/runtime/trace2runtime.go b/src/runtime/trace2runtime.go
index b391fd79ffeedc44d6fc1b00ac035d50cd65f9a1..3e55226f28d648330e3b9a141b7c3fd9493f004b 100644 (file)
--- a/src/runtime/trace2runtime.go
+++ b/src/runtime/trace2runtime.go
@@ -9,7 +9,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        _ "unsafe" // for go:linkname
 )
 

diff --git a/src/runtime/trace2status.go b/src/runtime/trace2status.go
index 5016e086560a3f93904d091d95fa7b5ea7d1416d..34f2e4c06f85bd8d275ba76502a29e0c0373c36e 100644 (file)
--- a/src/runtime/trace2status.go
+++ b/src/runtime/trace2status.go
@@ -8,7 +8,7 @@
 
 package runtime
 
-import "runtime/internal/atomic"
+import "internal/runtime/atomic"
 
 // traceGoStatus is the status of a goroutine.
 //

diff --git a/src/runtime/traceback.go b/src/runtime/traceback.go
index bfdf70af9ad14540557b13a5257f85f93a9c745b..100662f2748707ae5869a8c1b6c64787e073f31b 100644 (file)
--- a/src/runtime/traceback.go
+++ b/src/runtime/traceback.go
@@ -182,8 +182,8 @@ func (u *unwinder) initAt(pc0, sp0, lr0 uintptr, gp *g, flags unwindFlags) {
                }
        }
 
-       // runtime/internal/atomic functions call into kernel helpers on
-       // arm < 7. See runtime/internal/atomic/sys_linux_arm.s.
+       // internal/runtime/atomic functions call into kernel helpers on
+       // arm < 7. See internal/runtime/atomic/sys_linux_arm.s.
        //
        // Start in the caller's frame.
        if GOARCH == "arm" && goarm < 7 && GOOS == "linux" && frame.pc&0xffff0000 == 0xffff0000 {

diff --git a/src/runtime/vdso_freebsd.go b/src/runtime/vdso_freebsd.go
index 0fe21cf647044689327ebcec71a80df8d8c16564..feecada03571393065d47cdef16c9c2e348e4e16 100644 (file)
--- a/src/runtime/vdso_freebsd.go
+++ b/src/runtime/vdso_freebsd.go
@@ -7,7 +7,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/runtime/vdso_freebsd_x86.go b/src/runtime/vdso_freebsd_x86.go
index 66d1c654885ab8616d5d94b925599a816e35f6a4..7ac09cb9f19bee43d67c4499620caa8df57774e0 100644 (file)
--- a/src/runtime/vdso_freebsd_x86.go
+++ b/src/runtime/vdso_freebsd_x86.go
@@ -7,7 +7,7 @@
 package runtime
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )
 

diff --git a/src/sync/atomic/asm.s b/src/sync/atomic/asm.s
index 2022304665ef91bc98c71f11d6085cb3e32ef801..b9318fe8b76103e6238305908eb746023e74ccfb 100644 (file)
--- a/src/sync/atomic/asm.s
+++ b/src/sync/atomic/asm.s
@@ -7,79 +7,79 @@
 #include "textflag.h"
 
 TEXT ·SwapInt32(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Xchg(SB)
+       JMP     internal∕runtime∕atomic·Xchg(SB)
 
 TEXT ·SwapUint32(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Xchg(SB)
+       JMP     internal∕runtime∕atomic·Xchg(SB)
 
 TEXT ·SwapInt64(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Xchg64(SB)
+       JMP     internal∕runtime∕atomic·Xchg64(SB)
 
 TEXT ·SwapUint64(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Xchg64(SB)
+       JMP     internal∕runtime∕atomic·Xchg64(SB)
 
 TEXT ·SwapUintptr(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Xchguintptr(SB)
+       JMP     internal∕runtime∕atomic·Xchguintptr(SB)
 
 TEXT ·CompareAndSwapInt32(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Cas(SB)
+       JMP     internal∕runtime∕atomic·Cas(SB)
 
 TEXT ·CompareAndSwapUint32(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Cas(SB)
+       JMP     internal∕runtime∕atomic·Cas(SB)
 
 TEXT ·CompareAndSwapUintptr(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Casuintptr(SB)
+       JMP     internal∕runtime∕atomic·Casuintptr(SB)
 
 TEXT ·CompareAndSwapInt64(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Cas64(SB)
+       JMP     internal∕runtime∕atomic·Cas64(SB)
 
 TEXT ·CompareAndSwapUint64(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Cas64(SB)
+       JMP     internal∕runtime∕atomic·Cas64(SB)
 
 TEXT ·AddInt32(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Xadd(SB)
+       JMP     internal∕runtime∕atomic·Xadd(SB)
 
 TEXT ·AddUint32(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Xadd(SB)
+       JMP     internal∕runtime∕atomic·Xadd(SB)
 
 TEXT ·AddUintptr(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Xadduintptr(SB)
+       JMP     internal∕runtime∕atomic·Xadduintptr(SB)
 
 TEXT ·AddInt64(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Xadd64(SB)
+       JMP     internal∕runtime∕atomic·Xadd64(SB)
 
 TEXT ·AddUint64(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Xadd64(SB)
+       JMP     internal∕runtime∕atomic·Xadd64(SB)
 
 TEXT ·LoadInt32(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Load(SB)
+       JMP     internal∕runtime∕atomic·Load(SB)
 
 TEXT ·LoadUint32(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Load(SB)
+       JMP     internal∕runtime∕atomic·Load(SB)
 
 TEXT ·LoadInt64(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Load64(SB)
+       JMP     internal∕runtime∕atomic·Load64(SB)
 
 TEXT ·LoadUint64(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Load64(SB)
+       JMP     internal∕runtime∕atomic·Load64(SB)
 
 TEXT ·LoadUintptr(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Loaduintptr(SB)
+       JMP     internal∕runtime∕atomic·Loaduintptr(SB)
 
 TEXT ·LoadPointer(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Loadp(SB)
+       JMP     internal∕runtime∕atomic·Loadp(SB)
 
 TEXT ·StoreInt32(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Store(SB)
+       JMP     internal∕runtime∕atomic·Store(SB)
 
 TEXT ·StoreUint32(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Store(SB)
+       JMP     internal∕runtime∕atomic·Store(SB)
 
 TEXT ·StoreInt64(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Store64(SB)
+       JMP     internal∕runtime∕atomic·Store64(SB)
 
 TEXT ·StoreUint64(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Store64(SB)
+       JMP     internal∕runtime∕atomic·Store64(SB)
 
 TEXT ·StoreUintptr(SB),NOSPLIT,$0
-       JMP     runtime∕internal∕atomic·Storeuintptr(SB)
+       JMP     internal∕runtime∕atomic·Storeuintptr(SB)

diff --git a/src/sync/pool.go b/src/sync/pool.go
index e0948499744b476ab6a1def0503364ca1bc335a5..9214bf6e34722aba7b2a077263227249c4187c50 100644 (file)
--- a/src/sync/pool.go
+++ b/src/sync/pool.go
@@ -295,12 +295,12 @@ func runtime_registerPoolCleanup(cleanup func())
 func runtime_procPin() int
 func runtime_procUnpin()
 
-// The below are implemented in runtime/internal/atomic and the
+// The below are implemented in internal/runtime/atomic and the
 // compiler also knows to intrinsify the symbol we linkname into this
 // package.
 
-//go:linkname runtime_LoadAcquintptr runtime/internal/atomic.LoadAcquintptr
+//go:linkname runtime_LoadAcquintptr internal/runtime/atomic.LoadAcquintptr
 func runtime_LoadAcquintptr(ptr *uintptr) uintptr
 
-//go:linkname runtime_StoreReluintptr runtime/internal/atomic.StoreReluintptr
+//go:linkname runtime_StoreReluintptr internal/runtime/atomic.StoreReluintptr
 func runtime_StoreReluintptr(ptr *uintptr, val uintptr) uintptr

diff --git a/test/escape_runtime_atomic.go b/test/escape_runtime_atomic.go
index 30d1d0c0c1d89dc572873f037b20a90dd32003c0..39fd13d62be5eab1406b0a48a5c901c756dfcc99 100644 (file)
--- a/test/escape_runtime_atomic.go
+++ b/test/escape_runtime_atomic.go
@@ -4,12 +4,12 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Test escape analysis for runtime/internal/atomic.
+// Test escape analysis for internal/runtime/atomic.
 
 package escape
 
 import (
-       "runtime/internal/atomic"
+       "internal/runtime/atomic"
        "unsafe"
 )