generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix our x86 PIC_PROLOGUE.

Browse Source 
The old definition only worked for functions that didn't use numbered
local labels. Upstream uses '666' not only as some kind of BSD in-joke,
but also because there's little likelihood of any function having
labels that high.

There's a wider question about whether we actually want to go via the
PLT at all in this code, but that's a question for another day.

(cherry-pick of 72d7e667c7e926cb120c4edb53cbf74c652ab915.)

Bug: 16906712
Change-Id: I3cd8ecc448b33f942bb6e783931808ef39091489
This commit is contained in:
Elliott Hughes 2014-08-09 18:45:55 -07:00
parent a0db464187
commit ca5b6a74a7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libc/arch-x86/include/machine/asm.h
View File

@ -39,10 +39,10 @@
#define PIC_PROLOGUE \ #define PIC_PROLOGUE \
pushl %ebx; \ pushl %ebx; \
call 1f; \ call 666f; \
1: \ 666: \
popl %ebx; \ popl %ebx; \
addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %ebx addl $_GLOBAL_OFFSET_TABLE_+[.-666b], %ebx
#define PIC_EPILOGUE \ #define PIC_EPILOGUE \
popl %ebx popl %ebx
#define PIC_PLT(x) x@PLT #define PIC_PLT(x) x@PLT