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

am f2d8c357: Merge "Remove misleading arm/arm64 PIC_SYM."

Browse Source 
* commit 'f2d8c357eec1bbc4e7441942dfc338ad1d9a207a':
  Remove misleading arm/arm64 PIC_SYM.
This commit is contained in:
Elliott Hughes
2014-08-08 16:21:23 +00:00
committed by Android Git Automerger
parent e2005cdae0 f2d8c357ee
commit b763b7d6d5
9 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libc/arch-arm/bionic/_setjmp.S
View File

@@ -107,7 +107,7 @@ ENTRY(_longjmp)
/* validation failed, die die die. */ /* validation failed, die die die. */
botch: botch:
bl PIC_SYM(longjmperror, PLT) bl longjmperror
bl PIC_SYM(abort, PLT) bl abort
b . - 8 /* Cannot get here */ b . - 8 /* Cannot get here */
END(_longjmp) END(_longjmp)

2
libc/arch-arm/bionic/abort_arm.S
View File

@@ -40,5 +40,5 @@ ENTRY(abort)
.cfi_def_cfa_offset 8 .cfi_def_cfa_offset 8
.cfi_rel_offset r3, 0 .cfi_rel_offset r3, 0
.cfi_rel_offset r14, 4 .cfi_rel_offset r14, 4
bl PIC_SYM(__libc_android_abort, PLT) bl __libc_android_abort
END(abort) END(abort)

8
libc/arch-arm/bionic/setjmp.S
View File

@@ -56,7 +56,7 @@ ENTRY(setjmp)
.cfi_rel_offset r14, 4 .cfi_rel_offset r14, 4
mov r0, #0x00000000 mov r0, #0x00000000
bl PIC_SYM(sigblock, PLT) bl sigblock
mov r1, r0 mov r1, r0
ldmfd sp!, {r0, r14} ldmfd sp!, {r0, r14}
@@ -108,7 +108,7 @@ ENTRY(longjmp)
.cfi_adjust_cfa_offset 4 .cfi_adjust_cfa_offset 4
mov r0, r2 mov r0, r2
bl PIC_SYM(sigsetmask, PLT) bl sigsetmask
add sp, sp, #4 /* unalign the stack */ add sp, sp, #4 /* unalign the stack */
.cfi_adjust_cfa_offset -4 .cfi_adjust_cfa_offset -4
@@ -147,7 +147,7 @@ ENTRY(longjmp)
/* validation failed, die die die. */ /* validation failed, die die die. */
botch: botch:
bl PIC_SYM(longjmperror, PLT) bl longjmperror
bl PIC_SYM(abort, PLT) bl abort
b . - 8 /* Cannot get here */ b . - 8 /* Cannot get here */
END(longjmp) END(longjmp)

8
libc/arch-arm/bionic/sigsetjmp.S
View File

@@ -50,8 +50,8 @@
ENTRY(sigsetjmp) ENTRY(sigsetjmp)
teq r1, #0 teq r1, #0
beq PIC_SYM(_setjmp, PLT) beq _setjmp
b PIC_SYM(setjmp, PLT) b setjmp
END(sigsetjmp) END(sigsetjmp)
.L_setjmp_magic: .L_setjmp_magic:
@@ -61,6 +61,6 @@ ENTRY(siglongjmp)
ldr r2, .L_setjmp_magic ldr r2, .L_setjmp_magic
ldr r3, [r0] ldr r3, [r0]
teq r2, r3 teq r2, r3
beq PIC_SYM(_longjmp, PLT) beq _longjmp
b PIC_SYM(longjmp, PLT) b longjmp
END(siglongjmp) END(siglongjmp)

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

@@ -50,10 +50,4 @@
#undef __bionic_asm_function_type #undef __bionic_asm_function_type
#define __bionic_asm_function_type #function #define __bionic_asm_function_type #function
#if defined(__ELF__) && defined(PIC)
#define PIC_SYM(x,y) x ## ( ## y ## )
#else
#define PIC_SYM(x,y) x
#endif
#endif /* !_ARM_ASM_H_ */ #endif /* !_ARM_ASM_H_ */

4
libc/arch-arm64/bionic/_setjmp.S
View File

@@ -105,7 +105,7 @@ ENTRY(_longjmp)
/* validation failed, die die die */ /* validation failed, die die die */
.L_fail: .L_fail:
bl PIC_SYM(longjmperror, PLT) bl longjmperror
bl PIC_SYM(abort, PLT) bl abort
b . - 8 /* Cannot get here */ b . - 8 /* Cannot get here */
END(_longjmp) END(_longjmp)

6
libc/arch-arm64/bionic/setjmp.S
View File

@@ -45,7 +45,7 @@ ENTRY(setjmp)
stp x0, x30, [sp, #-16]! stp x0, x30, [sp, #-16]!
mov x0, xzr mov x0, xzr
bl PIC_SYM(sigblock, PLT) bl sigblock
mov w1, w0 mov w1, w0
ldp x0, x30, [sp], #16 ldp x0, x30, [sp], #16
@@ -117,7 +117,7 @@ ENTRY(longjmp)
/* validation failed, die die die */ /* validation failed, die die die */
.L_fail: .L_fail:
bl PIC_SYM(longjmperror, PLT) bl longjmperror
bl PIC_SYM(abort, PLT) bl abort
b . - 8 /* Cannot get here */ b . - 8 /* Cannot get here */
END(longjmp) END(longjmp)

8
libc/arch-arm64/bionic/sigsetjmp.S
View File

@@ -35,8 +35,8 @@
*/ */
ENTRY(sigsetjmp) ENTRY(sigsetjmp)
cbz w1, PIC_SYM(_setjmp, PLT) cbz w1, _setjmp
b PIC_SYM(setjmp, PLT) b setjmp
END(sigsetjmp) END(sigsetjmp)
.L_setjmp_magic: .L_setjmp_magic:
@@ -46,6 +46,6 @@ ENTRY(siglongjmp)
ldr w2, .L_setjmp_magic ldr w2, .L_setjmp_magic
ldr w3, [x0] ldr w3, [x0]
cmp w2, w3 cmp w2, w3
b.eq PIC_SYM(_longjmp, PLT) b.eq _longjmp
b PIC_SYM(longjmp, PLT) b longjmp
END(siglongjmp) END(siglongjmp)

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

@@ -45,10 +45,4 @@
#undef __bionic_asm_function_type #undef __bionic_asm_function_type
#define __bionic_asm_function_type %function #define __bionic_asm_function_type %function
#if defined(__ELF__) && defined(PIC)
#define PIC_SYM(x,y) x ## ( ## y ## )
#else
#define PIC_SYM(x,y) x
#endif
#endif /* _AARCH64_ASM_H_ */ #endif /* _AARCH64_ASM_H_ */