diff options
| author | qiulaidongfeng <2645477756@qq.com> | 2024-01-06 07:12:43 +0000 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2024-01-22 16:17:48 +0000 |
| commit | 40fab294de5eb0ac7c071194a77b4ba2e5cfe5c1 (patch) | |
| tree | ee5b4bff259511e06be5067fe9ba4b0eca9a712b /src/cmd/link | |
| parent | a557f9dcd72f29a571088f6867b2c3f206df41e1 (diff) | |
| download | go-40fab294de5eb0ac7c071194a77b4ba2e5cfe5c1.tar.xz | |
cmd/link,runtime: merge minfunc const info internal/abi
For #59670
Change-Id: If2b05b1ba30b607b518577b0e11ba5a0b07999c5
GitHub-Last-Rev: a664aa18b5ef674dc2d05c1f7533e1974d265894
GitHub-Pull-Request: golang/go#64906
Reviewed-on: https://go-review.googlesource.com/c/go/+/553276
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Keith Randall <khr@google.com>
Auto-Submit: Keith Randall <khr@golang.org>
Reviewed-by: Cherry Mui <cherryyz@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Diffstat (limited to 'src/cmd/link')
| -rw-r--r-- | src/cmd/link/internal/ld/data.go | 7 | ||||
| -rw-r--r-- | src/cmd/link/internal/ld/lib.go | 4 | ||||
| -rw-r--r-- | src/cmd/link/internal/ld/pcln.go | 2 | ||||
| -rw-r--r-- | src/cmd/link/internal/wasm/asm.go | 5 |
4 files changed, 8 insertions, 10 deletions
diff --git a/src/cmd/link/internal/ld/data.go b/src/cmd/link/internal/ld/data.go index f4ea8407c8..896d773124 100644 --- a/src/cmd/link/internal/ld/data.go +++ b/src/cmd/link/internal/ld/data.go @@ -43,6 +43,7 @@ import ( "debug/elf" "encoding/binary" "fmt" + "internal/abi" "log" "os" "sort" @@ -2556,8 +2557,8 @@ func assignAddress(ctxt *Link, sect *sym.Section, n int, s loader.Sym, va uint64 sect.Align = align } - funcsize := uint64(MINFUNC) // spacing required for findfunctab - if ldr.SymSize(s) > MINFUNC { + funcsize := uint64(abi.MINFUNC) // spacing required for findfunctab + if ldr.SymSize(s) > abi.MINFUNC { funcsize = uint64(ldr.SymSize(s)) } @@ -2611,7 +2612,7 @@ func assignAddress(ctxt *Link, sect *sym.Section, n int, s loader.Sym, va uint64 // Assign its address directly in order to be the // first symbol of this new section. ntext.SetType(sym.STEXT) - ntext.SetSize(int64(MINFUNC)) + ntext.SetSize(int64(abi.MINFUNC)) ntext.SetOnList(true) ntext.SetAlign(sectAlign) ctxt.tramps = append(ctxt.tramps, ntext.Sym()) diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go index eab74dc328..0219beeb10 100644 --- a/src/cmd/link/internal/ld/lib.go +++ b/src/cmd/link/internal/ld/lib.go @@ -273,10 +273,6 @@ var ( symSize int32 ) -const ( - MINFUNC = 16 // minimum size for a function -) - // Symbol version of ABIInternal symbols. It is sym.SymVerABIInternal if ABI wrappers // are used, 0 otherwise. var abiInternalVer = sym.SymVerABIInternal diff --git a/src/cmd/link/internal/ld/pcln.go b/src/cmd/link/internal/ld/pcln.go index 5734b92507..170ebe5ebe 100644 --- a/src/cmd/link/internal/ld/pcln.go +++ b/src/cmd/link/internal/ld/pcln.go @@ -827,7 +827,7 @@ func expandGoroot(s string) string { } const ( - BUCKETSIZE = 256 * MINFUNC + BUCKETSIZE = 256 * abi.MINFUNC SUBBUCKETS = 16 SUBBUCKETSIZE = BUCKETSIZE / SUBBUCKETS NOIDX = 0x7fffffff diff --git a/src/cmd/link/internal/wasm/asm.go b/src/cmd/link/internal/wasm/asm.go index 413a809414..2f511b97c7 100644 --- a/src/cmd/link/internal/wasm/asm.go +++ b/src/cmd/link/internal/wasm/asm.go @@ -14,6 +14,7 @@ import ( "cmd/link/internal/sym" "encoding/binary" "fmt" + "internal/abi" "internal/buildcfg" "io" "regexp" @@ -154,8 +155,8 @@ func assignAddress(ldr *loader.Loader, sect *sym.Section, n int, s loader.Sym, v // However, there is no PC register, only PC_F and PC_B. PC_F denotes the function, // PC_B the resume point inside of that function. The entry of the function has PC_B = 0. ldr.SetSymSect(s, sect) - ldr.SetSymValue(s, int64(funcValueOffset+va/ld.MINFUNC)<<16) // va starts at zero - va += uint64(ld.MINFUNC) + ldr.SetSymValue(s, int64(funcValueOffset+va/abi.MINFUNC)<<16) // va starts at zero + va += uint64(abi.MINFUNC) return sect, n, va } |