From: Austin Clements Date: Thu, 6 Jun 2019 21:23:19 +0000 (-0400) Subject: runtime/internal/atomic: remove erroneous ABI wrappers X-Git-Tag: go1.13beta1~121 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=82521659deafea2c03b9140662bb07f23c49a0c1;p=gostls13.git runtime/internal/atomic: remove erroneous ABI wrappers CL 179862 introduced go:linkname directives to create ABI wrappers for Store and Store64 on s390x, but a concurrent change (CL 180439) replaced the Go definitions of these functions with assembly definitions. This resulted in conflicting definitions for the ABI0 symbols, which led to a bootstrap linking failure. Fix this by removing the now-incorrect go:linkname directives for Store and Store64. This should fix the linux-s390x builders. Updates #31230. Change-Id: I8de8c03c23412fc217d428c0018cc56eb2f9996f Reviewed-on: https://go-review.googlesource.com/c/go/+/181078 Reviewed-by: Bryan C. Mills --- diff --git a/src/runtime/internal/atomic/atomic_s390x.go b/src/runtime/internal/atomic/atomic_s390x.go index f6758082a9..25fd890524 100644 --- a/src/runtime/internal/atomic/atomic_s390x.go +++ b/src/runtime/internal/atomic/atomic_s390x.go @@ -10,8 +10,6 @@ import "unsafe" //go:linkname Load //go:linkname Loadp //go:linkname Load64 -//go:linkname Store -//go:linkname Store64 //go:nosplit //go:noinline