From: Camm Maguire <camm@debian.org>
Date: Thu, 11 Aug 2022 17:16:42 +0000 (+0100)
Subject: <short summary of the patch>
X-Git-Tag: archive/raspbian/2.7.1-4+rpi1~1^2~1^2~38
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b4f16d2a6270eb6416c692630018ed213f6401eb;p=gcl27.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_13pre76
  * FIx acl2 arm builds (Closes: #919477).

Gbp-Pq: Name Version_2_6_13pre77
---

diff --git a/h/elf32_arm_reloc.h b/h/elf32_arm_reloc.h
index abeeac9..bad940f 100644
--- a/h/elf32_arm_reloc.h
+++ b/h/elf32_arm_reloc.h
@@ -18,10 +18,10 @@
     case R_ARM_JUMP24:
       {
 	long x=((long)(s+a-p))/4;
-	if (abs(x)&(~MASK(23))) {/*24?*/
+	if (abs(x)&(~MASK(24))) {
           got+=(sym->st_size-1)*tz;
 	  memcpy(got,tramp,sizeof(tramp));
-	  /*relocate*/
+	  /*recurse on relocate?*/
           got[sizeof(tramp)/sizeof(*got)]=s;
 	  x=((long)got-p)/4;
 	}
@@ -29,8 +29,6 @@
       }
       break;
     case R_ARM_V4BX:
-      add_vals(where,~0L,s+a);
-      break;
     case R_ARM_ABS32:
       add_vals(where,~0L,s+a);
       break;
diff --git a/h/elf32_armhf_reloc.h b/h/elf32_armhf_reloc.h
index 2f31665..9b37537 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 (1||abs(x)&(~MASK(25))) {
+    	if (abs(x)&(~MASK(24))) {
 
           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 (1||abs(x)&(~MASK(23))) {/*24?*/
+    	if (abs(x)&(~MASK(23))) {
           got+=(sym->st_size-1)*tz;
     	  memcpy(got,tramp,sizeof(tramp));