From 09289d92f920f307fc50dd64e9970c36c30b58e4 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 20 Feb 2014 11:51:11 -0800 Subject: [PATCH] Remove useless _C_LABEL from our assembler source. Change-Id: I41a9181537c70ecc69ef8035132c9a83811a40d0 --- libc/arch-arm/bionic/_setjmp.S | 4 ++-- libc/arch-arm/bionic/abort_arm.S | 2 +- libc/arch-arm/bionic/setjmp.S | 8 ++++---- libc/arch-arm/bionic/sigsetjmp.S | 8 ++++---- libc/arch-arm64/bionic/_setjmp.S | 4 ++-- libc/arch-arm64/bionic/setjmp.S | 6 +++--- libc/arch-arm64/bionic/sigsetjmp.S | 8 ++++---- libc/arch-x86/bionic/setjmp.S | 8 ++++---- libc/arch-x86/bionic/sigsetjmp.S | 8 ++++---- libc/arch-x86_64/bionic/setjmp.S | 8 ++++---- libc/arch-x86_64/bionic/sigsetjmp.S | 8 ++++---- 11 files changed, 36 insertions(+), 36 deletions(-) diff --git a/libc/arch-arm/bionic/_setjmp.S b/libc/arch-arm/bionic/_setjmp.S index 6b8aa503a..239947e0b 100644 --- a/libc/arch-arm/bionic/_setjmp.S +++ b/libc/arch-arm/bionic/_setjmp.S @@ -107,7 +107,7 @@ ENTRY(_longjmp) /* validation failed, die die die. */ botch: - bl PIC_SYM(_C_LABEL(longjmperror), PLT) - bl PIC_SYM(_C_LABEL(abort), PLT) + bl PIC_SYM(longjmperror, PLT) + bl PIC_SYM(abort, PLT) b . - 8 /* Cannot get here */ END(_longjmp) diff --git a/libc/arch-arm/bionic/abort_arm.S b/libc/arch-arm/bionic/abort_arm.S index 1aaf21ad8..1d01ed274 100644 --- a/libc/arch-arm/bionic/abort_arm.S +++ b/libc/arch-arm/bionic/abort_arm.S @@ -40,5 +40,5 @@ ENTRY(abort) .cfi_def_cfa_offset 8 .cfi_rel_offset r3, 0 .cfi_rel_offset r14, 4 - bl PIC_SYM(_C_LABEL(__libc_android_abort), PLT) + bl PIC_SYM(__libc_android_abort, PLT) END(abort) diff --git a/libc/arch-arm/bionic/setjmp.S b/libc/arch-arm/bionic/setjmp.S index 65b93fdec..892708658 100644 --- a/libc/arch-arm/bionic/setjmp.S +++ b/libc/arch-arm/bionic/setjmp.S @@ -56,7 +56,7 @@ ENTRY(setjmp) .cfi_rel_offset r14, 4 mov r0, #0x00000000 - bl PIC_SYM(_C_LABEL(sigblock), PLT) + bl PIC_SYM(sigblock, PLT) mov r1, r0 ldmfd sp!, {r0, r14} @@ -108,7 +108,7 @@ ENTRY(longjmp) .cfi_adjust_cfa_offset 4 mov r0, r2 - bl PIC_SYM(_C_LABEL(sigsetmask), PLT) + bl PIC_SYM(sigsetmask, PLT) add sp, sp, #4 /* unalign the stack */ .cfi_adjust_cfa_offset -4 @@ -147,7 +147,7 @@ ENTRY(longjmp) /* validation failed, die die die. */ botch: - bl PIC_SYM(_C_LABEL(longjmperror), PLT) - bl PIC_SYM(_C_LABEL(abort), PLT) + bl PIC_SYM(longjmperror, PLT) + bl PIC_SYM(abort, PLT) b . - 8 /* Cannot get here */ END(longjmp) diff --git a/libc/arch-arm/bionic/sigsetjmp.S b/libc/arch-arm/bionic/sigsetjmp.S index 12311e586..59ab9da9b 100644 --- a/libc/arch-arm/bionic/sigsetjmp.S +++ b/libc/arch-arm/bionic/sigsetjmp.S @@ -50,8 +50,8 @@ ENTRY(sigsetjmp) teq r1, #0 - beq PIC_SYM(_C_LABEL(_setjmp), PLT) - b PIC_SYM(_C_LABEL(setjmp), PLT) + beq PIC_SYM(_setjmp, PLT) + b PIC_SYM(setjmp, PLT) END(sigsetjmp) .L_setjmp_magic: @@ -61,6 +61,6 @@ ENTRY(siglongjmp) ldr r2, .L_setjmp_magic ldr r3, [r0] teq r2, r3 - beq PIC_SYM(_C_LABEL(_longjmp), PLT) - b PIC_SYM(_C_LABEL(longjmp), PLT) + beq PIC_SYM(_longjmp, PLT) + b PIC_SYM(longjmp, PLT) END(siglongjmp) diff --git a/libc/arch-arm64/bionic/_setjmp.S b/libc/arch-arm64/bionic/_setjmp.S index ea70a526b..6cbf5c6ba 100644 --- a/libc/arch-arm64/bionic/_setjmp.S +++ b/libc/arch-arm64/bionic/_setjmp.S @@ -105,7 +105,7 @@ ENTRY(_longjmp) /* validation failed, die die die */ botch: - bl PIC_SYM(_C_LABEL(longjmperror), PLT) - bl PIC_SYM(_C_LABEL(abort), PLT) + bl PIC_SYM(longjmperror, PLT) + bl PIC_SYM(abort, PLT) b . - 8 /* Cannot get here */ END(_longjmp) diff --git a/libc/arch-arm64/bionic/setjmp.S b/libc/arch-arm64/bionic/setjmp.S index b1ec0a8aa..2d8631b2c 100644 --- a/libc/arch-arm64/bionic/setjmp.S +++ b/libc/arch-arm64/bionic/setjmp.S @@ -45,7 +45,7 @@ ENTRY(setjmp) stp x0, x30, [sp, #-16]! mov x0, xzr - bl PIC_SYM(_C_LABEL(sigblock), PLT) + bl PIC_SYM(sigblock, PLT) mov w1, w0 ldp x0, x30, [sp], #16 @@ -117,7 +117,7 @@ ENTRY(longjmp) /* validation failed, die die die */ botch: - bl PIC_SYM(_C_LABEL(longjmperror), PLT) - bl PIC_SYM(_C_LABEL(abort), PLT) + bl PIC_SYM(longjmperror, PLT) + bl PIC_SYM(abort, PLT) b . - 8 /* Cannot get here */ END(longjmp) diff --git a/libc/arch-arm64/bionic/sigsetjmp.S b/libc/arch-arm64/bionic/sigsetjmp.S index 3afceabff..cde1cbb2b 100644 --- a/libc/arch-arm64/bionic/sigsetjmp.S +++ b/libc/arch-arm64/bionic/sigsetjmp.S @@ -35,8 +35,8 @@ */ ENTRY(sigsetjmp) - cbz w1, PIC_SYM(_C_LABEL(_setjmp), PLT) - b PIC_SYM(_C_LABEL(setjmp), PLT) + cbz w1, PIC_SYM(_setjmp, PLT) + b PIC_SYM(setjmp, PLT) END(sigsetjmp) .L_setjmp_magic: @@ -46,6 +46,6 @@ ENTRY(siglongjmp) ldr w2, .L_setjmp_magic ldr w3, [x0] cmp w2, w3 - b.eq PIC_SYM(_C_LABEL(_longjmp), PLT) - b PIC_SYM(_C_LABEL(longjmp), PLT) + b.eq PIC_SYM(_longjmp, PLT) + b PIC_SYM(longjmp, PLT) END(siglongjmp) diff --git a/libc/arch-x86/bionic/setjmp.S b/libc/arch-x86/bionic/setjmp.S index c0df6473b..e149d425b 100644 --- a/libc/arch-x86/bionic/setjmp.S +++ b/libc/arch-x86/bionic/setjmp.S @@ -47,9 +47,9 @@ ENTRY(setjmp) PIC_PROLOGUE pushl $0 #ifdef PIC - call PIC_PLT(_C_LABEL(sigblock)) + call PIC_PLT(sigblock) #else - call _C_LABEL(sigblock) + call sigblock #endif addl $4,%esp PIC_EPILOGUE @@ -72,9 +72,9 @@ ENTRY(longjmp) PIC_PROLOGUE pushl 24(%edx) #ifdef PIC - call PIC_PLT(_C_LABEL(sigsetmask)) + call PIC_PLT(sigsetmask) #else - call _C_LABEL(sigsetmask) + call sigsetmask #endif addl $4,%esp PIC_EPILOGUE diff --git a/libc/arch-x86/bionic/sigsetjmp.S b/libc/arch-x86/bionic/sigsetjmp.S index 70cc6db4c..69494b413 100644 --- a/libc/arch-x86/bionic/sigsetjmp.S +++ b/libc/arch-x86/bionic/sigsetjmp.S @@ -43,9 +43,9 @@ ENTRY(sigsetjmp) PIC_PROLOGUE pushl $0 #ifdef PIC - call PIC_PLT(_C_LABEL(sigblock)) + call PIC_PLT(sigblock) #else - call _C_LABEL(sigblock) + call sigblock #endif addl $4,%esp PIC_EPILOGUE @@ -71,9 +71,9 @@ ENTRY(siglongjmp) PIC_PROLOGUE pushl 24(%edx) #ifdef PIC - call PIC_PLT(_C_LABEL(sigsetmask)) + call PIC_PLT(sigsetmask) #else - call _C_LABEL(sigsetmask) + call sigsetmask #endif addl $4,%esp PIC_EPILOGUE diff --git a/libc/arch-x86_64/bionic/setjmp.S b/libc/arch-x86_64/bionic/setjmp.S index 4dd902891..3f4a43204 100644 --- a/libc/arch-x86_64/bionic/setjmp.S +++ b/libc/arch-x86_64/bionic/setjmp.S @@ -54,9 +54,9 @@ ENTRY(setjmp) pushq %rdi xorq %rdi,%rdi #ifdef __PIC__ - call PIC_PLT(_C_LABEL(sigblock)) + call PIC_PLT(sigblock) #else - call _C_LABEL(sigblock) + call sigblock #endif popq %rdi movq %rax,(_JB_SIGMASK * 8)(%rdi) @@ -82,9 +82,9 @@ ENTRY(longjmp) movq (_JB_SIGMASK * 8)(%rdi),%rdi pushq %r8 #ifdef __PIC__ - call PIC_PLT(_C_LABEL(sigsetmask)) + call PIC_PLT(sigsetmask) #else - call _C_LABEL(sigsetmask) + call sigsetmask #endif popq %r8 movq (_JB_RBX * 8)(%r12),%rbx diff --git a/libc/arch-x86_64/bionic/sigsetjmp.S b/libc/arch-x86_64/bionic/sigsetjmp.S index 842d6ffb5..174222f38 100644 --- a/libc/arch-x86_64/bionic/sigsetjmp.S +++ b/libc/arch-x86_64/bionic/sigsetjmp.S @@ -58,9 +58,9 @@ ENTRY(sigsetjmp) pushq %rdi xorq %rdi,%rdi #ifdef __PIC__ - call PIC_PLT(_C_LABEL(sigblock)) + call PIC_PLT(sigblock) #else - call _C_LABEL(sigblock) + call sigblock #endif popq %rdi movq %rax,(_JB_SIGMASK * 8)(%rdi) @@ -87,9 +87,9 @@ ENTRY(siglongjmp) movq (_JB_SIGMASK * 8)(%rdi),%rdi #ifdef __PIC__ - call PIC_PLT(_C_LABEL(sigsetmask)) + call PIC_PLT(sigsetmask) #else - call _C_LABEL(sigsetmask) + call sigsetmask #endif 2: popq %rax movq (_JB_RBX * 8)(%r12),%rbx