From: Cherry Zhang <cherryyz@google.com>
Date: Fri, 13 Mar 2020 18:45:05 +0000 (-0400)
Subject: [dev.link] all: merge branch 'master' into dev.link
X-Git-Tag: go1.15beta1~679^2~70
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=440852c464a38036c9898dcdf22d57851a58331f;p=gostls13.git

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

Clean merge.

Change-Id: I2ae070c60c011779a0f0a1344f5b6d45ef10d8a1
---

440852c464a38036c9898dcdf22d57851a58331f
diff --cc src/cmd/link/internal/ld/pe.go
index 5b66deeba2,f775132393..fdfb9962e5
--- a/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) {