diff options
| author | Cherry Zhang <cherryyz@google.com> | 2020-01-31 14:45:52 -0500 |
|---|---|---|
| committer | Cherry Zhang <cherryyz@google.com> | 2020-01-31 14:45:52 -0500 |
| commit | ee04d45b8f380c2e3b3b26bc4771cd97fbd9d260 (patch) | |
| tree | 5db2e0ca22bb7d54f7c6d8a8d4acc96224b2e85c /src/cmd/link/internal/ld/deadcode2.go | |
| parent | 23c96e9bbd29e3a815e6faabbc40af0d4c4d4353 (diff) | |
| parent | 96002cd25c343edfb6c06d2bf1f31ae1e345b81f (diff) | |
| download | go-ee04d45b8f380c2e3b3b26bc4771cd97fbd9d260.tar.xz | |
[dev.link] all: merge branch 'master' into dev.link
It has been a while we have not done this.
Merge conflict resolution:
- deleted/rewritten code modified on master
- CL 214286, ported in CL 217317
(cmd/internal/obj/objfile.go)
- CL 210678, it already includes a fix to new code
(cmd/link/internal/ld/deadcode.go)
- CL 209317, applied in this CL
(cmd/link/internal/loadelf/ldelf.go)
Change-Id: Ie927ea6a1d69ce49e8d03e56148cb2725e377876
Diffstat (limited to 'src/cmd/link/internal/ld/deadcode2.go')
| -rw-r--r-- | src/cmd/link/internal/ld/deadcode2.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmd/link/internal/ld/deadcode2.go b/src/cmd/link/internal/ld/deadcode2.go index 915ad1d944..3d3a03215e 100644 --- a/src/cmd/link/internal/ld/deadcode2.go +++ b/src/cmd/link/internal/ld/deadcode2.go @@ -113,7 +113,7 @@ func (d *deadcodePass2) init() { } for _, name := range names { - // Mark symbol as an data/ABI0 symbol. + // Mark symbol as a data/ABI0 symbol. d.mark(d.ldr.Lookup(name, 0), 0) // Also mark any Go functions (internal ABI). d.mark(d.ldr.Lookup(name, sym.SymVerABIInternal), 0) |