diff -Nru gcl-2.6.12/debian/changelog gcl-2.6.12/debian/changelog
--- gcl-2.6.12/debian/changelog	2020-12-04 14:51:41.000000000 +0000
+++ gcl-2.6.12/debian/changelog	2020-12-11 18:52:30.000000000 +0000
@@ -1,3 +1,13 @@
+gcl (2.6.12-100+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 2.6.12-83+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 24 Jul 2019 23:08:39 +0000]
+  * Make an error message more explicit.
+  * Use the "arm" not the "armhf" relocations code,
+    the "armhf" code is intended for systems that use thumb, which raspbian
+    doesn't.
+
+ -- Raspbian forward porter <root@raspbian.org>  Fri, 11 Dec 2020 18:52:30 +0000
+
 gcl (2.6.12-100) unstable; urgency=medium
 
   * Version_2.6.13pre97
diff -Nru gcl-2.6.12/debian/patches/dont-use-armhf-relocs.patch gcl-2.6.12/debian/patches/dont-use-armhf-relocs.patch
--- gcl-2.6.12/debian/patches/dont-use-armhf-relocs.patch	1970-01-01 00:00:00.000000000 +0000
+++ gcl-2.6.12/debian/patches/dont-use-armhf-relocs.patch	2020-12-11 18:52:30.000000000 +0000
@@ -0,0 +1,17 @@
+Description:  Use the "arm" not the "armhf" relocations code,
+ the "armhf" code is intended for systems that use thumb, which raspbian
+ doesn't.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+--- gcl-2.6.12.orig/h/armhf-linux.h
++++ gcl-2.6.12/h/armhf-linux.h
+@@ -11,7 +11,7 @@
+ 
+ #define SGC
+ 
+-#define RELOC_H "elf32_armhf_reloc.h"
+-#define SPECIAL_RELOC_H "elf32_armhf_reloc_special.h"
++#define RELOC_H "elf32_arm_reloc.h"
++#define SPECIAL_RELOC_H "elf32_arm_reloc_special.h"
+ 
+ #define NEED_STACK_CHK_GUARD
diff -Nru gcl-2.6.12/debian/patches/make-error-more-explicit.patch gcl-2.6.12/debian/patches/make-error-more-explicit.patch
--- gcl-2.6.12/debian/patches/make-error-more-explicit.patch	1970-01-01 00:00:00.000000000 +0000
+++ gcl-2.6.12/debian/patches/make-error-more-explicit.patch	2020-12-11 18:52:30.000000000 +0000
@@ -0,0 +1,29 @@
+Description:  Make an error message more explicit.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2019-07-24
+
+Index: gcl-2.6.12/o/sfaslelf.c
+===================================================================
+--- gcl-2.6.12.orig/o/sfaslelf.c
++++ gcl-2.6.12/o/sfaslelf.c
+@@ -183,7 +183,7 @@ relocate(Sym *sym1,void *v,ul a,ul start
+ #include RELOC_H
+ 
+   default:
+-    massert(!emsg("Unknown reloc type %lu\n", tp));
++    massert(!emsg("Unknown reloc type %lu in relocate function of sfaslelf.c RELOC_H=%s\n", tp, RELOC_H));
+ 
+   }
+ 
diff -Nru gcl-2.6.12/debian/patches/series gcl-2.6.12/debian/patches/series
--- gcl-2.6.12/debian/patches/series	2020-12-04 14:51:30.000000000 +0000
+++ gcl-2.6.12/debian/patches/series	2020-12-11 18:52:30.000000000 +0000
@@ -116,3 +116,5 @@
 Version_2_6_13pre94
 Version_2_6_13pre95
 Version_2.6.13pre96
+make-error-more-explicit.patch
+dont-use-armhf-relocs.patch