Remove misleading arm/arm64 PIC_SYM.

Bug: 16823325
Change-Id: Ic8ff3a628bb4cd71361e3a1c2cfde4b3d39c50b1

diff --git a/libc/arch-arm/bionic/_setjmp.S b/libc/arch-arm/bionic/_setjmp.S
index 64a0a31c93dc8fa49ca778e4faeb6365508d9636..7d637fd86046bbf1c0048455a49e5c19fb8153df 100644 (file)
--- 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(longjmperror, PLT)
-       bl      PIC_SYM(abort, PLT)
+       bl      longjmperror
+       bl      abort
        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 6b181efb753f2ce0592453fad36efce0c0268799..1039502ac143af17836eb1a3388d16b567ff2934 100644 (file)
--- 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(__libc_android_abort, PLT)
+    bl      __libc_android_abort
 END(abort)

diff --git a/libc/arch-arm/bionic/setjmp.S b/libc/arch-arm/bionic/setjmp.S
index ed59d07f13af94d149e9dd7e9422d44e6d5b697c..0c9082c2c0b268da1b9f0a7154dfe7670db1c640 100644 (file)
--- 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(sigblock, PLT)
+       bl      sigblock
        mov     r1, r0
 
        ldmfd   sp!, {r0, r14}
@@ -108,7 +108,7 @@ ENTRY(longjmp)
        .cfi_adjust_cfa_offset 4
 
        mov     r0, r2
-       bl      PIC_SYM(sigsetmask, PLT)
+       bl      sigsetmask
 
        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(longjmperror, PLT)
-       bl      PIC_SYM(abort, PLT)
+       bl      longjmperror
+       bl      abort
        b       . - 8           /* Cannot get here */
 END(longjmp)

diff --git a/libc/arch-arm/bionic/sigsetjmp.S b/libc/arch-arm/bionic/sigsetjmp.S
index 7016f500c3f7ec41ef9c599568fc41b07cccf1bb..f9e30eed8201ee86693c6b21049275ac19a8f2b0 100644 (file)
--- 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(_setjmp, PLT)
-       b       PIC_SYM(setjmp, PLT)
+       beq     _setjmp
+       b       setjmp
 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(_longjmp, PLT)
-       b       PIC_SYM(longjmp, PLT)
+       beq     _longjmp
+       b       longjmp
 END(siglongjmp)

diff --git a/libc/arch-arm/include/machine/asm.h b/libc/arch-arm/include/machine/asm.h
index 7954f05f1b1b4a9069a346e347e107a5fd001a2d..88d16f950608fcca90701d8abc07ffc7cd324870 100644 (file)
--- a/libc/arch-arm/include/machine/asm.h
+++ b/libc/arch-arm/include/machine/asm.h
@@ -50,10 +50,4 @@
 #undef __bionic_asm_function_type
 #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_ */

diff --git a/libc/arch-arm64/bionic/_setjmp.S b/libc/arch-arm64/bionic/_setjmp.S
index 3836899784741d25f61b7432d00c7a14e1c1a27e..e11ef68c3e2d3c86f20228185cd3e8c3b30c20c6 100644 (file)
--- 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 */
 .L_fail:
-    bl      PIC_SYM(longjmperror, PLT)
-    bl      PIC_SYM(abort, PLT)
+    bl      longjmperror
+    bl      abort
     b        . - 8       /* Cannot get here */
 END(_longjmp)

diff --git a/libc/arch-arm64/bionic/setjmp.S b/libc/arch-arm64/bionic/setjmp.S
index f9d226697d680109feeac19fd3c8073f49ba0ae5..35815a6e52e976b2bf8edd4bbb98d9b7f6b8ff26 100644 (file)
--- 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(sigblock, PLT)
+    bl      sigblock
     mov     w1, w0
 
     ldp     x0, x30, [sp], #16
@@ -117,7 +117,7 @@ ENTRY(longjmp)
 
     /* validation failed, die die die */
 .L_fail:
-    bl      PIC_SYM(longjmperror, PLT)
-    bl      PIC_SYM(abort, PLT)
+    bl      longjmperror
+    bl      abort
     b       . - 8       /* Cannot get here */
 END(longjmp)

diff --git a/libc/arch-arm64/bionic/sigsetjmp.S b/libc/arch-arm64/bionic/sigsetjmp.S
index 4fdb3679dd022d76a829b874c49b066f9f103a88..be7cecb798ff02f215d456ef7f02ff8061f9ba9e 100644 (file)
--- a/libc/arch-arm64/bionic/sigsetjmp.S
+++ b/libc/arch-arm64/bionic/sigsetjmp.S
@@ -35,8 +35,8 @@
  */
 
 ENTRY(sigsetjmp)
-    cbz     w1, PIC_SYM(_setjmp, PLT)
-    b       PIC_SYM(setjmp, PLT)
+    cbz     w1, _setjmp
+    b       setjmp
 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(_longjmp, PLT)
-    b       PIC_SYM(longjmp, PLT)
+    b.eq    _longjmp
+    b       longjmp
 END(siglongjmp)

diff --git a/libc/arch-arm64/include/machine/asm.h b/libc/arch-arm64/include/machine/asm.h
index 4bfabaf95ee5c926ccb0b68c95b65fcd91151f45..31b5c63eaee4caa24cf93873610d028117be3426 100644 (file)
--- a/libc/arch-arm64/include/machine/asm.h
+++ b/libc/arch-arm64/include/machine/asm.h
@@ -45,10 +45,4 @@
 #undef __bionic_asm_function_type
 #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_ */