go: Upgrade to 1.18

1.18 is a major release brings in long awaited new features e.g.
generics, fuzzing

Detailed list is here [1]

Drop patches to manipulate multiword CC/CXX as go has fixed it
differently [2]

Drop cgo portion of patch to hack hash generation logic
either we should find a way to not use it or redo it,
in current form its not upstreamable and its
altering core features of go compiler, it can not be maintained as is

Do not emit linkinfo into the actionID

Drop ignoring CVE-2021-29923 its already addressed in go >= 1.17

[1] https://go.dev/doc/go1.18
[2] https://groups.google.com/g/golang-codereviews/c/fUhCbpYG7HE

(From OE-Core rev: 1a99cc2eed34434d75b2f53af1616ad79eef0906)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 18 insertions, 20 deletions

diff --git a/meta/recipes-devtools/go/go-1.18/0006-cmd-dist-separate-host-and-target-builds.patch b/meta/recipes-devtools/go/go-1.18/0006-cmd-dist-separate-host-and-target-builds.patch
index 68e8efc1d2..ee743ab990 100644
--- a/meta/recipes-devtools/go/go-1.18/0006-cmd-dist-separate-host-and-target-builds.patch
+++ b/meta/recipes-devtools/go/go-1.18/0006-cmd-dist-separate-host-and-target-builds.patch
@@ -39,11 +39,9 @@ Signed-off-by: Alexander J Kube <alexander.j.kube@gmail.com>
  src/cmd/dist/build.go | 156 ++++++++++++++++++++++++++++++------------
  1 file changed, 113 insertions(+), 43 deletions(-)
 
-diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
-index d82f612..5c8459c 100644
 --- a/src/cmd/dist/build.go
 +++ b/src/cmd/dist/build.go
-@@ -43,6 +43,7 @@ var (
+@@ -44,6 +44,7 @@ var (
         goexperiment     string
         workdir          string
         tooldir          string
@@ -51,7 +49,7 @@ index d82f612..5c8459c 100644
         oldgoos          string
         oldgoarch        string
         exe              string
-@@ -55,6 +56,7 @@ var (
+@@ -54,6 +55,7 @@ var (
  
         rebuildall   bool
         defaultclang bool
@@ -59,7 +57,7 @@ index d82f612..5c8459c 100644
  
         vflag int // verbosity
  )
-@@ -251,6 +253,8 @@ func xinit() {
+@@ -254,6 +256,8 @@ func xinit() {
         if tooldir = os.Getenv("GOTOOLDIR"); tooldir == "" {
                 tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch)
         }
@@ -68,7 +66,7 @@ index d82f612..5c8459c 100644
  }
  
  // compilerEnv returns a map from "goos/goarch" to the
-@@ -496,8 +500,10 @@ func setup() {
+@@ -499,8 +503,10 @@ func setup() {
         p := pathf("%s/pkg/%s_%s", goroot, gohostos, gohostarch)
         if rebuildall {
                 xremoveall(p)
@@ -79,7 +77,7 @@ index d82f612..5c8459c 100644
  
         if goos != gohostos || goarch != gohostarch {
                 p := pathf("%s/pkg/%s_%s", goroot, goos, goarch)
-@@ -1267,17 +1273,35 @@ func cmdbootstrap() {
+@@ -1252,17 +1258,35 @@ func cmdbootstrap() {
  
         var noBanner, noClean bool
         var debug bool
@@ -116,7 +114,7 @@ index d82f612..5c8459c 100644
         // Set GOPATH to an internal directory. We shouldn't actually
         // need to store files here, since the toolchain won't
         // depend on modules outside of vendor directories, but if
-@@ -1345,8 +1369,13 @@ func cmdbootstrap() {
+@@ -1330,8 +1354,13 @@ func cmdbootstrap() {
                 xprintf("\n")
         }
  
@@ -132,7 +130,7 @@ index d82f612..5c8459c 100644
         goBootstrap := pathf("%s/go_bootstrap", tooldir)
         cmdGo := pathf("%s/go", gobin)
         if debug {
-@@ -1375,7 +1404,11 @@ func cmdbootstrap() {
+@@ -1360,7 +1389,11 @@ func cmdbootstrap() {
                 xprintf("\n")
         }
         xprintf("Building Go toolchain2 using go_bootstrap and Go toolchain1.\n")
@@ -145,7 +143,7 @@ index d82f612..5c8459c 100644
         // Now that cmd/go is in charge of the build process, enable GOEXPERIMENT.
         os.Setenv("GOEXPERIMENT", goexperiment)
         goInstall(goBootstrap, append([]string{"-i"}, toolchain...)...)
-@@ -1414,50 +1447,84 @@ func cmdbootstrap() {
+@@ -1399,50 +1432,84 @@ func cmdbootstrap() {
         }
         checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...)
  
@@ -197,8 +195,6 @@ index d82f612..5c8459c 100644
 -               timelog("build", "host toolchain")
 -               if vflag > 0 {
 -                       xprintf("\n")
--               }
--               xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch)
 +
 +               if goos == oldgoos && goarch == oldgoarch {
 +                       // Common case - not setting up for cross-compilation.
@@ -230,7 +226,8 @@ index d82f612..5c8459c 100644
 +                       os.Setenv("GOARCH", goarch)
 +                       os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch))
 +                       xprintf("Building packages and commands for target, %s/%s.\n", goos, goarch)
-+               }
+                }
+-               xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch)
                 goInstall(goBootstrap, "std", "cmd")
                 checkNotStale(goBootstrap, "std", "cmd")
                 checkNotStale(cmdGo, "std", "cmd")
@@ -238,12 +235,7 @@ index d82f612..5c8459c 100644
 -               timelog("build", "target toolchain")
 -               if vflag > 0 {
 -                       xprintf("\n")
-+               if debug {
-+                       run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")
-+                       run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch))
-+                       checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...)
-+                       copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec)
-                }
+-               }
 -               goos = oldgoos
 -               goarch = oldgoarch
 -               os.Setenv("GOOS", goos)
@@ -264,10 +256,16 @@ index d82f612..5c8459c 100644
 -               run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch))
 -               checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...)
 -               copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec)
++               if debug {
++                       run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")
++                       run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch))
++                       checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...)
++                       copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec)
++               }
         }
  
         // Check that there are no new files in $GOROOT/bin other than
-@@ -1474,8 +1541,11 @@ func cmdbootstrap() {
+@@ -1459,8 +1526,11 @@ func cmdbootstrap() {
                 }
         }