diff --git a/meta/recipes-devtools/go/go-1.26.2.inc b/meta/recipes-devtools/go/go-1.26.3.inc similarity index 83% rename from meta/recipes-devtools/go/go-1.26.2.inc rename to meta/recipes-devtools/go/go-1.26.3.inc index 8bb10bc89f..db7b18ed2d 100644 --- a/meta/recipes-devtools/go/go-1.26.2.inc +++ b/meta/recipes-devtools/go/go-1.26.3.inc @@ -15,6 +15,5 @@ SRC_URI += "\ file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ file://0010-cmd-go-clear-GOROOT-for-func-ldShared-when-trimpath-.patch \ - file://0011-cmd-link-stop-forcing-binutils-gold-dependency-on-aa.patch \ " -SRC_URI[main.sha256sum] = "2e91ebb6947a96e9436fb2b3926a8802efe63a6d375dffec4f82aa9dbd6fd43b" +SRC_URI[main.sha256sum] = "1c646875d0aa8799133184ed57cf79ff24bdefe8c8820470602a9d3d6d9192b8" diff --git a/meta/recipes-devtools/go/go-binary-native_1.26.2.bb b/meta/recipes-devtools/go/go-binary-native_1.26.3.bb similarity index 80% rename from meta/recipes-devtools/go/go-binary-native_1.26.2.bb rename to meta/recipes-devtools/go/go-binary-native_1.26.3.bb index d9006373f6..135c7fbf5e 100644 --- a/meta/recipes-devtools/go/go-binary-native_1.26.2.bb +++ b/meta/recipes-devtools/go/go-binary-native_1.26.3.bb @@ -9,9 +9,9 @@ PROVIDES = "go-native" # Checksums available at https://go.dev/dl/ SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "990e6b4bbba816dc3ee129eaeaf4b42f17c2800b88a2166c265ac1a200262282" -SRC_URI[go_linux_arm64.sha256sum] = "c958a1fe1b361391db163a485e21f5f228142d6f8b584f6bef89b26f66dc5b23" -SRC_URI[go_linux_ppc64le.sha256sum] = "62b7645dd2404052535617c59e91cf03c7aa28e332dbaddbe4c0d7de7bcc6736" +SRC_URI[go_linux_amd64.sha256sum] = "2b2cfc7148493da5e73981bffbf3353af381d5f93e789c82c79aff64962eb556" +SRC_URI[go_linux_arm64.sha256sum] = "9d89a3ea57d141c2b22d70083f2c8459ba3890f2d9e818e7e933b75614936565" +SRC_URI[go_linux_ppc64le.sha256sum] = "dbd82b50530ead2beb1fd72215117380df3cb16332b51467116dc35b3691dd75" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P\d+(\.\d+)+)\.linux" diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.26.2.bb b/meta/recipes-devtools/go/go-cross-canadian_1.26.3.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross-canadian_1.26.2.bb rename to meta/recipes-devtools/go/go-cross-canadian_1.26.3.bb diff --git a/meta/recipes-devtools/go/go-cross_1.26.2.bb b/meta/recipes-devtools/go/go-cross_1.26.3.bb similarity index 100% rename from meta/recipes-devtools/go/go-cross_1.26.2.bb rename to meta/recipes-devtools/go/go-cross_1.26.3.bb diff --git a/meta/recipes-devtools/go/go-crosssdk_1.26.2.bb b/meta/recipes-devtools/go/go-crosssdk_1.26.3.bb similarity index 100% rename from meta/recipes-devtools/go/go-crosssdk_1.26.2.bb rename to meta/recipes-devtools/go/go-crosssdk_1.26.3.bb diff --git a/meta/recipes-devtools/go/go-runtime_1.26.2.bb b/meta/recipes-devtools/go/go-runtime_1.26.3.bb similarity index 100% rename from meta/recipes-devtools/go/go-runtime_1.26.2.bb rename to meta/recipes-devtools/go/go-runtime_1.26.3.bb diff --git a/meta/recipes-devtools/go/go/0011-cmd-link-stop-forcing-binutils-gold-dependency-on-aa.patch b/meta/recipes-devtools/go/go/0011-cmd-link-stop-forcing-binutils-gold-dependency-on-aa.patch deleted file mode 100644 index dda0f2bb71..0000000000 --- a/meta/recipes-devtools/go/go/0011-cmd-link-stop-forcing-binutils-gold-dependency-on-aa.patch +++ /dev/null @@ -1,55 +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 11/11] 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 - -Upstream-Status: Submitted [https://go-review.googlesource.com/c/go/+/391115] ---- - src/cmd/link/internal/ld/lib.go | 21 --------------------- - 1 file changed, 21 deletions(-) - -diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go -index dfc72e02c0..2a2a304113 100644 ---- a/src/cmd/link/internal/ld/lib.go -+++ b/src/cmd/link/internal/ld/lib.go -@@ -1701,27 +1701,6 @@ func (ctxt *Link) hostlink() { - // 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. --- -2.25.1 - diff --git a/meta/recipes-devtools/go/go_1.26.2.bb b/meta/recipes-devtools/go/go_1.26.3.bb similarity index 100% rename from meta/recipes-devtools/go/go_1.26.2.bb rename to meta/recipes-devtools/go/go_1.26.3.bb