From: Camm Maguire <camm@debian.org>
Date: Sun, 13 Nov 2022 12:55:14 +0000 (+0000)
Subject: <short summary of the patch>
X-Git-Tag: archive/raspbian/2.6.13-5+rpi1^2^2~40
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=911d99457cce289755a4fa68b939ab24d00d73ca;p=gcl.git

<short summary of the patch>

Bug-Debian: https://bugs.debian.org/919477

TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.

gcl (2.6.12-83) unstable; urgency=high

  * Version_2_6_13pre78
  * FIx acl2 arm builds (Closes: #919477).

Gbp-Pq: Name Version_2_6_13pre79
---

diff --git a/h/elf32_armhf_reloc.h b/h/elf32_armhf_reloc.h
index 9b375378..1f0f756b 100644
--- a/h/elf32_armhf_reloc.h
+++ b/h/elf32_armhf_reloc.h
@@ -4,7 +4,7 @@
      case R_ARM_THM_JUMP24:
       {
     	long x=(long)(s+a-p);
-    	if (abs(x)&(~MASK(24))) {
+    	if (abs(x)&(~MASK(23))) {
 
           got+=(sym->st_size-1)*tz;
     	  memcpy(got,tramp,sizeof(tramp));
@@ -32,7 +32,7 @@
     case R_ARM_THM_CALL:
       {
     	long x=(long)(s+a-p);
-    	if (abs(x)&(~MASK(23))) {
+    	if (abs(x)&(~MASK(22))) {
           got+=(sym->st_size-1)*tz;
     	  memcpy(got,tramp,sizeof(tramp));