diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/dev-lang/go/0001-cmd-link-stop-forcing-binutils-gold-dependency-on-aa.patch b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/dev-lang/go/0001-cmd-link-stop-forcing-binutils-gold-dependency-on-aa.patch deleted file mode 100644 index 55c3fa2f40..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/dev-lang/go/0001-cmd-link-stop-forcing-binutils-gold-dependency-on-aa.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 6d265b008e3d106b2706645e5a88cd8e2fb98953 Mon Sep 17 00:00:00 2001 -From: Dirk Müller -Date: Wed, 09 Mar 2022 17:47:23 +0100 -Subject: [PATCH] cmd/link: stop forcing binutils-gold dependency on aarch64 - -The bfd linker appears to be working just fine at least in version -2.41 or above. Reject the known broken one instead, which -avoids an architecture specific linker dependency that -is cumbersome for distributions. - -Fixes #22040. - -Change-Id: I9f377e47c22ef20497479c0978c053ed5de46a38 ---- - -diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go -index 2d8f964..fcf0bc7 100644 ---- a/src/cmd/link/internal/ld/lib.go -+++ b/src/cmd/link/internal/ld/lib.go -@@ -1670,27 +1670,6 @@ - // Use lld to avoid errors from default linker (issue #38838) - altLinker = "lld" - } -- -- if ctxt.Arch.InFamily(sys.ARM64) && buildcfg.GOOS == "linux" { -- // On ARM64, the GNU linker will fail with -- // -znocopyreloc if it thinks a COPY relocation is -- // required. Switch to gold. -- // https://sourceware.org/bugzilla/show_bug.cgi?id=19962 -- // https://go.dev/issue/22040 -- altLinker = "gold" -- -- // If gold is not installed, gcc will silently switch -- // back to ld.bfd. So we parse the version information -- // and provide a useful error if gold is missing. -- name, args := flagExtld[0], flagExtld[1:] -- args = append(args, "-fuse-ld=gold", "-Wl,--version") -- cmd := exec.Command(name, args...) -- if out, err := cmd.CombinedOutput(); err == nil { -- if !bytes.Contains(out, []byte("GNU gold")) { -- log.Fatalf("ARM64 external linker must be gold (issue #15696, 22040), but is not: %s", out) -- } -- } -- } - } - if ctxt.Arch.Family == sys.ARM64 && buildcfg.GOOS == "freebsd" { - // Switch to ld.bfd on freebsd/arm64. -diff --git a/src/make.bash b/src/make.bash -index b67ae15..7df4910 100755 ---- a/src/make.bash -+++ b/src/make.bash -@@ -94,6 +94,16 @@ - ;; - esac - -+# Test for bad bfd.ld -+if test "$(uname -m)" = "aarch64" && ld -v | grep -E "GNU ld.* 2\.([0-3]|40)"; then -+ echo 'ERROR: Your system uses bfd.LD 2.40 or older which has issues with dynamic linking on aarch64' -+ echo 'Consider upgrading or switching to binutils-gold.' -+ echo -+ echo 'See https://sourceware.org/bugzilla/show_bug.cgi?id=30437' -+ -+ exit 1 -+fi -+ - # Test for bad ld. - if ld --version 2>&1 | grep 'gold.* 2\.20' >/dev/null; then - echo 'ERROR: Your system has gold 2.20 installed.' diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/dev-lang/go/README.md b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/dev-lang/go/README.md deleted file mode 100644 index 77663c42ec..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/dev-lang/go/README.md +++ /dev/null @@ -1,6 +0,0 @@ -The `0001-cmd-link-stop-forcing-binutils-gold-dependency-on-aa.patch` -drops the use of the gold linker. Track the following to see when it -needs to be dropped: - -- https://go-review.googlesource.com/c/go/+/391115 -- https://github.com/golang/go/issues/22040