<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 abeeac9cfa12120124bc9d1677be3f8899d9c5bf..bad940fdd339c59e1d66d5ada07dc7673caf657b 100644 (file)
--- 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 2f316651a05deb0f54e50547d176b7feb2071c4e..9b37537845204405ff80548a50ae162a6a9889dc 100644 (file)
--- 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));