|
 |
385abae |
Description: <short summary of the patch>
|
|
|
385abae |
TODO: Put a short summary on the line above and replace this paragraph
|
|
|
385abae |
with a longer explanation of this change. Complete the meta-information
|
|
|
385abae |
with other relevant fields (see below for details). To make it easier, the
|
|
|
385abae |
information below has been extracted from the changelog. Adjust it or drop
|
|
|
385abae |
it.
|
|
|
385abae |
.
|
|
|
385abae |
gcl (2.6.12-83) unstable; urgency=high
|
|
|
385abae |
.
|
|
|
385abae |
* Version_2_6_13pre76
|
|
|
385abae |
* FIx acl2 arm builds (Closes: #919477).
|
|
|
385abae |
Author: Camm Maguire <camm@debian.org>
|
|
|
385abae |
Bug-Debian: https://bugs.debian.org/919477
|
|
|
385abae |
|
|
|
385abae |
---
|
|
|
385abae |
The information above should follow the Patch Tagging Guidelines, please
|
|
|
385abae |
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
|
|
|
385abae |
are templates for supplementary fields that you might want to add:
|
|
|
385abae |
|
|
|
385abae |
Origin: <vendor|upstream|other>, <url of original patch>
|
|
|
385abae |
Bug: <url in upstream bugtracker>
|
|
|
385abae |
Bug-Debian: https://bugs.debian.org/<bugnumber>
|
|
|
385abae |
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
|
|
|
385abae |
Forwarded: <no|not-needed|url proving that it has been forwarded>
|
|
|
385abae |
Reviewed-By: <name and email of someone who approved the patch>
|
|
|
385abae |
Last-Update: 2019-02-05
|
|
|
385abae |
|
|
|
385abae |
--- gcl-2.6.12.orig/h/elf32_arm_reloc.h
|
|
|
385abae |
+++ gcl-2.6.12/h/elf32_arm_reloc.h
|
|
|
385abae |
@@ -18,10 +18,10 @@
|
|
|
385abae |
case R_ARM_JUMP24:
|
|
|
385abae |
{
|
|
|
385abae |
long x=((long)(s+a-p))/4;
|
|
|
385abae |
- if (abs(x)&(~MASK(23))) {/*24?*/
|
|
|
385abae |
+ if (abs(x)&(~MASK(24))) {
|
|
|
385abae |
got+=(sym->st_size-1)*tz;
|
|
|
385abae |
memcpy(got,tramp,sizeof(tramp));
|
|
|
385abae |
- /*relocate*/
|
|
|
385abae |
+ /*recurse on relocate?*/
|
|
|
385abae |
got[sizeof(tramp)/sizeof(*got)]=s;
|
|
|
385abae |
x=((long)got-p)/4;
|
|
|
385abae |
}
|
|
|
385abae |
@@ -29,8 +29,6 @@
|
|
|
385abae |
}
|
|
|
385abae |
break;
|
|
|
385abae |
case R_ARM_V4BX:
|
|
|
385abae |
- add_vals(where,~0L,s+a);
|
|
|
385abae |
- break;
|
|
|
385abae |
case R_ARM_ABS32:
|
|
|
385abae |
add_vals(where,~0L,s+a);
|
|
|
385abae |
break;
|
|
|
385abae |
--- gcl-2.6.12.orig/h/elf32_armhf_reloc.h
|
|
|
385abae |
+++ gcl-2.6.12/h/elf32_armhf_reloc.h
|
|
|
385abae |
@@ -4,7 +4,7 @@
|
|
|
385abae |
case R_ARM_THM_JUMP24:
|
|
|
385abae |
{
|
|
|
385abae |
long x=(long)(s+a-p);
|
|
|
385abae |
- if (1||abs(x)&(~MASK(25))) {
|
|
|
385abae |
+ if (abs(x)&(~MASK(24))) {
|
|
|
385abae |
|
|
|
385abae |
got+=(sym->st_size-1)*tz;
|
|
|
385abae |
memcpy(got,tramp,sizeof(tramp));
|
|
|
385abae |
@@ -32,7 +32,7 @@
|
|
|
385abae |
case R_ARM_THM_CALL:
|
|
|
385abae |
{
|
|
|
385abae |
long x=(long)(s+a-p);
|
|
|
385abae |
- if (1||abs(x)&(~MASK(23))) {/*24?*/
|
|
|
385abae |
+ if (abs(x)&(~MASK(23))) {
|
|
|
385abae |
got+=(sym->st_size-1)*tz;
|
|
|
385abae |
memcpy(got,tramp,sizeof(tramp));
|
|
|
385abae |
|