mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
[dev.link] all: merge branch 'master' into dev.link
Bring in Than's fix of #35779. The only merge conflict is cmd/link/internal/loadelf/ldelf.go, with a modification-deletion conflict. Change-Id: Id2fcfd2094a31120966a6ea9c462b4ec76646b10
This commit is contained in:
commit
f7672d39ca
200 changed files with 3558 additions and 2028 deletions
|
|
@ -525,7 +525,7 @@ func Main(archInit func(*Arch)) {
|
|||
}
|
||||
types.FmtLeft = int(FmtLeft)
|
||||
types.FmtUnsigned = int(FmtUnsigned)
|
||||
types.FErr = FErr
|
||||
types.FErr = int(FErr)
|
||||
types.Ctxt = Ctxt
|
||||
|
||||
initUniverse()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue