Commit 6b6eb230 authored by Cherry Zhang's avatar Cherry Zhang
Browse files

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

The only conflict is a modify-deletion conflict in
cmd/link/internal/ld/link.go, where the old error reporter is
deleted in the new linker. Ported to
cmd/link/internal/ld/errors.go.

Change-Id: I5c78f398ea95bc1d7e6579c84dd8252c9f2196b7
parents d92a5a80 aa4d92b8
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment