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

am 6a686556: Merge "Remove useless _C_LABEL from our assembler source."

Browse Source 
* commit '6a686556b9f112fdf02ce404d680306ab1d901be':
  Remove useless _C_LABEL from our assembler source.
This commit is contained in:
Elliott Hughes 2014-03-07 22:59:46 +00:00 committed by Android Git Automerger
commit 918b2aa34c
11 changed files with 36 additions and 36 deletions
Show Stats 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(_C_LABEL(longjmperror), PLT) bl PIC_SYM(longjmperror, PLT)
bl PIC_SYM(_C_LABEL(abort), PLT) bl PIC_SYM(abort, PLT)
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(_C_LABEL(__libc_android_abort), PLT) bl PIC_SYM(__libc_android_abort, PLT)
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(_C_LABEL(sigblock), PLT) bl PIC_SYM(sigblock, PLT)
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(_C_LABEL(sigsetmask), PLT) bl PIC_SYM(sigsetmask, PLT)
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(_C_LABEL(longjmperror), PLT) bl PIC_SYM(longjmperror, PLT)
bl PIC_SYM(_C_LABEL(abort), PLT) bl PIC_SYM(abort, PLT)
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(_C_LABEL(_setjmp), PLT) beq PIC_SYM(_setjmp, PLT)
b PIC_SYM(_C_LABEL(setjmp), PLT) b PIC_SYM(setjmp, PLT)
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(_C_LABEL(_longjmp), PLT) beq PIC_SYM(_longjmp, PLT)
b PIC_SYM(_C_LABEL(longjmp), PLT) b PIC_SYM(longjmp, PLT)
END(siglongjmp) END(siglongjmp)

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 */
botch: botch:
bl PIC_SYM(_C_LABEL(longjmperror), PLT) bl PIC_SYM(longjmperror, PLT)
bl PIC_SYM(_C_LABEL(abort), PLT) bl PIC_SYM(abort, PLT)
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(_C_LABEL(sigblock), PLT) bl PIC_SYM(sigblock, PLT)
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 */
botch: botch:
bl PIC_SYM(_C_LABEL(longjmperror), PLT) bl PIC_SYM(longjmperror, PLT)
bl PIC_SYM(_C_LABEL(abort), PLT) bl PIC_SYM(abort, PLT)
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(_C_LABEL(_setjmp), PLT) cbz w1, PIC_SYM(_setjmp, PLT)
b PIC_SYM(_C_LABEL(setjmp), PLT) b PIC_SYM(setjmp, PLT)
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(_C_LABEL(_longjmp), PLT) b.eq PIC_SYM(_longjmp, PLT)
b PIC_SYM(_C_LABEL(longjmp), PLT) b PIC_SYM(longjmp, PLT)
END(siglongjmp) END(siglongjmp)

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

@ -47,9 +47,9 @@ ENTRY(setjmp)
PIC_PROLOGUE PIC_PROLOGUE
pushl $0 pushl $0
#ifdef PIC #ifdef PIC
call PIC_PLT(_C_LABEL(sigblock)) call PIC_PLT(sigblock)
#else #else
call _C_LABEL(sigblock) call sigblock
#endif #endif
addl $4,%esp addl $4,%esp
PIC_EPILOGUE PIC_EPILOGUE
@ -72,9 +72,9 @@ ENTRY(longjmp)
PIC_PROLOGUE PIC_PROLOGUE
pushl 24(%edx) pushl 24(%edx)
#ifdef PIC #ifdef PIC
call PIC_PLT(_C_LABEL(sigsetmask)) call PIC_PLT(sigsetmask)
#else #else
call _C_LABEL(sigsetmask) call sigsetmask
#endif #endif
addl $4,%esp addl $4,%esp
PIC_EPILOGUE PIC_EPILOGUE

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

@ -43,9 +43,9 @@ ENTRY(sigsetjmp)
PIC_PROLOGUE PIC_PROLOGUE
pushl $0 pushl $0
#ifdef PIC #ifdef PIC
call PIC_PLT(_C_LABEL(sigblock)) call PIC_PLT(sigblock)
#else #else
call _C_LABEL(sigblock) call sigblock
#endif #endif
addl $4,%esp addl $4,%esp
PIC_EPILOGUE PIC_EPILOGUE
@ -71,9 +71,9 @@ ENTRY(siglongjmp)
PIC_PROLOGUE PIC_PROLOGUE
pushl 24(%edx) pushl 24(%edx)
#ifdef PIC #ifdef PIC
call PIC_PLT(_C_LABEL(sigsetmask)) call PIC_PLT(sigsetmask)
#else #else
call _C_LABEL(sigsetmask) call sigsetmask
#endif #endif
addl $4,%esp addl $4,%esp
PIC_EPILOGUE PIC_EPILOGUE

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

@ -54,9 +54,9 @@ ENTRY(setjmp)
pushq %rdi pushq %rdi
xorq %rdi,%rdi xorq %rdi,%rdi
#ifdef __PIC__ #ifdef __PIC__
call PIC_PLT(_C_LABEL(sigblock)) call PIC_PLT(sigblock)
#else #else
call _C_LABEL(sigblock) call sigblock
#endif #endif
popq %rdi popq %rdi
movq %rax,(_JB_SIGMASK * 8)(%rdi) movq %rax,(_JB_SIGMASK * 8)(%rdi)
@ -82,9 +82,9 @@ ENTRY(longjmp)
movq (_JB_SIGMASK * 8)(%rdi),%rdi movq (_JB_SIGMASK * 8)(%rdi),%rdi
pushq %r8 pushq %r8
#ifdef __PIC__ #ifdef __PIC__
call PIC_PLT(_C_LABEL(sigsetmask)) call PIC_PLT(sigsetmask)
#else #else
call _C_LABEL(sigsetmask) call sigsetmask
#endif #endif
popq %r8 popq %r8
movq (_JB_RBX * 8)(%r12),%rbx movq (_JB_RBX * 8)(%r12),%rbx

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

@ -58,9 +58,9 @@ ENTRY(sigsetjmp)
pushq %rdi pushq %rdi
xorq %rdi,%rdi xorq %rdi,%rdi
#ifdef __PIC__ #ifdef __PIC__
call PIC_PLT(_C_LABEL(sigblock)) call PIC_PLT(sigblock)
#else #else
call _C_LABEL(sigblock) call sigblock
#endif #endif
popq %rdi popq %rdi
movq %rax,(_JB_SIGMASK * 8)(%rdi) movq %rax,(_JB_SIGMASK * 8)(%rdi)
@ -87,9 +87,9 @@ ENTRY(siglongjmp)
movq (_JB_SIGMASK * 8)(%rdi),%rdi movq (_JB_SIGMASK * 8)(%rdi),%rdi
#ifdef __PIC__ #ifdef __PIC__
call PIC_PLT(_C_LABEL(sigsetmask)) call PIC_PLT(sigsetmask)
#else #else
call _C_LABEL(sigsetmask) call sigsetmask
#endif #endif
2: popq %rax 2: popq %rax
movq (_JB_RBX * 8)(%r12),%rbx movq (_JB_RBX * 8)(%r12),%rbx