Skip to content

Commit

Permalink
runtime/internal/atomic: remove erroneous ABI wrappers
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
aclements committed Jun 6, 2019
1 parent 62c309c commit 8252165
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions src/runtime/internal/atomic/atomic_s390x.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8252165

Please sign in to comment.