diff options
| author | Austin Clements <austin@google.com> | 2019-06-06 17:23:19 -0400 |
|---|---|---|
| committer | Austin Clements <austin@google.com> | 2019-06-06 21:45:03 +0000 |
| commit | 82521659deafea2c03b9140662bb07f23c49a0c1 (patch) | |
| tree | 2123a808e67e72215c2e6182a4571e9d3002224c /src/runtime/internal | |
| parent | 62c309c54ccfdda4586a3ddb7e39b928a81ab04e (diff) | |
| download | go-82521659deafea2c03b9140662bb07f23c49a0c1.tar.gz go-82521659deafea2c03b9140662bb07f23c49a0c1.zip | |
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 <bcmills@google.com>
Diffstat (limited to 'src/runtime/internal')
| -rw-r--r-- | src/runtime/internal/atomic/atomic_s390x.go | 2 |
1 files changed, 0 insertions, 2 deletions
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 |