diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-16 19:25:24 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-16 19:25:24 +0000 |
commit | 72ca0d52ddd1bcc243afe80b78fd9d0e0a6cc936 (patch) | |
tree | 366eb95223e97792f05d22eec56b675c5a0b33ec /debian/patches | |
parent | Adding upstream version 1.22.1. (diff) | |
download | golang-1.22-72ca0d52ddd1bcc243afe80b78fd9d0e0a6cc936.tar.xz golang-1.22-72ca0d52ddd1bcc243afe80b78fd9d0e0a6cc936.zip |
Adding debian version 1.22.1-1.debian/1.22.1-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
3 files changed, 69 insertions, 0 deletions
diff --git a/debian/patches/0001-Skip-flaky-TestCrashDumpsAllThreads-on-mips64le.patch b/debian/patches/0001-Skip-flaky-TestCrashDumpsAllThreads-on-mips64le.patch new file mode 100644 index 0000000..5c5881f --- /dev/null +++ b/debian/patches/0001-Skip-flaky-TestCrashDumpsAllThreads-on-mips64le.patch @@ -0,0 +1,24 @@ +From: Shengjing Zhu <zhsj@debian.org> +Date: Mon, 26 Feb 2024 17:03:06 +0800 +Subject: Skip flaky TestCrashDumpsAllThreads on mips64le + +crash_unix_test.go:145: found 3 instances of main.crashDumpsAllThreadsLoop; expected 4 +--- + src/runtime/crash_unix_test.go | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/runtime/crash_unix_test.go b/src/runtime/crash_unix_test.go +index 123a462..20a7ca6 100644 +--- a/src/runtime/crash_unix_test.go ++++ b/src/runtime/crash_unix_test.go +@@ -59,6 +59,10 @@ func TestCrashDumpsAllThreads(t *testing.T) { + t.Skip("-quick") + } + ++ if runtime.GOARCH == "mips64le" { ++ t.Skipf("skipping; flaky on %s", runtime.GOARCH) ++ } ++ + switch runtime.GOOS { + case "darwin", "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "illumos", "solaris": + default: diff --git a/debian/patches/0002-cmd-link-internal-riscv64-generate-local-text-symbol.patch b/debian/patches/0002-cmd-link-internal-riscv64-generate-local-text-symbol.patch new file mode 100644 index 0000000..1797128 --- /dev/null +++ b/debian/patches/0002-cmd-link-internal-riscv64-generate-local-text-symbol.patch @@ -0,0 +1,43 @@ +From: Joel Sing <joel@sing.id.au> +Date: Tue, 27 Feb 2024 23:57:43 +1100 +Subject: cmd/link/internal/riscv64: generate local text symbols for + R_RISCV_CALL + +Correctly generate local text symbols needed for R_RISCV_CALL when +external linking. R_RISCV_CALL was added in CL #520095 as a way of +marking AUIPC+JALR pairs, instead of overloading R_RISCV_PCREL_ITYPE. +However, genSymsLate was not updated to generate local text symbols +for the new relocation type, leading to HI20 symbol lookup failures. + +This issue is detected by cmd/internal/obj/riscv.TestLargeCall, +however this is unfortunately skipped in short mode. + +Fixes #65646 + +Change-Id: I8ee0f13791e0628f31657bf7dae2be8482b689b5 +Reviewed-on: https://go-review.googlesource.com/c/go/+/567375 +Reviewed-by: Mauri de Souza Meneguzzo <mauri870@gmail.com> +Reviewed-by: Carlos Amedee <carlos@golang.org> +Run-TryBot: Joel Sing <joel@sing.id.au> +Reviewed-by: Cherry Mui <cherryyz@google.com> +TryBot-Result: Gopher Robot <gobot@golang.org> +LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> +--- + src/cmd/link/internal/riscv64/asm.go | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/cmd/link/internal/riscv64/asm.go b/src/cmd/link/internal/riscv64/asm.go +index d95de6c..6a4dd01 100644 +--- a/src/cmd/link/internal/riscv64/asm.go ++++ b/src/cmd/link/internal/riscv64/asm.go +@@ -170,8 +170,8 @@ func genSymsLate(ctxt *ld.Link, ldr *loader.Loader) { + relocs := ldr.Relocs(s) + for ri := 0; ri < relocs.Count(); ri++ { + r := relocs.At(ri) +- if r.Type() != objabi.R_RISCV_PCREL_ITYPE && r.Type() != objabi.R_RISCV_PCREL_STYPE && +- r.Type() != objabi.R_RISCV_TLS_IE { ++ if r.Type() != objabi.R_RISCV_CALL && r.Type() != objabi.R_RISCV_PCREL_ITYPE && ++ r.Type() != objabi.R_RISCV_PCREL_STYPE && r.Type() != objabi.R_RISCV_TLS_IE { + continue + } + if r.Off() == 0 && ldr.SymType(s) == sym.STEXT { diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..1b83b77 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +0001-Skip-flaky-TestCrashDumpsAllThreads-on-mips64le.patch +0002-cmd-link-internal-riscv64-generate-local-text-symbol.patch |