compiler, libgo: change mangling scheme

Overhaul the mangling scheme to avoid ambiguities if the package path
contains a dot. Instead of using dot both to separate components and
to mangle characters, use dot only to separate components and use
underscore to mangle characters.

For golang/go#41862

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/271726

1 files changed, 26 insertions, 26 deletions

diff --git a/libgo/go/sync/atomic/atomic.c b/libgo/go/sync/atomic/atomic.c
index 90a4ff3..71d51aa 100644
--- a/libgo/go/sync/atomic/atomic.c
+++ b/libgo/go/sync/atomic/atomic.c
@@ -9,7 +9,7 @@
 #include "runtime.h"
 
 int32_t SwapInt32 (int32_t *, int32_t)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.SwapInt32")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.SwapInt32")
   __attribute__ ((no_split_stack));
 
 int32_t
@@ -19,7 +19,7 @@ SwapInt32 (int32_t *addr, int32_t new)
 }
 
 int64_t SwapInt64 (int64_t *, int64_t)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.SwapInt64")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.SwapInt64")
   __attribute__ ((no_split_stack));
 
 int64_t
@@ -31,7 +31,7 @@ SwapInt64 (int64_t *addr, int64_t new)
 }
 
 uint32_t SwapUint32 (uint32_t *, uint32_t)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.SwapUint32")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.SwapUint32")
   __attribute__ ((no_split_stack));
 
 uint32_t
@@ -41,7 +41,7 @@ SwapUint32 (uint32_t *addr, uint32_t new)
 }
 
 uint64_t SwapUint64 (uint64_t *, uint64_t)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.SwapUint64")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.SwapUint64")
   __attribute__ ((no_split_stack));
 
 uint64_t
@@ -53,7 +53,7 @@ SwapUint64 (uint64_t *addr, uint64_t new)
 }
 
 uintptr_t SwapUintptr (uintptr_t *, uintptr_t)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.SwapUintptr")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.SwapUintptr")
   __attribute__ ((no_split_stack));
 
 uintptr_t
@@ -63,7 +63,7 @@ SwapUintptr (uintptr_t *addr, uintptr_t new)
 }
 
 _Bool CompareAndSwapInt32 (int32_t *, int32_t, int32_t)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.CompareAndSwapInt32")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.CompareAndSwapInt32")
   __attribute__ ((no_split_stack));
 
 _Bool
@@ -74,7 +74,7 @@ CompareAndSwapInt32 (int32_t *val, int32_t old, int32_t new)
 }
 
 _Bool CompareAndSwapInt64 (int64_t *, int64_t, int64_t)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.CompareAndSwapInt64")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.CompareAndSwapInt64")
   __attribute__ ((no_split_stack));
 
 _Bool
@@ -87,7 +87,7 @@ CompareAndSwapInt64 (int64_t *val, int64_t old, int64_t new)
 }
 
 _Bool CompareAndSwapUint32 (uint32_t *, uint32_t, uint32_t)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.CompareAndSwapUint32")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.CompareAndSwapUint32")
   __attribute__ ((no_split_stack));
 
 _Bool
@@ -98,7 +98,7 @@ CompareAndSwapUint32 (uint32_t *val, uint32_t old, uint32_t new)
 }
 
 _Bool CompareAndSwapUint64 (uint64_t *, uint64_t, uint64_t)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.CompareAndSwapUint64")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.CompareAndSwapUint64")
   __attribute__ ((no_split_stack));
 
 _Bool
@@ -111,7 +111,7 @@ CompareAndSwapUint64 (uint64_t *val, uint64_t old, uint64_t new)
 }
 
 _Bool CompareAndSwapUintptr (uintptr_t *, uintptr_t, uintptr_t)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.CompareAndSwapUintptr")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.CompareAndSwapUintptr")
   __attribute__ ((no_split_stack));
 
 _Bool
@@ -122,7 +122,7 @@ CompareAndSwapUintptr (uintptr_t *val, uintptr_t old, uintptr_t new)
 }
 
 int32_t AddInt32 (int32_t *, int32_t)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.AddInt32")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.AddInt32")
   __attribute__ ((no_split_stack));
 
 int32_t
@@ -132,7 +132,7 @@ AddInt32 (int32_t *val, int32_t delta)
 }
 
 uint32_t AddUint32 (uint32_t *, uint32_t)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.AddUint32")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.AddUint32")
   __attribute__ ((no_split_stack));
 
 uint32_t
@@ -142,7 +142,7 @@ AddUint32 (uint32_t *val, uint32_t delta)
 }
 
 int64_t AddInt64 (int64_t *, int64_t)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.AddInt64")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.AddInt64")
   __attribute__ ((no_split_stack));
 
 int64_t
@@ -154,7 +154,7 @@ AddInt64 (int64_t *val, int64_t delta)
 }
 
 uint64_t AddUint64 (uint64_t *, uint64_t)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.AddUint64")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.AddUint64")
   __attribute__ ((no_split_stack));
 
 uint64_t
@@ -166,7 +166,7 @@ AddUint64 (uint64_t *val, uint64_t delta)
 }
 
 uintptr_t AddUintptr (uintptr_t *, uintptr_t)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.AddUintptr")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.AddUintptr")
   __attribute__ ((no_split_stack));
 
 uintptr_t
@@ -176,7 +176,7 @@ AddUintptr (uintptr_t *val, uintptr_t delta)
 }
 
 int32_t LoadInt32 (int32_t *addr)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.LoadInt32")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.LoadInt32")
   __attribute__ ((no_split_stack));
 
 int32_t
@@ -186,7 +186,7 @@ LoadInt32 (int32_t *addr)
 }
 
 int64_t LoadInt64 (int64_t *addr)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.LoadInt64")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.LoadInt64")
   __attribute__ ((no_split_stack));
 
 int64_t
@@ -198,7 +198,7 @@ LoadInt64 (int64_t *addr)
 }
 
 uint32_t LoadUint32 (uint32_t *addr)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.LoadUint32")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.LoadUint32")
   __attribute__ ((no_split_stack));
 
 uint32_t
@@ -208,7 +208,7 @@ LoadUint32 (uint32_t *addr)
 }
 
 uint64_t LoadUint64 (uint64_t *addr)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.LoadUint64")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.LoadUint64")
   __attribute__ ((no_split_stack));
 
 uint64_t
@@ -220,7 +220,7 @@ LoadUint64 (uint64_t *addr)
 }
 
 uintptr_t LoadUintptr (uintptr_t *addr)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.LoadUintptr")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.LoadUintptr")
   __attribute__ ((no_split_stack));
 
 uintptr_t
@@ -230,7 +230,7 @@ LoadUintptr (uintptr_t *addr)
 }
 
 void *LoadPointer (void **addr)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.LoadPointer")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.LoadPointer")
   __attribute__ ((no_split_stack));
 
 void *
@@ -240,7 +240,7 @@ LoadPointer (void **addr)
 }
 
 void StoreInt32 (int32_t *addr, int32_t val)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.StoreInt32")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.StoreInt32")
   __attribute__ ((no_split_stack));
 
 void
@@ -250,7 +250,7 @@ StoreInt32 (int32_t *addr, int32_t val)
 }
 
 void StoreInt64 (int64_t *addr, int64_t val)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.StoreInt64")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.StoreInt64")
   __attribute__ ((no_split_stack));
 
 void
@@ -262,7 +262,7 @@ StoreInt64 (int64_t *addr, int64_t val)
 }
 
 void StoreUint32 (uint32_t *addr, uint32_t val)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.StoreUint32")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.StoreUint32")
   __attribute__ ((no_split_stack));
 
 void
@@ -272,7 +272,7 @@ StoreUint32 (uint32_t *addr, uint32_t val)
 }
 
 void StoreUint64 (uint64_t *addr, uint64_t val)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.StoreUint64")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.StoreUint64")
   __attribute__ ((no_split_stack));
 
 void
@@ -284,7 +284,7 @@ StoreUint64 (uint64_t *addr, uint64_t val)
 }
 
 void StoreUintptr (uintptr_t *addr, uintptr_t val)
-  __asm__ (GOSYM_PREFIX "sync..z2fatomic.StoreUintptr")
+  __asm__ (GOSYM_PREFIX "sync_1atomic.StoreUintptr")
   __attribute__ ((no_split_stack));
 
 void