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

Android is all-PIC/PIE.

Browse Source 
Clean up the x86/x86_64 assembler. The motivator (other than reducing
confusion) was that asm.h incorrectly checked PIC rather than __PIC__.

Bug: 16823325

(cherry picked from commit 6b6364a7fc)

Change-Id: I89ca57fa0eb34a36de6cb11ea85f71054fce709d
This commit is contained in:
Elliott Hughes
2014-08-07 10:51:32 -07:00
parent 3e7b8e2a8b
commit 43227c0b40
7 changed files with 2 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,6 @@
#ifndef _I386_ASM_H_
#define _I386_ASM_H_
#ifdef PIC
#define PIC_PROLOGUE \
pushl %ebx; \
call 1f; \
@@ -49,13 +48,6 @@
#define PIC_PLT(x) x@PLT
#define PIC_GOT(x) x@GOT(%ebx)
#define PIC_GOTOFF(x) x@GOTOFF(%ebx)
#else
#define PIC_PROLOGUE
#define PIC_EPILOGUE
#define PIC_PLT(x) x
#define PIC_GOT(x) x
#define PIC_GOTOFF(x) x
#endif
/* let kernels and others override entrypoint alignment */
#if !defined(_ALIGN_TEXT) && !defined(_KERNEL)