From 4c2b1e0feb3d3112da94fa4cd11ebe995003fa89 Mon Sep 17 00:00:00 2001 From: Andy Pan Date: Thu, 1 Feb 2024 10:21:14 +0800 Subject: 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 Reviewed-by: Michael Pratt LUCI-TryBot-Result: Go LUCI Reviewed-by: Ibrahim Bazoka Auto-Submit: Emmanuel Odeke --- src/sync/atomic/asm.s | 52 +++++++++++++++++++++++++-------------------------- src/sync/pool.go | 6 +++--- 2 files changed, 29 insertions(+), 29 deletions(-) (limited to 'src/sync') diff --git a/src/sync/atomic/asm.s b/src/sync/atomic/asm.s index 2022304665..b9318fe8b7 100644 --- 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 e094849974..9214bf6e34 100644 --- 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 -- cgit v1.3