The only conflict is in cmd/internal/obj/link.go and the
resolution is trivial.
Change-Id: Ic79b760865a972a0ab68291d06386531d012de86
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 {