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

Fixed a couple of minor conflicts in lib.go and deadcode.go
relating to debug logging.

Change-Id: I58335fc42ab1f1f3409fd8354da4f26419e8fb22

diff --cc src/cmd/dist/test.go
Simple merge

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

diff --cc src/cmd/link/internal/ld/deadcode.go
index 1ff34fec5f1afe195ab394dc51e9cbfe852588de,0bc6cc457a4043be94eae9f497c3c4a29397a0bf..e79207e2b830ef6fe10ed7e8f9313686fea9a529
--- 1/src/cmd/link/internal/ld/deadcode.go
--- 2/src/cmd/link/internal/ld/deadcode.go
+++ b/src/cmd/link/internal/ld/deadcode.go
@@@ -46,15 -46,6 +46,15 @@@ import 
  //
  // Any unreached text symbols are removed from ctxt.Textp.
  func deadcode(ctxt *Link) {
-               ctxt.Logf("%5.2f deadcode\n", Cputime())
 +      if ctxt.Debugvlog != 0 {
++              ctxt.Logf("deadcode\n")
 +      }
 +
 +      if *flagNewobj {
 +              deadcode2(ctxt)
 +              return
 +      }
 +
        d := &deadcodepass{
                ctxt:        ctxt,
                ifaceMethod: make(map[methodsig]bool),

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

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

diff --cc src/cmd/link/internal/ld/lib.go
index 811dd0f9efb81aa0fb09e95a62f854a74cbe067b,9d99aa6f28b895ced9baebd24186b372480f0b09..a0f85b85c7d20285c25e454b7c9f2642d00c09b6
--- 1/src/cmd/link/internal/ld/lib.go
--- 2/src/cmd/link/internal/ld/lib.go
+++ b/src/cmd/link/internal/ld/lib.go
@@@ -434,16 -453,7 +434,16 @@@ func (ctxt *Link) loadlib() 
                }
        }
  
 -      if ctxt.LinkMode == LinkInternal {
 +      for _, lib := range ctxt.Library {
 +              if lib.Shlib != "" {
 +                      if ctxt.Debugvlog > 1 {
-                               ctxt.Logf("%5.2f autolib: %s (from %s)\n", Cputime(), lib.Shlib, lib.Objref)
++                              ctxt.Logf("autolib: %s (from %s)\n", lib.Shlib, lib.Objref)
 +                      }
 +                      ldshlibsyms(ctxt, lib.Shlib)
 +              }
 +      }
 +
 +      if ctxt.LinkMode == LinkInternal && len(hostobj) != 0 {
                // Drop all the cgo_import_static declarations.
                // Turns out we won't be needing them.
                for _, s := range ctxt.Syms.Allsym {
@@@ -2396,10 -2368,12 +2411,15 @@@ func genasmsym(ctxt *Link, put func(*Li
                        }
                        put(ctxt, s, s.Name, BSSSym, Symaddr(s), s.Gotype)
  
+               case sym.SUNDEFEXT:
+                       if ctxt.HeadType == objabi.Hwindows || ctxt.HeadType == objabi.Haix || ctxt.IsELF {
+                               put(ctxt, s, s.Name, UndefinedSym, s.Value, nil)
+                       }
+ 
                case sym.SHOSTOBJ:
 +                      if !s.Attr.Reachable() {
 +                              continue
 +                      }
                        if ctxt.HeadType == objabi.Hwindows || ctxt.IsELF {
                                put(ctxt, s, s.Name, UndefinedSym, s.Value, nil)
                        }

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

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

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

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

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

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

diff --cc src/cmd/nm/nm_cgo_test.go
Simple merge

diff --cc src/runtime/internal/atomic/sys_linux_arm.s
Simple merge