all: REVERSE MERGE dev.boringcrypto (cdcb4b6) into master

author Russ Cox <rsc@golang.org>

Tue, 3 May 2022 02:12:30 +0000 (22:12 -0400)

committer Russ Cox <rsc@golang.org>

Tue, 3 May 2022 02:12:49 +0000 (22:12 -0400)
author Russ Cox <rsc@golang.org>
Tue, 3 May 2022 02:12:30 +0000 (22:12 -0400)
committer Russ Cox <rsc@golang.org>
Tue, 3 May 2022 02:12:49 +0000 (22:12 -0400)
diff --combined src/cmd/cgo/main.go

index 21d895be26ac3969a248cb39de76cbaae6dd9efe,75d48c2ede20473603df71ba5ac2f0cb540dfdea..e3434598b2eb09f44d60c88b08337598917d96bf
--- 1/src/cmd/cgo/main.go
--- 2/src/cmd/cgo/main.go
+++ b/src/cmd/cgo/main.go
@@@ -11,7 -11,6 +11,6 @@@
   package main
   
   import (
-       "crypto/md5"
         "flag"
         "fmt"
         "go/ast"
@@@ -28,6 -27,7 +27,7 @@@
         "strings"
   
         "cmd/internal/edit"
+       "cmd/internal/notsha256"
         "cmd/internal/objabi"
   )
   
@@@ -175,7 -175,6 +175,7 @@@ var ptrSizeMap = map[string]int64
         "amd64":    8,
         "arm":      4,
         "arm64":    8,
+ +      "loong64":  8,
         "m68k":     4,
         "mips":     4,
         "mipsle":   4,
@@@ -201,7 -200,6 +201,7 @@@ var intSizeMap = map[string]int64
         "amd64":    8,
         "arm":      4,
         "arm64":    8,
+ +      "loong64":  8,
         "m68k":     4,
         "mips":     4,
         "mipsle":   4,
@@@ -331,8 -329,8 +331,8 @@@ func main() 
         // we use to coordinate between gcc and ourselves.
         // We already put _cgo_ at the beginning, so the main
         // concern is other cgo wrappers for the same functions.
-       // Use the beginning of the md5 of the input to disambiguate.
-       h := md5.New()
+       // Use the beginning of the notsha256 of the input to disambiguate.
+       h := notsha256.New()
         io.WriteString(h, *importPath)
         fs := make([]*File, len(goFiles))
         for i, input := range goFiles {
diff --combined src/cmd/compile/internal/typecheck/iexport.go

index f273d26fb0d4ff19af0248c0ac17d4272a6c9fe1,9436aa55047a8c84c3c6b82daf69a5e876f7dfb6..bf721d6495e3a8cd044134aac08632dfa37b9b47
--- 1/src/cmd/compile/internal/typecheck/iexport.go
--- 2/src/cmd/compile/internal/typecheck/iexport.go
+++ b/src/cmd/compile/internal/typecheck/iexport.go
@@@ -236,7 -236,6 +236,6 @@@ package typechec
   
   import (
         "bytes"
-       "crypto/md5"
         "encoding/binary"
         "fmt"
         "go/constant"
@@@ -250,6 -249,7 +249,7 @@@
         "cmd/compile/internal/ir"
         "cmd/compile/internal/types"
         "cmd/internal/goobj"
+       "cmd/internal/notsha256"
         "cmd/internal/src"
   )
   
@@@ -353,7 -353,7 +353,7 @@@ func WriteExports(out io.Writer, extens
         hdr.uint64(dataLen)
   
         // Flush output.
-       h := md5.New()
+       h := notsha256.New()
         wr := io.MultiWriter(out, h)
         io.Copy(wr, &hdr)
         io.Copy(wr, &p.strings)
@@@ -1590,7 -1590,11 +1590,7 @@@ func (w *exportWriter) stmt(n ir.Node) 
   
         case ir.OAS2, ir.OAS2DOTTYPE, ir.OAS2FUNC, ir.OAS2MAPR, ir.OAS2RECV:
                 n := n.(*ir.AssignListStmt)
- -              if go117ExportTypes {
- -                      w.op(n.Op())
- -              } else {
- -                      w.op(ir.OAS2)
- -              }
+ +              w.op(n.Op())
                 w.pos(n.Pos())
                 w.stmtList(n.Init())
                 w.exprList(n.Lhs)
@@@ -1755,7 -1759,9 +1755,7 @@@ func (w *exportWriter) expr(n ir.Node) 
                         // Indicate that this is not an OKEY entry.
                         w.bool(false)
                         w.qualifiedIdent(n)
- -                      if go117ExportTypes {
- -                              w.typ(n.Type())
- -                      }
+ +                      w.typ(n.Type())
                         break
                 }
   
@@@ -1784,7 -1790,9 +1784,7 @@@
                 s := n.Sym()
                 w.string(s.Name)
                 w.pkg(s.Pkg)
- -              if go117ExportTypes {
- -                      w.typ(n.Type())
- -              }
+ +              w.typ(n.Type())
   
         // case OPACK:
         //      should have been resolved by typechecking - handled by default case
@@@ -1856,10 -1864,16 +1856,10 @@@
   
         case ir.OPTRLIT:
                 n := n.(*ir.AddrExpr)
- -              if go117ExportTypes {
- -                      w.op(ir.OPTRLIT)
- -              } else {
- -                      w.op(ir.OADDR)
- -              }
+ +              w.op(ir.OPTRLIT)
                 w.pos(n.Pos())
                 w.expr(n.X)
- -              if go117ExportTypes {
- -                      w.typ(n.Type())
- -              }
+ +              w.typ(n.Type())
   
         case ir.OSTRUCTLIT:
                 n := n.(*ir.CompLitExpr)
@@@ -1870,11 -1884,15 +1870,11 @@@
   
         case ir.OCOMPLIT, ir.OARRAYLIT, ir.OSLICELIT, ir.OMAPLIT:
                 n := n.(*ir.CompLitExpr)
- -              if go117ExportTypes {
- -                      w.op(n.Op())
- -              } else {
- -                      w.op(ir.OCOMPLIT)
- -              }
+ +              w.op(n.Op())
                 w.pos(n.Pos())
                 w.typ(n.Type())
                 w.exprList(n.List)
- -              if go117ExportTypes && n.Op() == ir.OSLICELIT {
+ +              if n.Op() == ir.OSLICELIT {
                         w.uint64(uint64(n.Len))
                 }
         case ir.OKEY:
@@@ -1889,25 -1907,37 +1889,25 @@@
   
         case ir.OXDOT, ir.ODOT, ir.ODOTPTR, ir.ODOTINTER, ir.ODOTMETH, ir.OMETHVALUE, ir.OMETHEXPR:
                 n := n.(*ir.SelectorExpr)
- -              if go117ExportTypes {
- -                      // For go117ExportTypes, we usually see all ops except
- -                      // OXDOT, but we can see OXDOT for generic functions.
- -                      w.op(n.Op())
- -              } else {
- -                      w.op(ir.OXDOT)
- -              }
+ +              w.op(n.Op())
                 w.pos(n.Pos())
                 w.expr(n.X)
                 w.exoticSelector(n.Sel)
- -              if go117ExportTypes {
- -                      w.exoticType(n.Type())
- -                      if n.Op() == ir.OXDOT {
- -                              // n.Selection for method references will be
- -                              // reconstructed during import.
- -                              w.bool(n.Selection != nil)
- -                      } else if n.Op() == ir.ODOT || n.Op() == ir.ODOTPTR || n.Op() == ir.ODOTINTER {
- -                              w.exoticField(n.Selection)
- -                      }
- -                      // n.Selection is not required for OMETHEXPR, ODOTMETH, and OMETHVALUE. It will
- -                      // be reconstructed during import.  n.Selection is computed during
- -                      // transformDot() for OXDOT.
- -              }
+ +              w.exoticType(n.Type())
+ +              if n.Op() == ir.OXDOT {
+ +                      // n.Selection for method references will be
+ +                      // reconstructed during import.
+ +                      w.bool(n.Selection != nil)
+ +              } else if n.Op() == ir.ODOT || n.Op() == ir.ODOTPTR || n.Op() == ir.ODOTINTER {
+ +                      w.exoticField(n.Selection)
+ +              }
+ +              // n.Selection is not required for OMETHEXPR, ODOTMETH, and OMETHVALUE. It will
+ +              // be reconstructed during import.  n.Selection is computed during
+ +              // transformDot() for OXDOT.
   
         case ir.ODOTTYPE, ir.ODOTTYPE2:
                 n := n.(*ir.TypeAssertExpr)
- -              if go117ExportTypes {
- -                      w.op(n.Op())
- -              } else {
- -                      w.op(ir.ODOTTYPE)
- -              }
+ +              w.op(n.Op())
                 w.pos(n.Pos())
                 w.expr(n.X)
                 w.typ(n.Type())
@@@ -1922,45 -1952,70 +1922,45 @@@
   
         case ir.OINDEX, ir.OINDEXMAP:
                 n := n.(*ir.IndexExpr)
- -              if go117ExportTypes {
- -                      w.op(n.Op())
- -              } else {
- -                      w.op(ir.OINDEX)
- -              }
+ +              w.op(n.Op())
                 w.pos(n.Pos())
                 w.expr(n.X)
                 w.expr(n.Index)
- -              if go117ExportTypes {
- -                      w.exoticType(n.Type())
- -                      if n.Op() == ir.OINDEXMAP {
- -                              w.bool(n.Assigned)
- -                      }
+ +              w.exoticType(n.Type())
+ +              if n.Op() == ir.OINDEXMAP {
+ +                      w.bool(n.Assigned)
                 }
   
         case ir.OSLICE, ir.OSLICESTR, ir.OSLICEARR:
                 n := n.(*ir.SliceExpr)
- -              if go117ExportTypes {
- -                      w.op(n.Op())
- -              } else {
- -                      w.op(ir.OSLICE)
- -              }
+ +              w.op(n.Op())
                 w.pos(n.Pos())
                 w.expr(n.X)
                 w.exprsOrNil(n.Low, n.High)
- -              if go117ExportTypes {
- -                      w.typ(n.Type())
- -              }
+ +              w.typ(n.Type())
   
         case ir.OSLICE3, ir.OSLICE3ARR:
                 n := n.(*ir.SliceExpr)
- -              if go117ExportTypes {
- -                      w.op(n.Op())
- -              } else {
- -                      w.op(ir.OSLICE3)
- -              }
+ +              w.op(n.Op())
                 w.pos(n.Pos())
                 w.expr(n.X)
                 w.exprsOrNil(n.Low, n.High)
                 w.expr(n.Max)
- -              if go117ExportTypes {
- -                      w.typ(n.Type())
- -              }
+ +              w.typ(n.Type())
   
         case ir.OCOPY, ir.OCOMPLEX, ir.OUNSAFEADD, ir.OUNSAFESLICE:
                 // treated like other builtin calls (see e.g., OREAL)
                 n := n.(*ir.BinaryExpr)
                 w.op(n.Op())
                 w.pos(n.Pos())
+ +              w.stmtList(n.Init())
                 w.expr(n.X)
                 w.expr(n.Y)
- -              if go117ExportTypes {
- -                      w.typ(n.Type())
- -              } else {
- -                      w.op(ir.OEND)
- -              }
+ +              w.typ(n.Type())
   
         case ir.OCONV, ir.OCONVIFACE, ir.OCONVIDATA, ir.OCONVNOP, ir.OBYTES2STR, ir.ORUNES2STR, ir.OSTR2BYTES, ir.OSTR2RUNES, ir.ORUNESTR, ir.OSLICE2ARRPTR:
                 n := n.(*ir.ConvExpr)
- -              if go117ExportTypes {
- -                      w.op(n.Op())
- -              } else {
- -                      w.op(ir.OCONV)
- -              }
+ +              w.op(n.Op())
                 w.pos(n.Pos())
                 w.typ(n.Type())
                 w.expr(n.X)
@@@ -1970,15 -2025,18 +1970,15 @@@
                 w.op(n.Op())
                 w.pos(n.Pos())
                 w.expr(n.X)
- -              if go117ExportTypes {
- -                      if n.Op() != ir.OPANIC {
- -                              w.typ(n.Type())
- -                      }
- -              } else {
- -                      w.op(ir.OEND)
+ +              if n.Op() != ir.OPANIC {
+ +                      w.typ(n.Type())
                 }
   
         case ir.OAPPEND, ir.ODELETE, ir.ORECOVER, ir.OPRINT, ir.OPRINTN:
                 n := n.(*ir.CallExpr)
                 w.op(n.Op())
                 w.pos(n.Pos())
+ +              w.stmtList(n.Init())
                 w.exprList(n.Args) // emits terminating OEND
                 // only append() calls may contain '...' arguments
                 if n.Op() == ir.OAPPEND {
@@@ -1986,19 -2044,27 +1986,19 @@@
                 } else if n.IsDDD {
                         base.Fatalf("exporter: unexpected '...' with %v call", n.Op())
                 }
- -              if go117ExportTypes {
- -                      if n.Op() != ir.ODELETE && n.Op() != ir.OPRINT && n.Op() != ir.OPRINTN {
- -                              w.typ(n.Type())
- -                      }
+ +              if n.Op() != ir.ODELETE && n.Op() != ir.OPRINT && n.Op() != ir.OPRINTN {
+ +                      w.typ(n.Type())
                 }
   
         case ir.OCALL, ir.OCALLFUNC, ir.OCALLMETH, ir.OCALLINTER, ir.OGETG:
                 n := n.(*ir.CallExpr)
- -              if go117ExportTypes {
- -                      w.op(n.Op())
- -              } else {
- -                      w.op(ir.OCALL)
- -              }
+ +              w.op(n.Op())
                 w.pos(n.Pos())
                 w.stmtList(n.Init())
                 w.expr(n.X)
                 w.exprList(n.Args)
                 w.bool(n.IsDDD)
- -              if go117ExportTypes {
- -                      w.exoticType(n.Type())
- -              }
+ +              w.exoticType(n.Type())
   
         case ir.OMAKEMAP, ir.OMAKECHAN, ir.OMAKESLICE:
                 n := n.(*ir.MakeExpr)
@@@ -2019,7 -2085,7 +2019,7 @@@
                         // an argument. Don't serialize that argument here.
                         w.expr(n.Len)
                         w.op(ir.OEND)
- -              case n.Len != nil && go117ExportTypes:
+ +              case n.Len != nil:
                         w.expr(n.Len)
                         w.op(ir.OEND)
                 }
@@@ -2038,21 -2104,27 +2038,21 @@@
                 w.op(n.Op())
                 w.pos(n.Pos())
                 w.expr(n.X)
- -              if go117ExportTypes {
- -                      w.typ(n.Type())
- -              }
+ +              w.typ(n.Type())
   
         case ir.OADDR:
                 n := n.(*ir.AddrExpr)
                 w.op(n.Op())
                 w.pos(n.Pos())
                 w.expr(n.X)
- -              if go117ExportTypes {
- -                      w.typ(n.Type())
- -              }
+ +              w.typ(n.Type())
   
         case ir.ODEREF:
                 n := n.(*ir.StarExpr)
                 w.op(n.Op())
                 w.pos(n.Pos())
                 w.expr(n.X)
- -              if go117ExportTypes {
- -                      w.typ(n.Type())
- -              }
+ +              w.typ(n.Type())
   
         case ir.OSEND:
                 n := n.(*ir.SendStmt)
@@@ -2069,7 -2141,9 +2069,7 @@@
                 w.pos(n.Pos())
                 w.expr(n.X)
                 w.expr(n.Y)
- -              if go117ExportTypes {
- -                      w.typ(n.Type())
- -              }
+ +              w.typ(n.Type())
   
         case ir.OANDAND, ir.OOROR:
                 n := n.(*ir.LogicalExpr)
@@@ -2077,14 -2151,18 +2077,14 @@@
                 w.pos(n.Pos())
                 w.expr(n.X)
                 w.expr(n.Y)
- -              if go117ExportTypes {
- -                      w.typ(n.Type())
- -              }
+ +              w.typ(n.Type())
   
         case ir.OADDSTR:
                 n := n.(*ir.AddStringExpr)
                 w.op(ir.OADDSTR)
                 w.pos(n.Pos())
                 w.exprList(n.List)
- -              if go117ExportTypes {
- -                      w.typ(n.Type())
- -              }
+ +              w.typ(n.Type())
   
         case ir.ODCLCONST:
                 // if exporting, DCLCONST should just be removed as its usage
@@@ -2099,7 -2177,9 +2099,7 @@@
                 for _, targ := range n.Targs {
                         w.typ(targ.Type())
                 }
- -              if go117ExportTypes {
- -                      w.typ(n.Type())
- -              }
+ +              w.typ(n.Type())
   
         case ir.OSELRECV2:
                 n := n.(*ir.AssignListStmt)
@@@ -2215,5 -2295,15 +2215,5 @@@ func (w *intWriter) uint64(x uint64) 
         w.Write(buf[:n])
   }
   
- -// If go117ExportTypes is true, then we write type information when
- -// exporting function bodies, so those function bodies don't need to
- -// be re-typechecked on import.
- -// This flag adds some other info to the serialized stream as well
- -// which was previously recomputed during typechecking, like
- -// specializing opcodes (e.g. OXDOT to ODOTPTR) and ancillary
- -// information (e.g. length field for OSLICELIT).
- -const go117ExportTypes = true
- -const Go117ExportTypes = go117ExportTypes
- -
   // The name used for dictionary parameters or local variables.
   const LocalDictName = ".dict"
diff --combined src/cmd/dist/buildtool.go

index 8afa7f7867e80e48d16e4fb6cde189eaede3e488,3161e3fa75736cb7f3838208b09f2da54399abce..f1f3d50b6f073b3f1d5984ce28bfb70bc5563bfc
--- 1/src/cmd/dist/buildtool.go
--- 2/src/cmd/dist/buildtool.go
+++ b/src/cmd/dist/buildtool.go
@@@ -44,6 -44,7 +44,7 @@@ var bootstrapDirs = []string
         "cmd/internal/edit",
         "cmd/internal/gcprog",
         "cmd/internal/goobj",
+       "cmd/internal/notsha256",
         "cmd/internal/obj/...",
         "cmd/internal/objabi",
         "cmd/internal/pkgpath",
@@@ -87,8 -88,6 +88,8 @@@ var ignorePrefixes = []string
   var ignoreSuffixes = []string{
         "_arm64.s",
         "_arm64.go",
+ +      "_loong64.s",
+ +      "_loong64.go",
         "_riscv64.s",
         "_riscv64.go",
         "_wasm.s",
@@@ -310,6 -309,8 +311,6 @@@ func bootstrapFixImports(srcFile string
                 if strings.HasPrefix(line, `import "`) || strings.HasPrefix(line, `import . "`) ||
                         inBlock && (strings.HasPrefix(line, "\t\"") || strings.HasPrefix(line, "\t. \"") || strings.HasPrefix(line, "\texec \"")) {
                         line = strings.Replace(line, `"cmd/`, `"bootstrap/cmd/`, -1)
- -                      // During bootstrap, must use plain os/exec.
- -                      line = strings.Replace(line, `exec "internal/execabs"`, `"os/exec"`, -1)
                         for _, dir := range bootstrapDirs {
                                 if strings.HasPrefix(dir, "cmd/") {
                                         continue
diff --combined src/cmd/go/internal/work/exec.go

index 7f5fb774ea049fb860aa6a9d497c6271d893b853,6ecd4dcf2cf60a0f5173b9d7c683d82deb9499f7..15b9e1ef45ca41391d7d2196193e904312f45d5e
--- 1/src/cmd/go/internal/work/exec.go
--- 2/src/cmd/go/internal/work/exec.go
+++ b/src/cmd/go/internal/work/exec.go
@@@ -12,16 -12,17 +12,17 @@@ import 
         "encoding/json"
         "errors"
         "fmt"
- -      exec "internal/execabs"
         "internal/lazyregexp"
         "io"
         "io/fs"
         "log"
         "math/rand"
         "os"
+ +      "os/exec"
         "path/filepath"
         "regexp"
         "runtime"
+       "sort"
         "strconv"
         "strings"
         "sync"
@@@ -2654,8 -2655,6 +2655,8 @@@ func (b *Builder) gccArchArgs() []strin
                 } else if cfg.GOMIPS == "softfloat" {
                         return append(args, "-msoft-float")
                 }
+ +      case "loong64":
+ +              return []string{"-mabi=lp64d"}
         case "ppc64":
                 if cfg.Goos == "aix" {
                         return []string{"-maix64"}
@@@ -2993,7 -2992,26 +2994,26 @@@ func (b *Builder) dynimport(a *Action, 
                 return err
         }
   
-       linkobj := str.StringList(ofile, outObj, mkAbsFiles(p.Dir, p.SysoFiles))
+       // Gather .syso files from this package and all (transitive) dependencies.
+       var syso []string
+       seen := make(map[*Action]bool)
+       var gatherSyso func(*Action)
+       gatherSyso = func(a1 *Action) {
+               if seen[a1] {
+                       return
+               }
+               seen[a1] = true
+               if p1 := a1.Package; p1 != nil {
+                       syso = append(syso, mkAbsFiles(p1.Dir, p1.SysoFiles)...)
+               }
+               for _, a2 := range a1.Deps {
+                       gatherSyso(a2)
+               }
+       }
+       gatherSyso(a)
+       sort.Strings(syso)
+       str.Uniq(&syso)
+       linkobj := str.StringList(ofile, outObj, syso)
         dynobj := objdir + "_cgo_.o"
   
         ldflags := cgoLDFLAGS
diff --combined src/cmd/link/internal/ld/lib.go

index 4aefa9991dfc2a738341006fdd9e93f0d152eab8,680f509ec57ac06305fc066459312ed82c00cf90..04b2556ea1ecb6ef76d95ea37530c5a8ab336232
--- 1/src/cmd/link/internal/ld/lib.go
--- 2/src/cmd/link/internal/ld/lib.go
+++ b/src/cmd/link/internal/ld/lib.go
@@@ -34,6 -34,7 +34,7 @@@ import 
         "bytes"
         "cmd/internal/bio"
         "cmd/internal/goobj"
+       "cmd/internal/notsha256"
         "cmd/internal/objabi"
         "cmd/internal/sys"
         "cmd/link/internal/loadelf"
@@@ -42,18 -43,17 +43,17 @@@
         "cmd/link/internal/loadpe"
         "cmd/link/internal/loadxcoff"
         "cmd/link/internal/sym"
-       "crypto/sha1"
         "debug/elf"
         "debug/macho"
         "encoding/base64"
         "encoding/binary"
         "fmt"
         "internal/buildcfg"
- -      exec "internal/execabs"
         "io"
         "io/ioutil"
         "log"
         "os"
+ +      "os/exec"
         "path/filepath"
         "runtime"
         "strings"
@@@ -929,7 -929,7 +929,7 @@@ func typeSymbolMangle(name string) stri
         if len(name) <= 14 && !strings.Contains(name, "@") { // Issue 19529
                 return name
         }
-       hash := sha1.Sum([]byte(name))
+       hash := notsha256.Sum256([]byte(name))
         prefix := "type."
         if name[5] == '.' {
                 prefix = "type.."
@@@ -1059,6 -1059,8 +1059,8 @@@ var hostobj []Hostob
   // These packages can use internal linking mode.
   // Others trigger external mode.
   var internalpkg = []string{
+       "crypto/internal/boring",
+       "crypto/internal/boring/syso",
         "crypto/x509",
         "net",
         "os/user",
diff --combined src/go/build/build.go

index cf8886c7871e0e2fe36d359282b5bce5d8caf0b1,b373feab3316b6d938c2665ccdb113cd9bee692a..836e279d924f2798bf46080eeda104a34380e955
--- 1/src/go/build/build.go
--- 2/src/go/build/build.go
+++ b/src/go/build/build.go
@@@ -13,13 -13,13 +13,13 @@@ import 
         "go/doc"
         "go/token"
         "internal/buildcfg"
- -      exec "internal/execabs"
         "internal/goroot"
         "internal/goversion"
         "io"
         "io/fs"
         "io/ioutil"
         "os"
+ +      "os/exec"
         pathpkg "path"
         "path/filepath"
         "runtime"
@@@ -1876,6 -1876,7 +1876,7 @@@ func (ctxt *Context) eval(x constraint.
   //    cgo (if cgo is enabled)
   //    $GOOS
   //    $GOARCH
+ //    boringcrypto
   //    ctxt.Compiler
   //    linux (if GOOS = android)
   //    solaris (if GOOS = illumos)
@@@ -1906,6 -1907,9 +1907,9 @@@ func (ctxt *Context) matchTag(name stri
         if name == "unix" && unixOS[ctxt.GOOS] {
                 return true
         }
+       if name == "boringcrypto" {
+               name = "goexperiment.boringcrypto" // boringcrypto is an old name for goexperiment.boringcrypto
+       }
   
         // other tags
         for _, tag := range ctxt.BuildTags {
diff --combined src/go/build/deps_test.go

index 8e24ca937b43ab3ee21117b4163645209942b4f0,91220a88bbad45164b6d280c81a4eb9269d7cc88..8519b82059274b1e0e85e5e2fedffee2db9288c6
--- 1/src/go/build/deps_test.go
--- 2/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@@ -203,10 -203,15 +203,10 @@@ var depsRules = 
   
         log !< FMT;
   
- -      OS, FMT
- -      < internal/execabs;
- -
- -      OS, internal/execabs
- -      < internal/goroot;
- -
         # Misc packages needing only FMT.
         FMT
         < html,
+ +        internal/goroot,
           mime/quotedprintable,
           net/internal/socktest,
           net/url,
@@@ -392,9 -397,17 +392,17 @@@
         NET, log
         < net/mail;
   
+       NONE < crypto/internal/boring/sig, crypto/internal/boring/syso;
+       sync/atomic < crypto/internal/boring/fipstls;
+       crypto/internal/boring/sig, crypto/internal/boring/fipstls < crypto/tls/fipsonly;
+ 
         # CRYPTO is core crypto algorithms - no cgo, fmt, net.
         # Unfortunately, stuck with reflect via encoding/binary.
-       encoding/binary, golang.org/x/sys/cpu, hash
+       crypto/internal/boring/sig,
+       crypto/internal/boring/syso,
+       encoding/binary,
+       golang.org/x/sys/cpu,
+       hash
         < crypto
         < crypto/subtle
         < crypto/internal/subtle
@@@ -403,6 -416,8 +411,8 @@@
         < crypto/ed25519/internal/edwards25519/field, golang.org/x/crypto/curve25519/internal/field
         < crypto/ed25519/internal/edwards25519
         < crypto/cipher
+       < crypto/internal/boring
+       < crypto/boring
         < crypto/aes, crypto/des, crypto/hmac, crypto/md5, crypto/rc4,
           crypto/sha1, crypto/sha256, crypto/sha512
         < CRYPTO;
@@@ -411,6 -426,7 +421,7 @@@
   
         # CRYPTO-MATH is core bignum-based crypto - no cgo, net; fmt now ok.
         CRYPTO, FMT, math/big, embed
+       < crypto/internal/boring/bbig
         < crypto/internal/randutil
         < crypto/rand
         < crypto/ed25519
@@@ -432,13 -448,15 +443,15 @@@
         < golang.org/x/crypto/chacha20poly1305
         < golang.org/x/crypto/hkdf
         < crypto/x509/internal/macos
-       < crypto/x509/pkix
+       < crypto/x509/pkix;
+ 
+       crypto/internal/boring/fipstls, crypto/x509/pkix
         < crypto/x509
         < crypto/tls;
   
         # crypto-aware packages
   
-       CRYPTO, DEBUG, go/build, go/types, text/scanner
+       DEBUG, go/build, go/types, text/scanner, crypto/md5
         < internal/pkgbits
         < go/internal/gcimporter, go/internal/gccgoimporter, go/internal/srcimporter
         < go/importer;
@@@ -636,6 -654,9 +649,9 @@@ func findImports(pkg string) ([]string
         }
         var imports []string
         var haveImport = map[string]bool{}
+       if pkg == "crypto/internal/boring" {
+               haveImport["C"] = true // kludge: prevent C from appearing in crypto/internal/boring imports
+       }
         fset := token.NewFileSet()
         for _, file := range files {
                 name := file.Name()
author	Russ Cox <rsc@golang.org>
	Tue, 3 May 2022 02:12:30 +0000 (22:12 -0400)
committer	Russ Cox <rsc@golang.org>
	Tue, 3 May 2022 02:12:49 +0000 (22:12 -0400)
		1	2
src/cmd/cgo/main.go	patch \|	diff1 \|	diff2 \|	blob \| history
src/cmd/compile/internal/typecheck/iexport.go	patch \|	diff1 \|	diff2 \|	blob \| history
src/cmd/dist/buildtool.go	patch \|	diff1 \|	diff2 \|	blob \| history
src/cmd/go/internal/work/exec.go	patch \|	diff1 \|	diff2 \|	blob \| history
src/cmd/link/internal/ld/lib.go	patch \|	diff1 \|	diff2 \|	blob \| history
src/go/build/build.go	patch \|	diff1 \|	diff2 \|	blob \| history
src/go/build/deps_test.go	patch \|	diff1 \|	diff2 \|	blob \| history