Merge tag '2.6.13-5+rpi1' of 172.17.3.10:/build/git/g/gcl into trixie-staging

diff --cc debian/changelog
index efa8292b7591fa388fed945c701c3eafacf863fc,e0cc327820f37193a4bee45819e82524f19266ea..3614df94831af6fced424ddeef09790fa8558bcc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,249 -1,12 +1,259 @@@
 -gcl (2.6.13-5+rpi1) bookworm-staging; urgency=medium
++gcl27 (2.7.1-4+rpi1) trixie-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]
++  [changes brought forward from gcl 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>  Mon, 02 Jan 2023 15:05:20 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 17 May 2025 00:55:37 +0000
++
 +gcl27 (2.7.1-4) unstable; urgency=medium
 +
 +  * Version_2_7_2ore3
 +
 + -- Camm Maguire <camm@debian.org>  Sat, 03 May 2025 09:21:20 -0400
 +
 +gcl27 (2.7.1-3) unstable; urgency=medium
 +
 +  * Version_2_7_2ore2
 +
 + -- Camm Maguire <camm@debian.org>  Tue, 22 Apr 2025 20:39:18 -0400
 +
 +gcl27 (2.7.1-2) unstable; urgency=medium
 +
 +  * Version_2_7_2ore1
 +
 + -- Camm Maguire <camm@debian.org>  Fri, 11 Apr 2025 20:30:34 -0400
 +
 +gcl27 (2.7.1-1) unstable; urgency=medium
 +
 +  * New upstream release
 +
 + -- Camm Maguire <camm@debian.org>  Thu, 10 Apr 2025 21:39:17 -0400
 +
 +gcl27 (2.7.0-36) unstable; urgency=medium
 +
 +  * Version_2_7_0pre39
 +
 + -- Camm Maguire <camm@debian.org>  Mon, 24 Mar 2025 16:30:46 -0400
 +
 +gcl27 (2.7.0-35) unstable; urgency=medium
 +
 +  * Version_2_7_0pre38
 +  * Bug fix: "ftbfs with GCC-15", thanks to Matthias Klose (Closes:
 +    #1096686).
 +
 + -- Camm Maguire <camm@debian.org>  Thu, 06 Mar 2025 10:54:11 -0500
 +
 +gcl27 (2.7.0-34) unstable; urgency=medium
 +
 +  * Version_2_7_0pre37
 +  * Bug fix: "outdated debconf version constraint; inhibits support for
 +    debconf-2.0/cdebconf", thanks to Gioele Barabucci (Closes: #1096166).
 +
 + -- Camm Maguire <camm@debian.org>  Tue, 18 Feb 2025 12:50:30 -0500
 +
 +gcl27 (2.7.0-33) unstable; urgency=medium
 +
 +  * Version_2_7_0pre36
 +
 + -- Camm Maguire <camm@debian.org>  Sat, 08 Feb 2025 15:29:48 -0500
 +
 +gcl27 (2.7.0-32) unstable; urgency=medium
 +
 +  * Version_2_7_0pre35
 +
 + -- Camm Maguire <camm@debian.org>  Sun, 02 Feb 2025 12:00:42 -0500
 +
 +gcl27 (2.7.0-31) unstable; urgency=medium
 +
 +  * Version_2_7_0pre34
 +
 + -- Camm Maguire <camm@debian.org>  Fri, 17 Jan 2025 18:42:15 -0500
 +
 +gcl27 (2.7.0-30) unstable; urgency=medium
 +
 +  * Version_2_7_0pre33
 +
 + -- Camm Maguire <camm@debian.org>  Fri, 27 Dec 2024 13:21:13 -0500
 +
 +gcl27 (2.7.0-29) unstable; urgency=medium
 +
 +  * Version_2_7_0pre32
 +
 + -- Camm Maguire <camm@debian.org>  Mon, 09 Dec 2024 10:00:39 -0500
 +
 +gcl27 (2.7.0-28) unstable; urgency=medium
 +
 +  * Version_2_7_0pre31
 +
 + -- Camm Maguire <camm@debian.org>  Wed, 04 Dec 2024 13:25:14 -0500
 +
 +gcl27 (2.7.0-27) unstable; urgency=medium
 +
 +  * Version_2_7_0pre30
 +
 + -- Camm Maguire <camm@debian.org>  Wed, 04 Dec 2024 07:48:31 -0500
 +
 +gcl27 (2.7.0-26) unstable; urgency=medium
 +
 +  * Version_2_7_0pre29
 +
 + -- Camm Maguire <camm@debian.org>  Sat, 23 Nov 2024 11:33:30 -0500
 +
 +gcl27 (2.7.0-25) unstable; urgency=medium
 +
 +  * Bug fix: "needs rebuild against dh-elpa &gt;=2.1.5", thanks to
 +    spwhitton@spwhitton.name</a>; (Closes: #1077103).
 +
 + -- Camm Maguire <camm@debian.org>  Sun, 28 Jul 2024 12:07:24 -0400
 +
 +gcl27 (2.7.0-24) unstable; urgency=medium
 +
 +  * Version_2_7_0pre27
 +
 + -- Camm Maguire <camm@debian.org>  Fri, 19 Jul 2024 15:04:27 -0400
 +
 +gcl27 (2.7.0-23) unstable; urgency=medium
 +
 +  * Version_2_7_0pre26
 +
 + -- Camm Maguire <camm@debian.org>  Sun, 28 Apr 2024 22:13:09 -0400
 +
 +gcl27 (2.7.0-22) unstable; urgency=medium
 +
 +  * Version_2_7_0pre25
 +
 + -- Camm Maguire <camm@debian.org>  Sun, 28 Apr 2024 07:55:48 -0400
 +
 +gcl27 (2.7.0-21) unstable; urgency=high
 +
 +  * Version_2_7_0pre24
 +  * Bug fix: "recent libc6-dev change causes XDR support to be dropped",
 +    thanks to Aurelien Jarno (Closes: #1065207).
 +
 + -- Camm Maguire <camm@debian.org>  Fri, 15 Mar 2024 20:00:19 -0400
 +
 +gcl27 (2.7.0-20) unstable; urgency=medium
 +
 +  * Version_2_7_0pre23
 +
 + -- Camm Maguire <camm@debian.org>  Thu, 29 Feb 2024 06:51:25 -0500
 +
 +gcl27 (2.7.0-19) unstable; urgency=medium
 +
 +  * Version_2_7_0pre22
 +
 + -- Camm Maguire <camm@debian.org>  Wed, 28 Feb 2024 13:35:45 -0500
 +
 +gcl27 (2.7.0-18) unstable; urgency=medium
 +
 +  * Version_2_7_0pre21
 +
 + -- Camm Maguire <camm@debian.org>  Sat, 24 Feb 2024 08:40:29 -0500
 +
 +gcl27 (2.7.0-17) unstable; urgency=medium
 +
 +  * Version_2_7_0pre20
 +
 + -- Camm Maguire <camm@debian.org>  Fri, 23 Feb 2024 12:23:51 -0500
 +
 +gcl27 (2.7.0-16) unstable; urgency=medium
 +
 +  * Version_2_7_0pre19
 +
 + -- Camm Maguire <camm@debian.org>  Thu, 22 Feb 2024 22:03:20 -0500
 +
 +gcl27 (2.7.0-15) unstable; urgency=medium
 +
 +  * Version_2_7_0pre18
 +
 + -- Camm Maguire <camm@debian.org>  Thu, 22 Feb 2024 15:00:44 -0500
 +
 +gcl27 (2.7.0-14) unstable; urgency=medium
 +
 +  * Version_2_7_0pre17
 +
 + -- Camm Maguire <camm@debian.org>  Wed, 21 Feb 2024 08:03:46 -0500
 +
 +gcl27 (2.7.0-13) unstable; urgency=medium
 +
 +  * Version_2_7_0pre16
 +
 + -- Camm Maguire <camm@debian.org>  Wed, 21 Feb 2024 00:17:54 -0500
 +
 +gcl27 (2.7.0-12) unstable; urgency=medium
 +
 +  * Version_2_7_0pre15
 +
 + -- Camm Maguire <camm@debian.org>  Mon, 19 Feb 2024 19:08:05 -0500
 +
 +gcl27 (2.7.0-11) unstable; urgency=medium
 +
 +  * Version_2_7_0pre14
 +
 + -- Camm Maguire <camm@debian.org>  Mon, 19 Feb 2024 11:04:51 -0500
 +
 +gcl27 (2.7.0-10) unstable; urgency=medium
 +
 +  * Version_2_7_0pre13
 +
 + -- Camm Maguire <camm@debian.org>  Sun, 28 Jan 2024 20:17:32 -0500
 +
 +gcl27 (2.7.0-9) unstable; urgency=medium
 +
 +  * Version_2_7_0pre12
 +
 + -- Camm Maguire <camm@debian.org>  Sun, 28 Jan 2024 18:09:15 -0500
 +
 +gcl27 (2.7.0-8) unstable; urgency=medium
 +
 +  * Version_2_7_0pre11
 +
 + -- Camm Maguire <camm@debian.org>  Sun, 28 Jan 2024 10:36:24 -0500
 +
 +gcl27 (2.7.0-7) unstable; urgency=medium
 +
 +  * Version_2_7_0pre10
 +
 + -- Camm Maguire <camm@debian.org>  Sat, 27 Jan 2024 12:35:03 -0500
 +
 +gcl27 (2.7.0-6) unstable; urgency=medium
 +
 +  * Version_2_7_0pre9
 +
 + -- Camm Maguire <camm@debian.org>  Thu, 21 Dec 2023 15:02:31 -0500
 +
 +gcl27 (2.7.0-5) unstable; urgency=medium
 +
 +  * Version_2_7_0pre8
 +
 + -- Camm Maguire <camm@debian.org>  Thu, 21 Dec 2023 13:08:00 -0500
 +
 +gcl27 (2.7.0-4) unstable; urgency=medium
 +
 +  * Version_2_7_0pre7
 +
 + -- Camm Maguire <camm@debian.org>  Thu, 21 Dec 2023 09:37:49 -0500
 +
 +gcl27 (2.7.0-3) unstable; urgency=medium
 +
 +  * Version_2_7_0pre5
 +
 + -- Camm Maguire <camm@debian.org>  Wed, 20 Dec 2023 19:43:39 -0500
 +
 +gcl27 (2.7.0-2) unstable; urgency=medium
 +
 +  * Version_2_7_0pre4
 +
 + -- Camm Maguire <camm@debian.org>  Wed, 20 Dec 2023 16:01:04 -0500
 +
 +gcl27 (2.7.0-1) unstable; urgency=medium
 +
 +  * Version_2_7_0pre3
 +
 + -- Camm Maguire <camm@debian.org>  Thu, 14 Dec 2023 16:20:45 -0500
  
  gcl (2.6.13-5) unstable; urgency=medium
  

diff --cc debian/patches/series
index 75c0832893a19a5b2829af36562a37ee0468f97b,03cb86349bfeaa00247d86b40303dd813571836b..42637e89dc4027ef2861a33450edc9538eb0c119
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,6 +1,5 @@@
 -Version_2_6_14pre1
 -Version_2_6_14pre2
 -Version_2_6_14pre3
 -Version_2_6_14pre4
 +Version_2_7_2pre1
 +Version_2_7_2pre2
 +Version_2_7_2ore3
+ make-error-more-explicit.patch
+ dont-use-armhf-relocs.patch

diff --cc h/armhf-linux.h
index 48273229c25b3faaa972ec67f52f48b7ae9cacab,81d86ce7125cfdbde8e3ad8ff4d674f44dba0eb5..fcec61bedc287d691375c7167a0c542dcfc737fc
--- 1/h/armhf-linux.h
--- 2/h/armhf-linux.h
+++ b/h/armhf-linux.h
@@@ -1,10 -1,17 +1,10 @@@
  #include "linux.h"
  
 -#ifdef IN_GBC
 -#undef MPROTECT_ACTION_FLAGS
 -#define MPROTECT_ACTION_FLAGS SA_RESTART|SA_SIGINFO
 -#define GET_FAULT_ADDR(sig,code,sv,a) \
 - ((siginfo_t *)code)->si_addr
 -/*  #define GET_FAULT_ADDR(sig,code,sv,a) \ */
 -/*      ((void *)(*((char ***)(&code)))[44]) */
 -#endif
 -
  #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
 +
 +#define OUTPUT_MACH bfd_mach_arm_9

diff --cc o/sfaslelf.c
index a71c51936098840720613a787e406b19dc3bea67,079f026e73e0b63d9cb007736c0a82972946c6e1..ff75b041bbd74fa748d0204b710a35d59c748aa0
mode 100644,100755..100644
--- 1/o/sfaslelf.c
--- 2/o/sfaslelf.c
+++ b/o/sfaslelf.c