[dev.link] all: merge branch 'master' into dev.link

Clean merge.

Change-Id: Ib773b0bc00fd99d494f9331c3613bcc8285e48e3

diff --cc src/cmd/internal/goobj/objfile.go
Simple merge

diff --cc src/cmd/internal/obj/link.go
Simple merge

diff --cc src/cmd/link/internal/ld/data.go
Simple merge

diff --cc src/cmd/link/internal/ld/lib.go
Simple merge

diff --cc src/cmd/link/internal/ld/symtab.go
Simple merge

diff --cc src/cmd/link/internal/loader/loader.go
index ea9cd1bd2e22415f6f1e686aff622c41fafc1d09,43a0352e0bb4502bc2f245e31705aa77b59c4528..af51d9eb883b9d26ef155e279d3569637eaad86d
--- 1/src/cmd/link/internal/loader/loader.go
--- 2/src/cmd/link/internal/loader/loader.go
+++ b/src/cmd/link/internal/loader/loader.go
@@@ -328,10 -329,10 +329,10 @@@ func NewLoader(flags uint32, elfsetstri
        ldr := &Loader{
                start:                make(map[*oReader]Sym),
                objs:                 []objIdx{{}, {extReader, 0}}, // reserve index 0 for nil symbol, 1 for external symbols
 -              objSyms:              make([]objSym, 1, 100000),    // reserve index 0 for nil symbol
 +              objSyms:              make([]objSym, 1, 1),         // This will get overwritten later.
                extReader:            extReader,
                symsByName:           [2]map[string]Sym{make(map[string]Sym, 80000), make(map[string]Sym, 50000)}, // preallocate ~2MB for ABI0 and ~1MB for ABI1 symbols
-               objByPkg:             make(map[string]*oReader),
+               objByPkg:             make(map[string]uint32),
                outer:                make(map[Sym]Sym),
                sub:                  make(map[Sym]Sym),
                dynimplib:            make(map[Sym]string),

diff --cc src/runtime/runtime2.go
Simple merge

diff --cc src/runtime/symtab.go
Simple merge