diff options
| author | Austin Clements <austin@google.com> | 2023-04-20 16:10:15 +0000 |
|---|---|---|
| committer | Austin Clements <austin@google.com> | 2023-04-20 16:19:49 +0000 |
| commit | 466e6dae9570ac88ef15c5f1bda9a59d7253cfee (patch) | |
| tree | 916fcafde3a860e6c399a6342d4ac2c426113ef2 /src/cmd/internal/obj/wasm | |
| parent | d11ff3f08155b7614485d9b555e97f7a9555ede5 (diff) | |
| download | go-466e6dae9570ac88ef15c5f1bda9a59d7253cfee.tar.xz | |
Revert "internal/abi, runtime, cmd: merge StackSmall, StackBig consts into internal/abi"
This reverts commit CL 486379.
Submitted out of order and breaks bootstrap.
Change-Id: Ie20a61cc56efc79a365841293ca4e7352b02d86b
Reviewed-on: https://go-review.googlesource.com/c/go/+/486917
TryBot-Bypass: Austin Clements <austin@google.com>
Reviewed-by: David Chase <drchase@google.com>
Diffstat (limited to 'src/cmd/internal/obj/wasm')
| -rw-r--r-- | src/cmd/internal/obj/wasm/wasmobj.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/cmd/internal/obj/wasm/wasmobj.go b/src/cmd/internal/obj/wasm/wasmobj.go index 83b9329f12..6bf49c602d 100644 --- a/src/cmd/internal/obj/wasm/wasmobj.go +++ b/src/cmd/internal/obj/wasm/wasmobj.go @@ -11,7 +11,6 @@ import ( "cmd/internal/sys" "encoding/binary" "fmt" - "internal/abi" "io" "math" ) @@ -473,7 +472,7 @@ func preprocess(ctxt *obj.Link, s *obj.LSym, newprog obj.ProgAlloc) { if needMoreStack { p := pMorestack - if framesize <= abi.StackSmall { + if framesize <= objabi.StackSmall { // small stack: SP <= stackguard // Get SP // Get g @@ -501,7 +500,7 @@ func preprocess(ctxt *obj.Link, s *obj.LSym, newprog obj.ProgAlloc) { p = appendp(p, AGet, regAddr(REGG)) p = appendp(p, AI32WrapI64) p = appendp(p, AI32Load, constAddr(2*int64(ctxt.Arch.PtrSize))) // G.stackguard0 - p = appendp(p, AI32Const, constAddr(framesize-abi.StackSmall)) + p = appendp(p, AI32Const, constAddr(framesize-objabi.StackSmall)) p = appendp(p, AI32Add) p = appendp(p, AI32LeU) } |