diff -Nru golang-1.15-1.15.8/debian/changelog golang-1.15-1.15.8/debian/changelog
--- golang-1.15-1.15.8/debian/changelog	2021-02-15 15:19:39.000000000 +0000
+++ golang-1.15-1.15.8/debian/changelog	2021-03-01 14:34:01.000000000 +0000
@@ -1,3 +1,15 @@
+golang-1.15 (1.15.8-4+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from golang-1.10 1.10~rc2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 24 Feb 2018 12:22:04 +0000]
+  * Build with GOARM=6
+  * Disable testsuite.
+  * Fix clean target.
+
+  [changes introduced in golang-1.12 1.12.7-3+rpi1 by Peter Michael Green]
+  * Further clean target fixing.
+
+ -- Raspbian forward porter <root@raspbian.org>  Mon, 01 Mar 2021 14:34:01 +0000
+
 golang-1.15 (1.15.8-4) unstable; urgency=medium
 
   * Team upload.
diff -Nru golang-1.15-1.15.8/debian/rules golang-1.15-1.15.8/debian/rules
--- golang-1.15-1.15.8/debian/rules	2021-02-15 15:19:39.000000000 +0000
+++ golang-1.15-1.15.8/debian/rules	2021-03-01 14:34:01.000000000 +0000
@@ -6,6 +6,7 @@
 
 export GOROOT := $(CURDIR)
 export GOROOT_FINAL := /usr/lib/go-$(GOVER)
+export GOARM := 6
 
 # Go 1.12 needs a build cache, otherwise the build fails.
 export GOCACHE := $(CURDIR)/pkg/obj/go-build
@@ -16,7 +17,7 @@
 RUN_TESTS := true
 # armel: ???
 # ppc64: ???
-ifneq (,$(filter armel ppc64,$(DEB_HOST_ARCH)))
+ifneq (,$(filter armhf armel ppc64,$(DEB_HOST_ARCH)))
 	RUN_TESTS := false
 endif
 ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
@@ -55,6 +56,14 @@
 	@set -e; cd debian; for x in golang-X.Y-*; do \
 		rm -f -v golang-$(GOVER)-$${x##golang-X.Y-}; \
 	done
+	# more cleanup
+	rm -f `find . -name *.o`
+	rm -f `find . -name *.exe`
+	rm -f src/cmd/go/internal/cfg/zdefaultcc.go
+	rm -f src/cmd/go/internal/cfg/zosarch.go
+	rm -f src/cmd/internal/objabi/zbootstrap.go
+	rm -f src/go/build/zcgo.go
+	rm -f src/cmd/dist/dist
 
 override_dh_prep:
 	dh_prep