]> Cypherpunks repositories - gostls13.git/commitdiff
[dev.link] all: merge branch 'master' into dev.link
authorCherry Zhang <cherryyz@google.com>
Fri, 25 Oct 2019 17:41:36 +0000 (13:41 -0400)
committerCherry Zhang <cherryyz@google.com>
Fri, 25 Oct 2019 17:41:36 +0000 (13:41 -0400)
The only conflict is in cmd/internal/obj/link.go and the
resolution is trivial.

Change-Id: Ic79b760865a972a0ab68291d06386531d012de86

1  2 
src/cmd/compile/internal/gc/main.go
src/cmd/compile/internal/gc/obj.go
src/cmd/go/alldocs.go
src/cmd/go/internal/work/build.go
src/cmd/go/internal/work/init.go
src/cmd/internal/obj/link.go
src/cmd/link/internal/ld/lib.go
src/cmd/link/internal/ld/pcln.go
src/cmd/link/internal/ld/symtab.go
src/runtime/runtime-gdb_test.go

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 2e94d5522529cfbf3bc24c3d805c3d1ea72f6660,468e9402eeb1d23d4960ebc9597e3b4a64eaf2f2..76c6f261a31f07803adda232b19c62801eb5dbe8
@@@ -409,12 -405,11 +409,13 @@@ type FuncInfo struct 
        dwarfAbsFnSym      *LSym
        dwarfDebugLinesSym *LSym
  
-       GCArgs       *LSym
-       GCLocals     *LSym
-       GCRegs       *LSym
-       StackObjects *LSym
+       GCArgs             *LSym
+       GCLocals           *LSym
+       GCRegs             *LSym
+       StackObjects       *LSym
+       OpenCodedDeferInfo *LSym
 +
 +      FuncInfoSym *LSym
  }
  
  type InlMark struct {
Simple merge
Simple merge
Simple merge
Simple merge