From 2d5fdf9b32c70b10d6ebd962c200e82f421c81ad Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Fri, 5 Feb 2021 20:48:13 +0000
Subject: [PATCH] golang: update to 1.15.8

---
 packages/golang/build.sh                   |  5 +-
 packages/golang/clang11-fix.patch          | 60 ----------------------
 scripts/build/setup/termux_setup_golang.sh |  4 +-
 3 files changed, 4 insertions(+), 65 deletions(-)
 delete mode 100644 packages/golang/clang11-fix.patch

diff --git a/packages/golang/build.sh b/packages/golang/build.sh
index 94735e1d5..d97a77e69 100644
--- a/packages/golang/build.sh
+++ b/packages/golang/build.sh
@@ -2,12 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://golang.org/
 TERMUX_PKG_DESCRIPTION="Go programming language compiler"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
-_MAJOR_VERSION=1.15.6
+_MAJOR_VERSION=1.15.8
 # Use the ~ deb versioning construct in the future:
 TERMUX_PKG_VERSION=2:${_MAJOR_VERSION}
-TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.src.tar.gz
-TERMUX_PKG_SHA256=890bba73c5e2b19ffb1180e385ea225059eb008eb91b694875dd86ea48675817
+TERMUX_PKG_SHA256=540c0ab7781084d124991321ed1458e479982de94454a98afab6acadf38497c2
 TERMUX_PKG_DEPENDS="clang"
 TERMUX_PKG_NO_STATICSPLIT=true
 
diff --git a/packages/golang/clang11-fix.patch b/packages/golang/clang11-fix.patch
deleted file mode 100644
index 015adfc0c..000000000
--- a/packages/golang/clang11-fix.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -uNr go/src/runtime/cgo/gcc_linux_386.c go.mod/src/runtime/cgo/gcc_linux_386.c
---- go/src/runtime/cgo/gcc_linux_386.c	2020-12-03 19:32:44.000000000 +0200
-+++ go.mod/src/runtime/cgo/gcc_linux_386.c	2020-12-29 01:13:05.120640580 +0200
-@@ -12,7 +12,11 @@
- static void (*setg_gcc)(void*);
- 
- // This will be set in gcc_android.c for android-specific customization.
-+#ifdef __ANDROID__
-+extern void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
-+#else
- void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
-+#endif
- 
- void
- x_cgo_init(G *g, void (*setg)(void*), void **tlsg, void **tlsbase)
-diff -uNr go/src/runtime/cgo/gcc_linux_amd64.c go.mod/src/runtime/cgo/gcc_linux_amd64.c
---- go/src/runtime/cgo/gcc_linux_amd64.c	2020-12-03 19:32:44.000000000 +0200
-+++ go.mod/src/runtime/cgo/gcc_linux_amd64.c	2020-12-29 01:11:57.624063728 +0200
-@@ -14,7 +14,11 @@
- static void (*setg_gcc)(void*);
- 
- // This will be set in gcc_android.c for android-specific customization.
-+#ifdef __ANDROID__
-+extern void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
-+#else
- void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
-+#endif
- 
- void
- x_cgo_init(G *g, void (*setg)(void*), void **tlsg, void **tlsbase)
-diff -uNr go/src/runtime/cgo/gcc_linux_arm64.c go.mod/src/runtime/cgo/gcc_linux_arm64.c
---- go/src/runtime/cgo/gcc_linux_arm64.c	2020-12-03 19:32:44.000000000 +0200
-+++ go.mod/src/runtime/cgo/gcc_linux_arm64.c	2020-12-29 01:12:17.648234844 +0200
-@@ -12,7 +12,11 @@
- 
- static void *threadentry(void*);
- 
-+#ifdef __ANDROID__
-+extern void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
-+#else
- void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
-+#endif
- static void (*setg_gcc)(void*);
- 
- void
-diff -uNr go/src/runtime/cgo/gcc_linux_arm.c go.mod/src/runtime/cgo/gcc_linux_arm.c
---- go/src/runtime/cgo/gcc_linux_arm.c	2020-12-03 19:32:44.000000000 +0200
-+++ go.mod/src/runtime/cgo/gcc_linux_arm.c	2020-12-29 01:12:38.656414386 +0200
-@@ -10,7 +10,11 @@
- 
- static void *threadentry(void*);
- 
-+#ifdef __ANDROID__
-+extern void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
-+#else
- void (*x_cgo_inittls)(void **tlsg, void **tlsbase);
-+#endif
- static void (*setg_gcc)(void*);
- 
- void
diff --git a/scripts/build/setup/termux_setup_golang.sh b/scripts/build/setup/termux_setup_golang.sh
index 5675d0ed5..f6e47cd38 100644
--- a/scripts/build/setup/termux_setup_golang.sh
+++ b/scripts/build/setup/termux_setup_golang.sh
@@ -1,7 +1,7 @@
 # Utility function for golang-using packages to setup a go toolchain.
 termux_setup_golang() {
 	if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
-		local TERMUX_GO_VERSION=go1.15.6
+		local TERMUX_GO_VERSION=go1.15.8
 		local TERMUX_GO_PLATFORM=linux-amd64
 
 		local TERMUX_BUILDGO_FOLDER
@@ -20,7 +20,7 @@ termux_setup_golang() {
 		rm -Rf "$TERMUX_COMMON_CACHEDIR/go" "$TERMUX_BUILDGO_FOLDER"
 		termux_download https://golang.org/dl/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz \
 			"$TERMUX_BUILDGO_TAR" \
-		        3918e6cc85e7eaaa6f859f1bdbaac772e7a825b0eb423c63d3ae68b21f84b844
+		        d3379c32a90fdf9382166f8f48034c459a8cc433730bc9476d39d9082c94583b
 
 		( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" )
 	else