|
|
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-70) unstable; urgency=medium
|
|
|
385abae |
.
|
|
|
385abae |
* Version_2_6_13pre59
|
|
|
385abae |
Author: Camm Maguire <camm@debian.org>
|
|
|
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: 2018-03-12
|
|
|
385abae |
|
|
|
385abae |
--- gcl-2.6.12.orig/h/elf64_alpha_reloc.h
|
|
|
385abae |
+++ gcl-2.6.12/h/elf64_alpha_reloc.h
|
|
|
385abae |
@@ -29,7 +29,7 @@
|
|
|
385abae |
} else
|
|
|
385abae |
*gote=s+a;
|
|
|
385abae |
s=(gote-got)*sizeof(*got);
|
|
|
385abae |
- massert(!(s&~MASK(16)));
|
|
|
385abae |
+ massert(!(s&~MASK(15)));
|
|
|
385abae |
store_val(where,MASK(16),s);
|
|
|
385abae |
break;
|
|
|
385abae |
case R_ALPHA_GPRELHIGH:
|
|
|
385abae |
--- gcl-2.6.12.orig/h/elf64_alpha_reloc_special.h
|
|
|
385abae |
+++ gcl-2.6.12/h/elf64_alpha_reloc_special.h
|
|
|
385abae |
@@ -62,7 +62,6 @@ static int
|
|
|
385abae |
label_got_symbols(void *v1,Shdr *sec1,Shdr *sece,Sym *sym1,Sym *syme,const char *st1,const char *sn,ul *gs) {
|
|
|
385abae |
|
|
|
385abae |
Rela *r,*rr;
|
|
|
385abae |
- Sym *sym;
|
|
|
385abae |
Shdr *sec;
|
|
|
385abae |
void *v,*ve,*vv;
|
|
|
385abae |
ul b,q;
|
|
|
385abae |
@@ -80,8 +79,12 @@ label_got_symbols(void *v1,Shdr *sec1,Sh
|
|
|
385abae |
vv-=sec->sh_entsize,rr=vv);
|
|
|
385abae |
|
|
|
385abae |
b=sizeof(r->r_addend)*4;
|
|
|
385abae |
- q=vv>=v1 ? (rr->r_addend>>b) : ++*gs;
|
|
|
385abae |
- massert(!make_got_room_for_stub(sec1,sece,sym,st1,gs));
|
|
|
385abae |
+ if (vv>=v1)
|
|
|
385abae |
+ q=rr->r_addend>>b;
|
|
|
385abae |
+ else {
|
|
|
385abae |
+ q=++*gs;
|
|
|
385abae |
+ massert(!make_got_room_for_stub(sec1,sece,sym1+ELF_R_SYM(r->r_info),st1,gs));
|
|
|
385abae |
+ }
|
|
|
385abae |
massert(*gs==q || !r->r_addend);
|
|
|
385abae |
massert(!(r->r_addend>>b));
|
|
|
385abae |
r->r_addend|=(q<
|