From fd2a3fb06e293290828b850fe3ad31824ad73a8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Tue, 21 Jan 2020 10:24:40 +0100 Subject: [PATCH] Rebase to go1.14beta1 Resolves: BZ#1792475 --- .gitignore | 1 + ...-go-disable-Google-s-proxy-and-sumdb.patch | 28 +++--- arm32-fix.patch | 86 +++++++++++++++++++ golang.spec | 15 ++-- sources | 2 +- 5 files changed, 115 insertions(+), 17 deletions(-) create mode 100644 arm32-fix.patch diff --git a/.gitignore b/.gitignore index 2f45c1b..1580135 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ /go1.13.4.src.tar.gz /go1.13.5.src.tar.gz /go1.13.6.src.tar.gz +/go1.14beta1.src.tar.gz diff --git a/0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch b/0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch index 0413f7a..a6235e4 100644 --- a/0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch +++ b/0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch @@ -1,28 +1,34 @@ -From 014cbe9e8cdc1a5f78f3e792309133eaaabdfc8f Mon Sep 17 00:00:00 2001 +From b38cd2374c2395f5a77802ef8ea3d7ac5b8a86ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Mon, 27 May 2019 15:12:53 +0200 Subject: [PATCH 3/3] cmd/go: disable Google's proxy and sumdb --- - src/cmd/go/internal/cfg/cfg.go | 4 ++-- - src/cmd/go/testdata/script/mod_sumdb_golang.txt | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) + src/cmd/go/internal/cfg/cfg.go | 10 +++++----- + src/cmd/go/testdata/script/mod_sumdb_golang.txt | 6 +++--- + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go -index a0b51a72c3..b972a81df2 100644 +index 61dc6bdda6..e8658dc56c 100644 --- a/src/cmd/go/internal/cfg/cfg.go +++ b/src/cmd/go/internal/cfg/cfg.go -@@ -292,8 +292,8 @@ var ( +@@ -245,11 +245,11 @@ var ( GOPPC64 = envOr("GOPPC64", fmt.Sprintf("%s%d", "power", objabi.GOPPC64)) GOWASM = envOr("GOWASM", fmt.Sprint(objabi.GOWASM)) -- GOPROXY = envOr("GOPROXY", "https://proxy.golang.org,direct") -- GOSUMDB = envOr("GOSUMDB", "sum.golang.org") +- GOPROXY = envOr("GOPROXY", "https://proxy.golang.org,direct") +- GOSUMDB = envOr("GOSUMDB", "sum.golang.org") +- GOPRIVATE = Getenv("GOPRIVATE") +- GONOPROXY = envOr("GONOPROXY", GOPRIVATE) +- GONOSUMDB = envOr("GONOSUMDB", GOPRIVATE) + GOPROXY = envOr("GOPROXY", "direct") + GOSUMDB = envOr("GOSUMDB", "off") - GOPRIVATE = Getenv("GOPRIVATE") - GONOPROXY = envOr("GONOPROXY", GOPRIVATE) - GONOSUMDB = envOr("GONOSUMDB", GOPRIVATE) ++ GOPRIVATE = Getenv("GOPRIVATE") ++ GONOPROXY = envOr("GONOPROXY", GOPRIVATE) ++ GONOSUMDB = envOr("GONOSUMDB", GOPRIVATE) + GOINSECURE = Getenv("GOINSECURE") + ) + diff --git a/src/cmd/go/testdata/script/mod_sumdb_golang.txt b/src/cmd/go/testdata/script/mod_sumdb_golang.txt index 40a07fc7e9..50436e32d7 100644 --- a/src/cmd/go/testdata/script/mod_sumdb_golang.txt diff --git a/arm32-fix.patch b/arm32-fix.patch new file mode 100644 index 0000000..c332329 --- /dev/null +++ b/arm32-fix.patch @@ -0,0 +1,86 @@ +From 2ee2c6232c3cb7e2927b964701a81c1591c410db Mon Sep 17 00:00:00 2001 +From: Cherry Zhang +Date: Mon, 30 Dec 2019 11:26:17 -0500 +Subject: [PATCH] runtime: don't use R11 in nanotime1/walltime1 on ARM + +R11 a.k.a. REGTMP is the temp register used by the assembler. It +may be clobbered if the assembler needs to synthesize +instructions. In particular, in nanotime1/walltime1, the load of +global variable runtime.iscgo clobbers it. So, avoid using R11 +to hold a long-lived value. + +Fixes #36309. + +Change-Id: Iec2ab9d664532cad8fbf58da17f580e64a744f62 +Reviewed-on: https://go-review.googlesource.com/c/go/+/212641 +Reviewed-by: Tobias Klauser +Reviewed-by: Andrew G. Morgan +Reviewed-by: Ian Lance Taylor +Run-TryBot: Tobias Klauser +TryBot-Result: Gobot Gobot +--- + src/runtime/sys_linux_arm.s | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/runtime/sys_linux_arm.s b/src/runtime/sys_linux_arm.s +index 8908b1bf23d3..e103da56dc57 100644 +--- a/src/runtime/sys_linux_arm.s ++++ b/src/runtime/sys_linux_arm.s +@@ -269,8 +269,8 @@ noswitch: + + MOVW $CLOCK_REALTIME, R0 + MOVW $8(R13), R1 // timespec +- MOVW runtime·vdsoClockgettimeSym(SB), R11 +- CMP $0, R11 ++ MOVW runtime·vdsoClockgettimeSym(SB), R2 ++ CMP $0, R2 + B.EQ fallback + + // Store g on gsignal's stack, so if we receive a signal +@@ -292,7 +292,7 @@ noswitch: + MOVW (g_stack+stack_lo)(R6), R6 // g.m.gsignal.stack.lo + MOVW g, (R6) + +- BL (R11) ++ BL (R2) + + MOVW $0, R1 + MOVW R1, (R6) // clear g slot, R6 is unchanged by C code +@@ -300,7 +300,7 @@ noswitch: + JMP finish + + nosaveg: +- BL (R11) ++ BL (R2) + JMP finish + + fallback: +@@ -347,8 +347,8 @@ noswitch: + + MOVW $CLOCK_MONOTONIC, R0 + MOVW $8(R13), R1 // timespec +- MOVW runtime·vdsoClockgettimeSym(SB), R11 +- CMP $0, R11 ++ MOVW runtime·vdsoClockgettimeSym(SB), R2 ++ CMP $0, R2 + B.EQ fallback + + // Store g on gsignal's stack, so if we receive a signal +@@ -370,7 +370,7 @@ noswitch: + MOVW (g_stack+stack_lo)(R6), R6 // g.m.gsignal.stack.lo + MOVW g, (R6) + +- BL (R11) ++ BL (R2) + + MOVW $0, R1 + MOVW R1, (R6) // clear g slot, R6 is unchanged by C code +@@ -378,7 +378,7 @@ noswitch: + JMP finish + + nosaveg: +- BL (R11) ++ BL (R2) + JMP finish + + fallback: diff --git a/golang.spec b/golang.spec index 976b80b..b256bac 100644 --- a/golang.spec +++ b/golang.spec @@ -104,12 +104,12 @@ %global gohostarch s390x %endif -%global go_api 1.13 -%global go_version 1.13.6 +%global go_api 1.14 +%global go_version 1.14beta1 Name: golang -Version: 1.13.6 -Release: 1%{?dist} +Version: 1.14 +Release: 0.beta1.0%{?dist} Summary: The Go Programming Language # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain License: BSD and Public Domain @@ -220,6 +220,7 @@ Requires: go-srpm-macros Patch1: 0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch Patch2: 0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch Patch3: 0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch +Patch4: arm32-fix.patch # Having documentation separate was broken Obsoletes: %{name}-docs < 1.1-4 @@ -581,7 +582,11 @@ fi %endif %changelog -* Mon Jan 13 2020 Jakub Čajka - 1.13.6-1 +* Mon Jan 20 2020 Jakub Čajka - 1.14-0.beta1.0 +- Rebase to go1.14beta1 +- Resolves: BZ#1792475 + +* Mon Jan 13 2020 Jakub Čajka - 1.13.6-1 - Rebase to go1.13.6 * Thu Dec 05 2019 Jakub Čajka - 1.13.5-1 diff --git a/sources b/sources index e30151f..ba77245 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.13.6.src.tar.gz) = dffb6e06eea0b1541901dfbed8d28e8cc1eac3184dc40a19ed3637737df796a67a2e7170b228e1003d36b14e6f0f13bb8be9d2a702834a9c06228d1821659528 +SHA512 (go1.14beta1.src.tar.gz) = d225365d6b940100b3b18326aac3d2d33aba1acde86b8492a6be7c7172c6ed1f667ececbb9cd65c521081c698e1282a12bb6ad77cad2325a6e660895ce031ad8