From 9f5b8dce35c53f79e831332ff7c477246628257c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Thu, 6 Feb 2020 13:40:49 +0100 Subject: [PATCH] Rebase to go1.14rc1 --- .gitignore | 1 + arm32-fix.patch | 86 ------------------------------------------------- golang.spec | 9 ++++-- sources | 2 +- 4 files changed, 8 insertions(+), 90 deletions(-) delete mode 100644 arm32-fix.patch diff --git a/.gitignore b/.gitignore index 1580135..6856aa0 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ /go1.13.5.src.tar.gz /go1.13.6.src.tar.gz /go1.14beta1.src.tar.gz +/go1.14rc1.src.tar.gz diff --git a/arm32-fix.patch b/arm32-fix.patch deleted file mode 100644 index c332329..0000000 --- a/arm32-fix.patch +++ /dev/null @@ -1,86 +0,0 @@ -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 1570b69..3086ffb 100644 --- a/golang.spec +++ b/golang.spec @@ -105,11 +105,11 @@ %endif %global go_api 1.14 -%global go_version 1.14beta1 +%global go_version 1.14rc1 Name: golang Version: 1.14 -Release: 0.beta1.0%{?dist}.1 +Release: 0.rc1.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,7 +220,6 @@ 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 @@ -582,6 +581,10 @@ fi %endif %changelog +* Thu Feb 06 2020 Jakub Čajka - 1.14-0.rc1.0 +- Rebase to go1.14.rc1 +- Related: BZ#1792475 + * Tue Jan 28 2020 Fedora Release Engineering - 1.14-0.beta1.0.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index ba77245..8bcbf86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.14beta1.src.tar.gz) = d225365d6b940100b3b18326aac3d2d33aba1acde86b8492a6be7c7172c6ed1f667ececbb9cd65c521081c698e1282a12bb6ad77cad2325a6e660895ce031ad8 +SHA512 (go1.14rc1.src.tar.gz) = 88324a21139b89264d9b404b9283aef03aa1739e98abdef330ced93acc08bbf2aedf001cf3bae2797e892bce13346b4ed77a51dcdf57905e1f1c546d1f5b585d