ex 59fd0c6539f8..000000000000 --- a/lang/go123/files/patch-src_cmd_dist_build.go +++ /dev/null @@ -1,23 +0,0 @@ ---- src/cmd/dist/build.go.orig 2024-03-29 15:27:02 UTC -+++ src/cmd/dist/build.go -@@ -891,6 +891,20 @@ func runInstall(pkg string, ch chan struct{}) { - asmArgs = append(asmArgs, "-D", "GOPPC64_power8") - } - } -+ if goarch == "arm" { -+ // Define GOARM_value from goarm, which can be either a version -+ // like "6", or a version and a FP mode, like "7,hardfloat". -+ switch { -+ case strings.Contains(goarm, "7"): -+ asmArgs = append(asmArgs, "-D", "GOARM_7") -+ fallthrough -+ case strings.Contains(goarm, "6"): -+ asmArgs = append(asmArgs, "-D", "GOARM_6") -+ fallthrough -+ default: -+ asmArgs = append(asmArgs, "-D", "GOARM_5") -+ } -+ } - goasmh := pathf("%s/go_asm.h", workdir) - - // Collect symabis from assembly code. diff --git a/lang/go123/files/patch-src_cmd_go_internal_modload_vendor.go b/lang/go123/files/patch-src_cmd_go_internal_modload_vendor.go deleted file mode 100644 index ba3f97226624..000000000000 --- a/lang/go123/files/patch-src_cmd_go_internal_modload_vendor.go +++ /dev/null @@ -1,11 +0,0 @@ ---- src/cmd/go/internal/modload/vendor.go.orig 2024-02-02 18:09:55 UTC -+++ src/cmd/go/internal/modload/vendor.go -@@ -159,7 +159,7 @@ func checkVendorConsistency(indexes []*modFileIndex, m - panic(fmt.Errorf("not in workspace mode but number of indexes is %v, not 1", len(indexes))) - } - index := indexes[0] -- if gover.Compare(index.goVersion, "1.14") < 0 { -+ if gover.Compare(index.goVersion, "1.14") < 0 || os.Getenv("GO_NO_VENDOR_CHECKS") == "1" { - // Go versions before 1.14 did not include enough information in - // vendor/modules.txt to check for consistency. - // If we know that we're on an earlier version, relax the consistency check.