<div><div dir="auto">Looks good but please delete 1.12 along as well </div></div><div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Oct 24, 2019 at 9:39 PM Alexander Kube <<a href="mailto:alexander.j.kube@gmail.com">alexander.j.kube@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Alex Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
<br>
Signed-off-by: Alex Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
---<br>
...ow-CC-and-CXX-to-have-multiple-words.patch | 38 +++<br>
...ent-based-hash-generation-less-pedan.patch | 226 ++++++++++++++<br>
...-to-be-overridden-in-the-environment.patch | 54 ++++<br>
...4-ld-add-soname-to-shareable-objects.patch | 50 ++++<br>
...de-CC-when-building-dist-and-go_boot.patch | 44 +++<br>
...dist-separate-host-and-target-builds.patch | 279 ++++++++++++++++++<br>
...d-go-make-GOROOT-precious-by-default.patch | 113 +++++++<br>
...008-use-GOBUILDMODE-to-set-buildmode.patch | 47 +++<br>
...place-glibc-dynamic-linker-with-musl.patch | 134 +++++++++<br>
9 files changed, 985 insertions(+)<br>
create mode 100644 meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch<br>
create mode 100644 meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch<br>
create mode 100644 meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch<br>
create mode 100644 meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch<br>
create mode 100644 meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch<br>
create mode 100644 meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch<br>
create mode 100644 meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch<br>
create mode 100644 meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch<br>
create mode 100644 meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch<br>
<br>
diff --git a/meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch b/meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch<br>
new file mode 100644<br>
index 0000000000..ddfd5e41d1<br>
--- /dev/null<br>
+++ b/meta/recipes-devtools/go/go-1.13/0001-allow-CC-and-CXX-to-have-multiple-words.patch<br>
@@ -0,0 +1,38 @@<br>
+From 9e3dc44cdfa58d96504d0a789dc82617dd5bef55 Mon Sep 17 00:00:00 2001<br>
+From: Alex Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
+Date: Wed, 23 Oct 2019 21:01:13 +0430<br>
+Subject: [PATCH 1/9] cmd/go: Allow CC and CXX to have multiple words<br>
+<br>
+Upstream-Status: Inappropriate [OE specific]<br>
+<br>
+Adapted to Go 1.13 from patches originally submitted to<br>
+the meta/recipes-devtools/go tree by<br>
+Matt Madison <matt@madison.systems>.<br>
+<br>
+Signed-off-by: Alexander J Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
+<br>
+---<br>
+ src/cmd/go/internal/envcmd/env.go | 4 ++--<br>
+ 1 file changed, 2 insertions(+), 2 deletions(-)<br>
+<br>
+diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go<br>
+index 17852de..7b5ec5e 100644<br>
+--- a/src/cmd/go/internal/envcmd/env.go<br>
++++ b/src/cmd/go/internal/envcmd/env.go<br>
+@@ -100,11 +100,11 @@ func MkEnv() []cfg.EnvVar {<br>
+ <br>
+ cc := cfg.DefaultCC(cfg.Goos, cfg.Goarch)<br>
+ if env := strings.Fields(cfg.Getenv("CC")); len(env) > 0 {<br>
+- cc = env[0]<br>
++ cc = strings.Join(env, " ")<br>
+ }<br>
+ cxx := cfg.DefaultCXX(cfg.Goos, cfg.Goarch)<br>
+ if env := strings.Fields(cfg.Getenv("CXX")); len(env) > 0 {<br>
+- cxx = env[0]<br>
++ cxx = strings.Join(env, " ")<br>
+ }<br>
+ env = append(env, cfg.EnvVar{Name: "AR", Value: envOr("AR", "ar")})<br>
+ env = append(env, cfg.EnvVar{Name: "CC", Value: cc})<br>
+-- <br>
+2.17.1 (Apple Git-112)<br>
+<br>
diff --git a/meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch b/meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch<br>
new file mode 100644<br>
index 0000000000..4eddd39809<br>
--- /dev/null<br>
+++ b/meta/recipes-devtools/go/go-1.13/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch<br>
@@ -0,0 +1,226 @@<br>
+From a13ae484e41139094505d2834437e9262a5315f7 Mon Sep 17 00:00:00 2001<br>
+From: Alex Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
+Date: Wed, 23 Oct 2019 21:14:22 +0430<br>
+Subject: [PATCH 2/9] cmd/go: make content-based hash generation less pedantic<br>
+<br>
+Upstream-Status: Inappropriate [OE specific]<br>
+<br>
+Go 1.10's build tool now uses content-based hashes to<br>
+determine when something should be built or re-built.<br>
+This same mechanism is used to maintain a built-artifact<br>
+cache for speeding up builds.<br>
+<br>
+However, the hashes it generates include information that<br>
+doesn't work well with OE, nor with using a shared runtime<br>
+library.<br>
+<br>
+First, it embeds path names to source files, unless<br>
+building within GOROOT. This prevents the building<br>
+of a package in GOPATH for later staging into GOROOT.<br>
+<br>
+This patch adds support for the environment variable<br>
+GOPATH_OMIT_IN_ACTIONID. If present, path name<br>
+embedding is disabled.<br>
+<br>
+Second, if cgo is enabled, the build ID for cgo-related<br>
+packages will include the current value of the environment<br>
+variables for invoking the compiler (CC, CXX, FC) and<br>
+any CGO_xxFLAGS variables. Only if the settings used<br>
+during a compilation exactly match, character for character,<br>
+the values used for compiling runtime/cgo or any other<br>
+cgo-enabled package being imported, will the tool<br>
+decide that the imported package is up-to-date.<br>
+<br>
+This is done to help ensure correctness, but is overly<br>
+simplistic and effectively prevents the reuse of built<br>
+artifacts that use cgo (or shared runtime, which includes<br>
+runtime/cgo).<br>
+<br>
+This patch filters out all compiler flags except those<br>
+beginning with '-m'. The default behavior can be restored<br>
+by setting the CGO_PEDANTIC environment variable.<br>
+<br>
+Adapted to Go 1.13 from patches originally submitted to<br>
+the meta/recipes-devtools/go tree by<br>
+Matt Madison <matt@madison.systems>.<br>
+<br>
+Signed-off-by: Alexander J Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
+---<br>
+ src/cmd/go/internal/envcmd/env.go | 2 +-<br>
+ src/cmd/go/internal/work/exec.go | 66 ++++++++++++++++++++++---------<br>
+ 2 files changed, 49 insertions(+), 19 deletions(-)<br>
+<br>
+diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go<br>
+index 7b5ec5e..292f117 100644<br>
+--- a/src/cmd/go/internal/envcmd/env.go<br>
++++ b/src/cmd/go/internal/envcmd/env.go<br>
+@@ -154,7 +154,7 @@ func ExtraEnvVars() []cfg.EnvVar {<br>
+ func ExtraEnvVarsCostly() []cfg.EnvVar {<br>
+ var b work.Builder<br>
+ b.Init()<br>
+- cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{})<br>
++ cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{}, false)<br>
+ if err != nil {<br>
+ // Should not happen - b.CFlags was given an empty package.<br>
+ fmt.Fprintf(os.Stderr, "go: invalid cflags: %v\n", err)<br>
+diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go<br>
+index 7dd9a90..ccebaf8 100644<br>
+--- a/src/cmd/go/internal/work/exec.go<br>
++++ b/src/cmd/go/internal/work/exec.go<br>
+@@ -32,6 +32,8 @@ import (<br>
+ "time"<br>
+ )<br>
+ <br>
++var omitGopath = os.Getenv("GOPATH_OMIT_IN_ACTIONID") != ""<br>
++<br>
+ // actionList returns the list of actions in the dag rooted at root<br>
+ // as visited in a depth-first post-order traversal.<br>
+ func actionList(root *Action) []*Action {<br>
+@@ -205,7 +207,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID {<br>
+ // The compiler hides the exact value of $GOROOT<br>
+ // when building things in GOROOT.<br>
+ // Assume b.WorkDir is being trimmed properly.<br>
+- if !p.Goroot && !cfg.BuildTrimpath && !strings.HasPrefix(p.Dir, b.WorkDir) {<br>
++ if !p.Goroot && !omitGopath && !cfg.BuildTrimpath && !strings.HasPrefix(p.Dir, b.WorkDir) {<br>
+ fmt.Fprintf(h, "dir %s\n", p.Dir)<br>
+ }<br>
+ fmt.Fprintf(h, "goos %s goarch %s\n", cfg.Goos, cfg.Goarch)<br>
+@@ -219,13 +221,13 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID {<br>
+ }<br>
+ if len(p.CgoFiles)+len(p.SwigFiles) > 0 {<br>
+ fmt.Fprintf(h, "cgo %q\n", b.toolID("cgo"))<br>
+- cppflags, cflags, cxxflags, fflags, ldflags, _ := b.CFlags(p)<br>
+- fmt.Fprintf(h, "CC=%q %q %q %q\n", b.ccExe(), cppflags, cflags, ldflags)<br>
++ cppflags, cflags, cxxflags, fflags, ldflags, _ := b.CFlags(p, true)<br>
++ fmt.Fprintf(h, "CC=%q %q %q %q\n", b.ccExe(true), cppflags, cflags, ldflags)<br>
+ if len(p.CXXFiles)+len(p.SwigFiles) > 0 {<br>
+- fmt.Fprintf(h, "CXX=%q %q\n", b.cxxExe(), cxxflags)<br>
++ fmt.Fprintf(h, "CXX=%q %q\n", b.cxxExe(true), cxxflags)<br>
+ }<br>
+ if len(p.FFiles) > 0 {<br>
+- fmt.Fprintf(h, "FC=%q %q\n", b.fcExe(), fflags)<br>
++ fmt.Fprintf(h, "FC=%q %q\n", b.fcExe(true), fflags)<br>
+ }<br>
+ // TODO(rsc): Should we include the SWIG version or Fortran/GCC/G++/Objective-C compiler versions?<br>
+ }<br>
+@@ -2229,33 +2231,48 @@ var (<br>
+ // gccCmd returns a gcc command line prefix<br>
+ // defaultCC is defined in zdefaultcc.go, written by cmd/dist.<br>
+ func (b *Builder) GccCmd(incdir, workdir string) []string {<br>
+- return b.compilerCmd(b.ccExe(), incdir, workdir)<br>
++ return b.compilerCmd(b.ccExe(false), incdir, workdir)<br>
+ }<br>
+ <br>
+ // gxxCmd returns a g++ command line prefix<br>
+ // defaultCXX is defined in zdefaultcc.go, written by cmd/dist.<br>
+ func (b *Builder) GxxCmd(incdir, workdir string) []string {<br>
+- return b.compilerCmd(b.cxxExe(), incdir, workdir)<br>
++ return b.compilerCmd(b.cxxExe(false), incdir, workdir)<br>
+ }<br>
+ <br>
+ // gfortranCmd returns a gfortran command line prefix.<br>
+ func (b *Builder) gfortranCmd(incdir, workdir string) []string {<br>
+- return b.compilerCmd(b.fcExe(), incdir, workdir)<br>
++ return b.compilerCmd(b.fcExe(false), incdir, workdir)<br>
+ }<br>
+ <br>
+ // ccExe returns the CC compiler setting without all the extra flags we add implicitly.<br>
+-func (b *Builder) ccExe() []string {<br>
+- return b.compilerExe(origCC, cfg.DefaultCC(cfg.Goos, cfg.Goarch))<br>
++func (b *Builder) ccExe(filtered bool) []string {<br>
++ return b.compilerExe(origCC, cfg.DefaultCC(cfg.Goos, cfg.Goarch), filtered)<br>
+ }<br>
+ <br>
+ // cxxExe returns the CXX compiler setting without all the extra flags we add implicitly.<br>
+-func (b *Builder) cxxExe() []string {<br>
+- return b.compilerExe(origCXX, cfg.DefaultCXX(cfg.Goos, cfg.Goarch))<br>
++func (b *Builder) cxxExe(filtered bool) []string {<br>
++ return b.compilerExe(origCXX, cfg.DefaultCXX(cfg.Goos, cfg.Goarch), filtered)<br>
+ }<br>
+ <br>
+ // fcExe returns the FC compiler setting without all the extra flags we add implicitly.<br>
+-func (b *Builder) fcExe() []string {<br>
+- return b.compilerExe(cfg.Getenv("FC"), "gfortran")<br>
++func (b *Builder) fcExe(filtered bool) []string {<br>
++ return b.compilerExe(os.Getenv("FC"), "gfortran", filtered)<br>
++}<br>
++<br>
++var filterFlags = os.Getenv("CGO_PEDANTIC") == ""<br>
++<br>
++func filterCompilerFlags(flags []string) []string {<br>
++ var newflags []string<br>
++ if !filterFlags {<br>
++ return flags<br>
++ }<br>
++ for _, flag := range flags {<br>
++ if strings.HasPrefix(flag, "-m") {<br>
++ newflags = append(newflags, flag)<br>
++ }<br>
++ }<br>
++ return newflags<br>
+ }<br>
+ <br>
+ // compilerExe returns the compiler to use given an<br>
+@@ -2264,11 +2281,16 @@ func (b *Builder) fcExe() []string {<br>
+ // of the compiler but can have additional arguments if they<br>
+ // were present in the environment value.<br>
+ // For example if CC="gcc -DGOPHER" then the result is ["gcc", "-DGOPHER"].<br>
+-func (b *Builder) compilerExe(envValue string, def string) []string {<br>
++func (b *Builder) compilerExe(envValue string, def string, filtered bool) []string {<br>
+ compiler := strings.Fields(envValue)<br>
+ if len(compiler) == 0 {<br>
+ compiler = []string{def}<br>
+ }<br>
++<br>
++ if filtered {<br>
++ return append(compiler[0:1], filterCompilerFlags(compiler[1:])...)<br>
++ }<br>
++<br>
+ return compiler<br>
+ }<br>
+ <br>
+@@ -2429,7 +2451,7 @@ func envList(key, def string) []string {<br>
+ }<br>
+ <br>
+ // CFlags returns the flags to use when invoking the C, C++ or Fortran compilers, or cgo.<br>
+-func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, ldflags []string, err error) {<br>
++func (b *Builder) CFlags(p *load.Package, filtered bool) (cppflags, cflags, cxxflags, fflags, ldflags []string, err error) {<br>
+ defaults := "-g -O2"<br>
+ <br>
+ if cppflags, err = buildFlags("CPPFLAGS", "", p.CgoCPPFLAGS, checkCompilerFlags); err != nil {<br>
+@@ -2448,6 +2470,14 @@ func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, l<br>
+ return<br>
+ }<br>
+ <br>
++ if filtered {<br>
++ cppflags = filterCompilerFlags(cppflags)<br>
++ cflags = filterCompilerFlags(cflags)<br>
++ cxxflags = filterCompilerFlags(cxxflags)<br>
++ fflags = filterCompilerFlags(fflags)<br>
++ ldflags = filterCompilerFlags(ldflags)<br>
++ }<br>
++<br>
+ return<br>
+ }<br>
+ <br>
+@@ -2462,7 +2492,7 @@ var cgoRe = lazyregexp.New(`[/\\:]`)<br>
+ <br>
+ func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgofiles, gccfiles, gxxfiles, mfiles, ffiles []string) (outGo, outObj []string, err error) {<br>
+ p := a.Package<br>
+- cgoCPPFLAGS, cgoCFLAGS, cgoCXXFLAGS, cgoFFLAGS, cgoLDFLAGS, err := b.CFlags(p)<br>
++ cgoCPPFLAGS, cgoCFLAGS, cgoCXXFLAGS, cgoFFLAGS, cgoLDFLAGS, err := b.CFlags(p, false)<br>
+ if err != nil {<br>
+ return nil, nil, err<br>
+ }<br>
+@@ -2821,7 +2851,7 @@ func (b *Builder) swigIntSize(objdir string) (intsize string, err error) {<br>
+ <br>
+ // Run SWIG on one SWIG input file.<br>
+ func (b *Builder) swigOne(a *Action, p *load.Package, file, objdir string, pcCFLAGS []string, cxx bool, intgosize string) (outGo, outC string, err error) {<br>
+- cgoCPPFLAGS, cgoCFLAGS, cgoCXXFLAGS, _, _, err := b.CFlags(p)<br>
++ cgoCPPFLAGS, cgoCFLAGS, cgoCXXFLAGS, _, _, err := b.CFlags(p, false)<br>
+ if err != nil {<br>
+ return "", "", err<br>
+ }<br>
+-- <br>
+2.17.1 (Apple Git-112)<br>
+<br>
diff --git a/meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch b/meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch<br>
new file mode 100644<br>
index 0000000000..9aa0119ae9<br>
--- /dev/null<br>
+++ b/meta/recipes-devtools/go/go-1.13/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch<br>
@@ -0,0 +1,54 @@<br>
+From 28ada8896b76d620240bafc22aa395071d601482 Mon Sep 17 00:00:00 2001<br>
+From: Alex Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
+Date: Wed, 23 Oct 2019 21:15:37 +0430<br>
+Subject: [PATCH 3/9] cmd/go: Allow GOTOOLDIR to be overridden in the environment<br>
+<br>
+to allow for split host/target build roots<br>
+<br>
+Adapted to Go 1.13 from patches originally submitted to<br>
+the meta/recipes-devtools/go tree by<br>
+Matt Madison <matt@madison.systems>.<br>
+<br>
+Upstream-Status: Inappropriate [OE specific]<br>
+<br>
+Signed-off-by: Alexander J Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
+---<br>
+ src/cmd/dist/build.go | 4 +++-<br>
+ src/cmd/go/internal/cfg/cfg.go | 6 +++++-<br>
+ 2 files changed, 8 insertions(+), 2 deletions(-)<br>
+<br>
+diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go<br>
+index 9e50311..683ca6f 100644<br>
+--- a/src/cmd/dist/build.go<br>
++++ b/src/cmd/dist/build.go<br>
+@@ -244,7 +244,9 @@ func xinit() {<br>
+ workdir = xworkdir()<br>
+ xatexit(rmworkdir)<br>
+ <br>
+- tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch)<br>
++ if tooldir = os.Getenv("GOTOOLDIR"); tooldir == "" {<br>
++ tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch)<br>
++ }<br>
+ }<br>
+ <br>
+ // compilerEnv returns a map from "goos/goarch" to the<br>
+diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go<br>
+index a3277a6..db96350 100644<br>
+--- a/src/cmd/go/internal/cfg/cfg.go<br>
++++ b/src/cmd/go/internal/cfg/cfg.go<br>
+@@ -60,7 +60,11 @@ func defaultContext() build.Context {<br>
+ // variables. This matches the initialization of ToolDir in<br>
+ // go/build, except for using ctxt.GOROOT rather than<br>
+ // runtime.GOROOT.<br>
+- build.ToolDir = filepath.Join(ctxt.GOROOT, "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)<br>
++ if s := os.Getenv("GOTOOLDIR"); s != "" {<br>
++ build.ToolDir = filepath.Clean(s)<br>
++ } else {<br>
++ build.ToolDir = filepath.Join(ctxt.GOROOT, "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)<br>
++ }<br>
+ }<br>
+ <br>
+ ctxt.GOPATH = envOr("GOPATH", ctxt.GOPATH)<br>
+-- <br>
+2.17.1 (Apple Git-112)<br>
+<br>
diff --git a/meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch b/meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch<br>
new file mode 100644<br>
index 0000000000..40763ad5b1<br>
--- /dev/null<br>
+++ b/meta/recipes-devtools/go/go-1.13/0004-ld-add-soname-to-shareable-objects.patch<br>
@@ -0,0 +1,50 @@<br>
+From bf5cf5301ae5914498454c87293d1df2e1d8489f Mon Sep 17 00:00:00 2001<br>
+From: Alex Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
+Date: Wed, 23 Oct 2019 21:16:32 +0430<br>
+Subject: [PATCH 4/9] ld: add soname to shareable objects<br>
+<br>
+so that OE's shared library dependency handling<br>
+can find them.<br>
+<br>
+Adapted to Go 1.13 from patches originally submitted to<br>
+the meta/recipes-devtools/go tree by<br>
+Matt Madison <matt@madison.systems>.<br>
+<br>
+Upstream-Status: Inappropriate [OE specific]<br>
+<br>
+Signed-off-by: Alexander J Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
+---<br>
+ src/cmd/link/internal/ld/lib.go | 3 +++<br>
+ 1 file changed, 3 insertions(+)<br>
+<br>
+diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go<br>
+index 3fa258d..f96fb02 100644<br>
+--- a/src/cmd/link/internal/ld/lib.go<br>
++++ b/src/cmd/link/internal/ld/lib.go<br>
+@@ -1215,6 +1215,7 @@ func (ctxt *Link) hostlink() {<br>
+ argv = append(argv, "-Wl,-z,relro")<br>
+ }<br>
+ argv = append(argv, "-shared")<br>
++ argv = append(argv, fmt.Sprintf("-Wl,-soname,%s", filepath.Base(*flagOutfile)))<br>
+ if ctxt.HeadType != objabi.Hwindows {<br>
+ // Pass -z nodelete to mark the shared library as<br>
+ // non-closeable: a dlclose will do nothing.<br>
+@@ -1226,6 +1227,7 @@ func (ctxt *Link) hostlink() {<br>
+ argv = append(argv, "-Wl,-z,relro")<br>
+ }<br>
+ argv = append(argv, "-shared")<br>
++ argv = append(argv, fmt.Sprintf("-Wl,-soname,%s", filepath.Base(*flagOutfile)))<br>
+ case BuildModePlugin:<br>
+ if ctxt.HeadType == objabi.Hdarwin {<br>
+ argv = append(argv, "-dynamiclib")<br>
+@@ -1234,6 +1236,7 @@ func (ctxt *Link) hostlink() {<br>
+ argv = append(argv, "-Wl,-z,relro")<br>
+ }<br>
+ argv = append(argv, "-shared")<br>
++ argv = append(argv, fmt.Sprintf("-Wl,-soname,%s", filepath.Base(*flagOutfile)))<br>
+ }<br>
+ }<br>
+ <br>
+-- <br>
+2.17.1 (Apple Git-112)<br>
+<br>
diff --git a/meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch b/meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch<br>
new file mode 100644<br>
index 0000000000..4f2a46c6ce<br>
--- /dev/null<br>
+++ b/meta/recipes-devtools/go/go-1.13/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch<br>
@@ -0,0 +1,44 @@<br>
+From f05ef3ded52b98537c10efd0b15cd9612471524d Mon Sep 17 00:00:00 2001<br>
+From: Alex Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
+Date: Wed, 23 Oct 2019 21:17:16 +0430<br>
+Subject: [PATCH 5/9] make.bash: override CC when building dist and<br>
+ go_bootstrap<br>
+<br>
+for handling OE cross-canadian builds.<br>
+<br>
+Adapted to Go 1.13 from patches originally submitted to<br>
+the meta/recipes-devtools/go tree by<br>
+Matt Madison <matt@madison.systems>.<br>
+<br>
+Upstream-Status: Inappropriate [OE specific]<br>
+<br>
+Signed-off-by: Alexander J Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
+---<br>
+ src/make.bash | 4 ++--<br>
+ 1 file changed, 2 insertions(+), 2 deletions(-)<br>
+<br>
+diff --git a/src/make.bash b/src/make.bash<br>
+index 92d1481..0c2822f 100755<br>
+--- a/src/make.bash<br>
++++ b/src/make.bash<br>
+@@ -177,7 +177,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then<br>
+ exit 1<br>
+ fi<br>
+ rm -f cmd/dist/dist<br>
+-GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" GO111MODULE=off "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist<br>
++CC="${BUILD_CC:-${CC}}" GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" GO111MODULE=off "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist<br>
+ <br>
+ # -e doesn't propagate out of eval, so check success by hand.<br>
+ eval $(./cmd/dist/dist env -p || echo FAIL=true)<br>
+@@ -208,7 +208,7 @@ fi<br>
+ # Run dist bootstrap to complete make.bash.<br>
+ # Bootstrap installs a proper cmd/dist, built with the new toolchain.<br>
+ # Throw ours, built with Go 1.4, away after bootstrap.<br>
+-./cmd/dist/dist bootstrap $buildall $vflag $GO_DISTFLAGS "$@"<br>
++CC="${BUILD_CC:-${CC}}" ./cmd/dist/dist bootstrap $buildall $vflag $GO_DISTFLAGS "$@"<br>
+ rm -f ./cmd/dist/dist<br>
+ <br>
+ # DO NOT ADD ANY NEW CODE HERE.<br>
+-- <br>
+2.17.1 (Apple Git-112)<br>
+<br>
diff --git a/meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch b/meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch<br>
new file mode 100644<br>
index 0000000000..354aaca3a1<br>
--- /dev/null<br>
+++ b/meta/recipes-devtools/go/go-1.13/0006-cmd-dist-separate-host-and-target-builds.patch<br>
@@ -0,0 +1,279 @@<br>
+From 10735bb84df17ba657f76835f483cd8543a879c1 Mon Sep 17 00:00:00 2001<br>
+From: Alex Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
+Date: Wed, 23 Oct 2019 21:18:12 +0430<br>
+Subject: [PATCH 6/9] cmd/dist: separate host and target builds<br>
+<br>
+Upstream-Status: Inappropriate [OE specific]<br>
+<br>
+Change the dist tool to allow for OE-style cross-<br>
+and cross-canadian builds:<br>
+<br>
+ - command flags --host-only and --target only are added;<br>
+ if one is present, the other changes mentioned below<br>
+ take effect, and arguments may also be specified on<br>
+ the command line to enumerate the package(s) to be<br>
+ built.<br>
+<br>
+ - for OE cross builds, go_bootstrap is always built for<br>
+ the current build host, and is moved, along with the supporting<br>
+ toolchain (asm, compile, etc.) to a separate 'native_native'<br>
+ directory under GOROOT/pkg/tool.<br>
+<br>
+ - go_bootstrap is not automatically removed after the build,<br>
+ so it can be reused later (e.g., building both static and<br>
+ shared runtime).<br>
+<br>
+Note that for --host-only builds, it would be nice to specify<br>
+just the "cmd" package to build only the go commands/tools,<br>
+the staleness checks in the dist tool will fail if the "std"<br>
+library has not also been built. So host-only builds have to<br>
+build everything anyway.<br>
+<br>
+Adapted to Go 1.13 from patches originally submitted to<br>
+the meta/recipes-devtools/go tree by<br>
+Matt Madison <matt@madison.systems>.<br>
+<br>
+Signed-off-by: Alexander J Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
+---<br>
+ src/cmd/dist/build.go | 155 ++++++++++++++++++++++++++++++------------<br>
+ 1 file changed, 112 insertions(+), 43 deletions(-)<br>
+<br>
+diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go<br>
+index 683ca6f..0ad082b 100644<br>
+--- a/src/cmd/dist/build.go<br>
++++ b/src/cmd/dist/build.go<br>
+@@ -41,6 +41,7 @@ var (<br>
+ goldflags string<br>
+ workdir string<br>
+ tooldir string<br>
++ build_tooldir string<br>
+ oldgoos string<br>
+ oldgoarch string<br>
+ exe string<br>
+@@ -53,6 +54,7 @@ var (<br>
+ <br>
+ rebuildall bool<br>
+ defaultclang bool<br>
++ crossBuild bool<br>
+ <br>
+ vflag int // verbosity<br>
+ )<br>
+@@ -247,6 +249,8 @@ func xinit() {<br>
+ if tooldir = os.Getenv("GOTOOLDIR"); tooldir == "" {<br>
+ tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch)<br>
+ }<br>
++<br>
++ build_tooldir = pathf("%s/pkg/tool/native_native", goroot)<br>
+ }<br>
+ <br>
+ // compilerEnv returns a map from "goos/goarch" to the<br>
+@@ -478,8 +482,10 @@ func setup() {<br>
+ p := pathf("%s/pkg/%s_%s", goroot, gohostos, gohostarch)<br>
+ if rebuildall {<br>
+ xremoveall(p)<br>
++ xremoveall(build_tooldir)<br>
+ }<br>
+ xmkdirall(p)<br>
++ xmkdirall(build_tooldir)<br>
+ <br>
+ if goos != gohostos || goarch != gohostarch {<br>
+ p := pathf("%s/pkg/%s_%s", goroot, goos, goarch)<br>
+@@ -1207,12 +1213,29 @@ func cmdbootstrap() {<br>
+ <br>
+ var noBanner bool<br>
+ var debug bool<br>
++ var hostOnly bool<br>
++ var targetOnly bool<br>
++ var toBuild = []string{"std", "cmd"}<br>
++<br>
+ flag.BoolVar(&rebuildall, "a", rebuildall, "rebuild all")<br>
+ flag.BoolVar(&debug, "d", debug, "enable debugging of bootstrap process")<br>
+ flag.BoolVar(&noBanner, "no-banner", noBanner, "do not print banner")<br>
++ flag.BoolVar(&hostOnly, "host-only", hostOnly, "build only host binaries, not target")<br>
++ flag.BoolVar(&targetOnly, "target-only", targetOnly, "build only target binaries, not host")<br>
+ <br>
+- xflagparse(0)<br>
++ xflagparse(-1)<br>
+ <br>
++ if hostOnly && targetOnly {<br>
++ fatalf("specify only one of --host-only or --target-only\n")<br>
++ }<br>
++ crossBuild = hostOnly || targetOnly<br>
++ if flag.NArg() > 0 {<br>
++ if crossBuild {<br>
++ toBuild = flag.Args()<br>
++ } else {<br>
++ fatalf("package names not permitted without --host-only or --target-only\n")<br>
++ }<br>
++ }<br>
+ // Set GOPATH to an internal directory. We shouldn't actually<br>
+ // need to store files here, since the toolchain won't<br>
+ // depend on modules outside of vendor directories, but if<br>
+@@ -1266,8 +1289,13 @@ func cmdbootstrap() {<br>
+ xprintf("\n")<br>
+ }<br>
+ <br>
+- gogcflags = os.Getenv("GO_GCFLAGS") // we were using $BOOT_GO_GCFLAGS until now<br>
+- goldflags = os.Getenv("GO_LDFLAGS") // we were using $BOOT_GO_LDFLAGS until now<br>
++ // For split host/target cross/cross-canadian builds, we don't<br>
++ // want to be setting these flags until after we have compiled<br>
++ // the toolchain that runs on the build host.<br>
++ if !crossBuild {<br>
++ gogcflags = os.Getenv("GO_GCFLAGS") // we were using $BOOT_GO_GCFLAGS until now<br>
++ goldflags = os.Getenv("GO_LDFLAGS") // we were using $BOOT_GO_LDFLAGS until now<br>
++ }<br>
+ goBootstrap := pathf("%s/go_bootstrap", tooldir)<br>
+ cmdGo := pathf("%s/go", gobin)<br>
+ if debug {<br>
+@@ -1296,7 +1324,11 @@ func cmdbootstrap() {<br>
+ xprintf("\n")<br>
+ }<br>
+ xprintf("Building Go toolchain2 using go_bootstrap and Go toolchain1.\n")<br>
+- os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch))<br>
++ if crossBuild {<br>
++ os.Setenv("CC", defaultcc[""])<br>
++ } else {<br>
++ os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch))<br>
++ }<br>
+ goInstall(goBootstrap, append([]string{"-i"}, toolchain...)...)<br>
+ if debug {<br>
+ run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")<br>
+@@ -1333,50 +1365,84 @@ func cmdbootstrap() {<br>
+ }<br>
+ checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...)<br>
+ <br>
+- if goos == oldgoos && goarch == oldgoarch {<br>
+- // Common case - not setting up for cross-compilation.<br>
+- timelog("build", "toolchain")<br>
+- if vflag > 0 {<br>
+- xprintf("\n")<br>
++ if crossBuild {<br>
++ gogcflags = os.Getenv("GO_GCFLAGS")<br>
++ goldflags = os.Getenv("GO_LDFLAGS")<br>
++ tool_files, _ := filepath.Glob(pathf("%s/*", tooldir))<br>
++ for _, f := range tool_files {<br>
++ copyfile(pathf("%s/%s", build_tooldir, filepath.Base(f)), f, writeExec)<br>
++ xremove(f)<br>
++ }<br>
++ os.Setenv("GOTOOLDIR", build_tooldir)<br>
++ goBootstrap = pathf("%s/go_bootstrap", build_tooldir)<br>
++ if hostOnly {<br>
++ timelog("build", "host toolchain")<br>
++ if vflag > 0 {<br>
++ xprintf("\n")<br>
++ }<br>
++ xprintf("Building %s for host, %s/%s.\n", strings.Join(toBuild, ","), goos, goarch)<br>
++ goInstall(goBootstrap, toBuild...)<br>
++ checkNotStale(goBootstrap, toBuild...)<br>
++ // Skip cmdGo staleness checks here, since we can't necessarily run the cmdGo binary<br>
++<br>
++ timelog("build", "target toolchain")<br>
++ if vflag > 0 {<br>
++ xprintf("\n")<br>
++ }<br>
++ } else if targetOnly {<br>
++ goos = oldgoos<br>
++ goarch = oldgoarch<br>
++ os.Setenv("GOOS", goos)<br>
++ os.Setenv("GOARCH", goarch)<br>
++ os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch))<br>
++ xprintf("Building %s for target, %s/%s.\n", strings.Join(toBuild, ","), goos, goarch)<br>
++ goInstall(goBootstrap, toBuild...)<br>
++ checkNotStale(goBootstrap, toBuild...)<br>
++ // Skip cmdGo staleness checks here, since we can't run the target's cmdGo binary<br>
+ }<br>
+- xprintf("Building packages and commands for %s/%s.\n", goos, goarch)<br>
+ } else {<br>
+- // GOOS/GOARCH does not match GOHOSTOS/GOHOSTARCH.<br>
+- // Finish GOHOSTOS/GOHOSTARCH installation and then<br>
+- // run GOOS/GOARCH installation.<br>
+- timelog("build", "host toolchain")<br>
+- if vflag > 0 {<br>
+- xprintf("\n")<br>
+- }<br>
+- xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch)<br>
++<br>
++ if goos == oldgoos && goarch == oldgoarch {<br>
++ // Common case - not setting up for cross-compilation.<br>
++ timelog("build", "toolchain")<br>
++ if vflag > 0 {<br>
++ xprintf("\n")<br>
++ }<br>
++ xprintf("Building packages and commands for %s/%s.\n", goos, goarch)<br>
++ } else {<br>
++ // GOOS/GOARCH does not match GOHOSTOS/GOHOSTARCH.<br>
++ // Finish GOHOSTOS/GOHOSTARCH installation and then<br>
++ // run GOOS/GOARCH installation.<br>
++ timelog("build", "host toolchain")<br>
++ if vflag > 0 {<br>
++ xprintf("\n")<br>
++ }<br>
++ xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch)<br>
++ goInstall(goBootstrap, "std", "cmd")<br>
++ checkNotStale(goBootstrap, "std", "cmd")<br>
++ checkNotStale(cmdGo, "std", "cmd")<br>
++<br>
++ timelog("build", "target toolchain")<br>
++ if vflag > 0 {<br>
++ xprintf("\n")<br>
++ }<br>
++ goos = oldgoos<br>
++ goarch = oldgoarch<br>
++ os.Setenv("GOOS", goos)<br>
++ os.Setenv("GOARCH", goarch)<br>
++ os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch))<br>
++ xprintf("Building packages and commands for target, %s/%s.\n", goos, goarch)<br>
++ }<br>
+ goInstall(goBootstrap, "std", "cmd")<br>
+ checkNotStale(goBootstrap, "std", "cmd")<br>
+ checkNotStale(cmdGo, "std", "cmd")<br>
+ <br>
+- timelog("build", "target toolchain")<br>
+- if vflag > 0 {<br>
+- xprintf("\n")<br>
++ if debug {<br>
++ run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")<br>
++ run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch))<br>
++ checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...)<br>
++ copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec)<br>
+ }<br>
+- goos = oldgoos<br>
+- goarch = oldgoarch<br>
+- os.Setenv("GOOS", goos)<br>
+- os.Setenv("GOARCH", goarch)<br>
+- os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch))<br>
+- xprintf("Building packages and commands for target, %s/%s.\n", goos, goarch)<br>
+- }<br>
+- targets := []string{"std", "cmd"}<br>
+- if goos == "js" && goarch == "wasm" {<br>
+- // Skip the cmd tools for js/wasm. They're not usable.<br>
+- targets = targets[:1]<br>
+- }<br>
+- goInstall(goBootstrap, targets...)<br>
+- checkNotStale(goBootstrap, targets...)<br>
+- checkNotStale(cmdGo, targets...)<br>
+- if debug {<br>
+- run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")<br>
+- run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch))<br>
+- checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...)<br>
+- copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec)<br>
+ }<br>
+ <br>
+ // Check that there are no new files in $GOROOT/bin other than<br>
+@@ -1393,8 +1459,11 @@ func cmdbootstrap() {<br>
+ }<br>
+ }<br>
+ <br>
+- // Remove go_bootstrap now that we're done.<br>
+- xremove(pathf("%s/go_bootstrap", tooldir))<br>
++ // Except that for split host/target cross-builds, we need to<br>
++ // keep it.<br>
++ if !crossBuild {<br>
++ xremove(pathf("%s/go_bootstrap", tooldir))<br>
++ }<br>
+ <br>
+ if goos == "android" {<br>
+ // Make sure the exec wrapper will sync a fresh $GOROOT to the device.<br>
+-- <br>
+2.17.1 (Apple Git-112)<br>
+<br>
diff --git a/meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch b/meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch<br>
new file mode 100644<br>
index 0000000000..e232c79199<br>
--- /dev/null<br>
+++ b/meta/recipes-devtools/go/go-1.13/0007-cmd-go-make-GOROOT-precious-by-default.patch<br>
@@ -0,0 +1,113 @@<br>
+From 9ba507e076c744f4d394418e4a849e68cd426a4a Mon Sep 17 00:00:00 2001<br>
+From: Alex Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
+Date: Wed, 23 Oct 2019 21:18:56 +0430<br>
+Subject: [PATCH 7/9] cmd/go: make GOROOT precious by default<br>
+<br>
+Upstream-Status: Inappropriate [OE specific]<br>
+<br>
+The go build tool normally rebuilds whatever it detects is<br>
+stale. This can be a problem when GOROOT is intended to<br>
+be read-only and the go runtime has been built as a shared<br>
+library, since we don't want every application to be rebuilding<br>
+the shared runtime - particularly in cross-build/packaging<br>
+setups, since that would lead to 'abi mismatch' runtime errors.<br>
+<br>
+This patch prevents the install and linkshared actions from<br>
+installing to GOROOT unless overridden with the GOROOT_OVERRIDE<br>
+environment variable.<br>
+<br>
+Adapted to Go 1.13 from patches originally submitted to<br>
+the meta/recipes-devtools/go tree by<br>
+Matt Madison <matt@madison.systems>.<br>
+<br>
+Signed-off-by: Alexander J Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
+---<br>
+ src/cmd/go/internal/work/action.go | 3 +++<br>
+ src/cmd/go/internal/work/build.go | 6 ++++++<br>
+ src/cmd/go/internal/work/exec.go | 25 +++++++++++++++++++++++++<br>
+ 3 files changed, 34 insertions(+)<br>
+<br>
+diff --git a/src/cmd/go/internal/work/action.go b/src/cmd/go/internal/work/action.go<br>
+index 33b7818..7617b4c 100644<br>
+--- a/src/cmd/go/internal/work/action.go<br>
++++ b/src/cmd/go/internal/work/action.go<br>
+@@ -662,6 +662,9 @@ func (b *Builder) addTransitiveLinkDeps(a, a1 *Action, shlib string) {<br>
+ if p1 == nil || p1.Shlib == "" || haveShlib[filepath.Base(p1.Shlib)] {<br>
+ continue<br>
+ }<br>
++ if goRootPrecious && (p1.Standard || p1.Goroot) {<br>
++ continue<br>
++ }<br>
+ haveShlib[filepath.Base(p1.Shlib)] = true<br>
+ // TODO(rsc): The use of ModeInstall here is suspect, but if we only do ModeBuild,<br>
+ // we'll end up building an overall library or executable that depends at runtime<br>
+diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go<br>
+index 9305b2d..6560317 100644<br>
+--- a/src/cmd/go/internal/work/build.go<br>
++++ b/src/cmd/go/internal/work/build.go<br>
+@@ -155,6 +155,8 @@ See also: go install, go get, go clean.<br>
+ <br>
+ const concurrentGCBackendCompilationEnabledByDefault = true<br>
+ <br>
++var goRootPrecious bool = true<br>
++<br>
+ func init() {<br>
+ // break init cycle<br>
+ CmdBuild.Run = runBuild<br>
+@@ -167,6 +169,10 @@ func init() {<br>
+ <br>
+ AddBuildFlags(CmdBuild)<br>
+ AddBuildFlags(CmdInstall)<br>
++<br>
++ if x := os.Getenv("GOROOT_OVERRIDE"); x != "" {<br>
++ goRootPrecious = false<br>
++ }<br>
+ }<br>
+ <br>
+ // Note that flags consulted by other parts of the code<br>
+diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go<br>
+index ccebaf8..59450d7 100644<br>
+--- a/src/cmd/go/internal/work/exec.go<br>
++++ b/src/cmd/go/internal/work/exec.go<br>
+@@ -455,6 +455,23 @@ func (b *Builder) build(a *Action) (err error) {<br>
+ return errors.New("binary-only packages are no longer supported")<br>
+ }<br>
+ <br>
++ if goRootPrecious && (a.Package.Standard || a.Package.Goroot) {<br>
++ _, err := os.Stat(a.Package.Target)<br>
++ if err == nil {<br>
++ a.built = a.Package.Target<br>
++ a.Target = a.Package.Target<br>
++ a.buildID = b.fileHash(a.Package.Target)<br>
++ a.Package.Stale = false<br>
++ a.Package.StaleReason = "GOROOT-resident package"<br>
++ return nil<br>
++ }<br>
++ a.Package.Stale = true<br>
++ a.Package.StaleReason = "missing or invalid GOROOT-resident package"<br>
++ if b.IsCmdList {<br>
++ return nil<br>
++ }<br>
++ }<br>
++<br>
+ if err := b.Mkdir(a.Objdir); err != nil {<br>
+ return err<br>
+ }<br>
+@@ -1499,6 +1516,14 @@ func BuildInstallFunc(b *Builder, a *Action) (err error) {<br>
+ return nil<br>
+ }<br>
+ <br>
++ if goRootPrecious && a.Package != nil {<br>
++ p := a.Package<br>
++ if p.Standard || p.Goroot {<br>
++ err := fmt.Errorf("attempting to install package %s into read-only GOROOT", p.ImportPath)<br>
++ return err<br>
++ }<br>
++ }<br>
++<br>
+ if err := b.Mkdir(a.Objdir); err != nil {<br>
+ return err<br>
+ }<br>
+-- <br>
+2.17.1 (Apple Git-112)<br>
+<br>
diff --git a/meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch b/meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch<br>
new file mode 100644<br>
index 0000000000..68e132f30a<br>
--- /dev/null<br>
+++ b/meta/recipes-devtools/go/go-1.13/0008-use-GOBUILDMODE-to-set-buildmode.patch<br>
@@ -0,0 +1,47 @@<br>
+From 971b5626339ce0c4d57f9721c9a81af566c5a044 Mon Sep 17 00:00:00 2001<br>
+From: Alex Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
+Date: Wed, 23 Oct 2019 21:19:26 +0430<br>
+Subject: [PATCH 8/9] cmd/go: Use GOBUILDMODE to set buildmode<br>
+<br>
+Upstream-Status: Denied [upstream choose antoher solution: `17a256b<br>
+cmd/go: -buildmode=pie for android/arm']<br>
+<br>
+While building go itself, the go build system does not support<br>
+to set `-buildmode=pie' from environment.<br>
+<br>
+Add GOBUILDMODE to support it which make PIE executables the default<br>
+build mode, as PIE executables are required as of Yocto<br>
+<br>
+Refers: <a href="https://groups.google.com/forum/#!topic/golang-dev/gRCe5URKewI" rel="noreferrer" target="_blank">https://groups.google.com/forum/#!topic/golang-dev/gRCe5URKewI</a><br>
+<br>
+Adapted to Go 1.13 from patches originally submitted to<br>
+the meta/recipes-devtools/go tree by<br>
+Hongxu Jia <<a href="mailto:hongxu.jia@windriver.com" target="_blank">hongxu.jia@windriver.com</a>><br>
+<br>
+Signed-off-by: Alexander J Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
+---<br>
+ src/cmd/go/internal/work/build.go | 8 +++++++-<br>
+ 1 file changed, 7 insertions(+), 1 deletion(-)<br>
+<br>
+diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go<br>
+index 6560317..5f3a988 100644<br>
+--- a/src/cmd/go/internal/work/build.go<br>
++++ b/src/cmd/go/internal/work/build.go<br>
+@@ -231,7 +231,13 @@ func AddBuildFlags(cmd *base.Command) {<br>
+ <br>
+ cmd.Flag.Var(&load.BuildAsmflags, "asmflags", "")<br>
+ cmd.Flag.Var(buildCompiler{}, "compiler", "")<br>
+- cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", "default", "")<br>
++<br>
++ if bm := os.Getenv("GOBUILDMODE"); bm != "" {<br>
++ cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", bm, "")<br>
++ } else {<br>
++ cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", "default", "")<br>
++ }<br>
++<br>
+ cmd.Flag.Var(&load.BuildGcflags, "gcflags", "")<br>
+ cmd.Flag.Var(&load.BuildGccgoflags, "gccgoflags", "")<br>
+ cmd.Flag.StringVar(&cfg.BuildMod, "mod", "", "")<br>
+-- <br>
+2.17.1 (Apple Git-112)<br>
+<br>
diff --git a/meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch b/meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch<br>
new file mode 100644<br>
index 0000000000..4bb1106f09<br>
--- /dev/null<br>
+++ b/meta/recipes-devtools/go/go-1.13/0009-ld-replace-glibc-dynamic-linker-with-musl.patch<br>
@@ -0,0 +1,134 @@<br>
+From 973251ae0c69a35721f6115345d3f57b2847979f Mon Sep 17 00:00:00 2001<br>
+From: Alex Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
+Date: Wed, 23 Oct 2019 21:20:13 +0430<br>
+Subject: [PATCH 9/9] ld: replace glibc dynamic linker with musl<br>
+<br>
+Rework of patch by Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>><br>
+for go 1.10. Should be applied conditionally on<br>
+musl being the system C library.<br>
+<br>
+Adapted to Go 1.13 from patches originally submitted to<br>
+the meta/recipes-devtools/go tree by<br>
+Matt Madison <matt@madison.systems>.<br>
+<br>
+Upstream-Status: Inappropriate [Real fix should be portable across libcs]<br>
+<br>
+Signed-off-by: Alexander J Kube <<a href="mailto:alexander.j.kube@gmail.com" target="_blank">alexander.j.kube@gmail.com</a>><br>
+---<br>
+ src/cmd/link/internal/amd64/obj.go | 2 +-<br>
+ src/cmd/link/internal/arm/obj.go | 2 +-<br>
+ src/cmd/link/internal/arm64/obj.go | 2 +-<br>
+ src/cmd/link/internal/mips/obj.go | 2 +-<br>
+ src/cmd/link/internal/mips64/obj.go | 2 +-<br>
+ src/cmd/link/internal/ppc64/obj.go | 2 +-<br>
+ src/cmd/link/internal/s390x/obj.go | 2 +-<br>
+ src/cmd/link/internal/x86/obj.go | 2 +-<br>
+ 8 files changed, 8 insertions(+), 8 deletions(-)<br>
+<br>
+diff --git a/src/cmd/link/internal/amd64/obj.go b/src/cmd/link/internal/amd64/obj.go<br>
+index 23741eb..8e74576 100644<br>
+--- a/src/cmd/link/internal/amd64/obj.go<br>
++++ b/src/cmd/link/internal/amd64/obj.go<br>
+@@ -62,7 +62,7 @@ func Init() (*sys.Arch, ld.Arch) {<br>
+ PEreloc1: pereloc1,<br>
+ TLSIEtoLE: tlsIEtoLE,<br>
+ <br>
+- Linuxdynld: "/lib64/ld-linux-x86-64.so.2",<br>
++ Linuxdynld: "/lib64/ld-musl-x86-64.so.1",<br>
+ Freebsddynld: "/libexec/ld-elf.so.1",<br>
+ Openbsddynld: "/usr/libexec/ld.so",<br>
+ Netbsddynld: "/libexec/ld.elf_so",<br>
+diff --git a/src/cmd/link/internal/arm/obj.go b/src/cmd/link/internal/arm/obj.go<br>
+index 45a406e..724d3e3 100644<br>
+--- a/src/cmd/link/internal/arm/obj.go<br>
++++ b/src/cmd/link/internal/arm/obj.go<br>
+@@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) {<br>
+ Machoreloc1: machoreloc1,<br>
+ PEreloc1: pereloc1,<br>
+ <br>
+- Linuxdynld: "/lib/ld-linux.so.3", // 2 for OABI, 3 for EABI<br>
++ Linuxdynld: "/lib/ld-musl-armhf.so.1",<br>
+ Freebsddynld: "/usr/libexec/ld-elf.so.1",<br>
+ Openbsddynld: "/usr/libexec/ld.so",<br>
+ Netbsddynld: "/libexec/ld.elf_so",<br>
+diff --git a/src/cmd/link/internal/arm64/obj.go b/src/cmd/link/internal/arm64/obj.go<br>
+index 7c66623..d8b1db1 100644<br>
+--- a/src/cmd/link/internal/arm64/obj.go<br>
++++ b/src/cmd/link/internal/arm64/obj.go<br>
+@@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) {<br>
+ Gentext: gentext,<br>
+ Machoreloc1: machoreloc1,<br>
+ <br>
+- Linuxdynld: "/lib/ld-linux-aarch64.so.1",<br>
++ Linuxdynld: "/lib/ld-musl-aarch64.so.1",<br>
+ <br>
+ Freebsddynld: "XXX",<br>
+ Openbsddynld: "/usr/libexec/ld.so",<br>
+diff --git a/src/cmd/link/internal/mips/obj.go b/src/cmd/link/internal/mips/obj.go<br>
+index 231e1ff..631dd7a 100644<br>
+--- a/src/cmd/link/internal/mips/obj.go<br>
++++ b/src/cmd/link/internal/mips/obj.go<br>
+@@ -60,7 +60,7 @@ func Init() (*sys.Arch, ld.Arch) {<br>
+ Gentext: gentext,<br>
+ Machoreloc1: machoreloc1,<br>
+ <br>
+- Linuxdynld: "/lib/ld.so.1",<br>
++ Linuxdynld: "/lib/ld-musl-mipsle.so.1",<br>
+ <br>
+ Freebsddynld: "XXX",<br>
+ Openbsddynld: "XXX",<br>
+diff --git a/src/cmd/link/internal/mips64/obj.go b/src/cmd/link/internal/mips64/obj.go<br>
+index 9604208..5ef3ffc 100644<br>
+--- a/src/cmd/link/internal/mips64/obj.go<br>
++++ b/src/cmd/link/internal/mips64/obj.go<br>
+@@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) {<br>
+ Gentext: gentext,<br>
+ Machoreloc1: machoreloc1,<br>
+ <br>
+- Linuxdynld: "/lib64/ld64.so.1",<br>
++ Linuxdynld: "/lib64/ld-musl-mips64le.so.1",<br>
+ Freebsddynld: "XXX",<br>
+ Openbsddynld: "XXX",<br>
+ Netbsddynld: "XXX",<br>
+diff --git a/src/cmd/link/internal/ppc64/obj.go b/src/cmd/link/internal/ppc64/obj.go<br>
+index 51d1791..b15da85 100644<br>
+--- a/src/cmd/link/internal/ppc64/obj.go<br>
++++ b/src/cmd/link/internal/ppc64/obj.go<br>
+@@ -63,7 +63,7 @@ func Init() (*sys.Arch, ld.Arch) {<br>
+ Xcoffreloc1: xcoffreloc1,<br>
+ <br>
+ // TODO(austin): ABI v1 uses /usr/lib/ld.so.1,<br>
+- Linuxdynld: "/lib64/ld64.so.1",<br>
++ Linuxdynld: "/lib64/ld-musl-powerpc64le.so.1",<br>
+ <br>
+ Freebsddynld: "XXX",<br>
+ Openbsddynld: "XXX",<br>
+diff --git a/src/cmd/link/internal/s390x/obj.go b/src/cmd/link/internal/s390x/obj.go<br>
+index 3454476..42cc346 100644<br>
+--- a/src/cmd/link/internal/s390x/obj.go<br>
++++ b/src/cmd/link/internal/s390x/obj.go<br>
+@@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) {<br>
+ Gentext: gentext,<br>
+ Machoreloc1: machoreloc1,<br>
+ <br>
+- Linuxdynld: "/lib64/ld64.so.1",<br>
++ Linuxdynld: "/lib64/ld-musl-s390x.so.1",<br>
+ <br>
+ // not relevant for s390x<br>
+ Freebsddynld: "XXX",<br>
+diff --git a/src/cmd/link/internal/x86/obj.go b/src/cmd/link/internal/x86/obj.go<br>
+index f1fad20..d2ca10c 100644<br>
+--- a/src/cmd/link/internal/x86/obj.go<br>
++++ b/src/cmd/link/internal/x86/obj.go<br>
+@@ -58,7 +58,7 @@ func Init() (*sys.Arch, ld.Arch) {<br>
+ Machoreloc1: machoreloc1,<br>
+ PEreloc1: pereloc1,<br>
+ <br>
+- Linuxdynld: "/lib/ld-linux.so.2",<br>
++ Linuxdynld: "/lib/ld-musl-i386.so.1",<br>
+ Freebsddynld: "/usr/libexec/ld-elf.so.1",<br>
+ Openbsddynld: "/usr/libexec/ld.so",<br>
+ Netbsddynld: "/usr/libexec/ld.elf_so",<br>
+-- <br>
+2.17.1 (Apple Git-112)<br>
+<br>
-- <br>
2.17.1 (Apple Git-112)<br>
<br>
-- <br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div></div>