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

Clean merge.

Change-Id: I2ae070c60c011779a0f0a1344f5b6d45ef10d8a1

diff --cc src/cmd/compile/internal/gc/iexport.go
Simple merge

diff --cc src/cmd/compile/internal/gc/iimport.go
Simple merge

diff --cc src/cmd/compile/internal/gc/main.go
Simple merge

diff --cc src/cmd/link/internal/ld/pe.go
index 5b66deeba2c37924234e394106c973f3eccdfe1f,f77513239311b77108e1f66ec01c0c85b7af0bf5..fdfb9962e524d11a8fa6c2b995b44ec37ea49f66
--- 1/src/cmd/link/internal/ld/pe.go
--- 2/src/cmd/link/internal/ld/pe.go
+++ b/src/cmd/link/internal/ld/pe.go
@@@ -1524,13 -1486,13 +1492,13 @@@ func addpersrc(ctxt *Link) 
                p[3] = byte(val >> 24)
        }
  
 -      ctxt.Out.Write(rsrcsym.P)
 -      h.pad(ctxt.Out, uint32(rsrcsym.Size))
 +      ctxt.Out.Write(data)
 +      h.pad(ctxt.Out, uint32(size))
  
        // update data directory
-       pefile.dataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = h.virtualAddress
+       pefile.dataDirectory[pe.IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = h.virtualAddress
  
-       pefile.dataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = h.virtualSize
+       pefile.dataDirectory[pe.IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = h.virtualSize
  }
  
  func Asmbpe(ctxt *Link) {