diff options
31 files changed, 71 insertions, 71 deletions
diff --git a/libc/string/x86_64/memcpy.S b/libc/string/x86_64/memcpy.S index 697b992d0..011291447 100644 --- a/libc/string/x86_64/memcpy.S +++ b/libc/string/x86_64/memcpy.S @@ -26,7 +26,7 @@ #define MEMPCPY_P (defined memcpy) .text -#if defined PIC && !defined NOT_IN_libc +#if defined __PIC__ && !defined NOT_IN_libc ENTRY (__memcpy_chk) cmpq %rdx, %rcx jb HIDDEN_JUMPTARGET (__chk_fail) diff --git a/libc/string/x86_64/memset.S b/libc/string/x86_64/memset.S index 46751006b..562574a4d 100644 --- a/libc/string/x86_64/memset.S +++ b/libc/string/x86_64/memset.S @@ -29,7 +29,7 @@ #define LARGE $120000 .text -#if !BZERO_P && defined PIC && !defined NOT_IN_libc +#if !BZERO_P && defined __PIC__ && !defined NOT_IN_libc ENTRY (__memset_chk) cmpq %rdx, %rcx jb HIDDEN_JUMPTARGET (__chk_fail) @@ -142,6 +142,6 @@ END (memset) libc_hidden_def(memset) #endif -#if !BZERO_P && defined PIC && !defined NOT_IN_libc +#if !BZERO_P && defined __PIC__ && !defined NOT_IN_libc strong_alias (__memset_chk, __memset_zero_constant_len_parameter) #endif diff --git a/libc/sysdeps/linux/xtensa/sysdep.h b/libc/sysdeps/linux/xtensa/sysdep.h index 5708a8114..bd16b81a0 100644 --- a/libc/sysdeps/linux/xtensa/sysdep.h +++ b/libc/sysdeps/linux/xtensa/sysdep.h @@ -45,7 +45,7 @@ #define LITERAL_POSITION .literal_position #undef JUMPTARGET -#ifdef PIC +#ifdef __PIC__ /* The "@PLT" suffix is currently a no-op for non-shared linking, but it doesn't hurt to use it conditionally for PIC code in case that changes someday. */ diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h index 9ea779e0d..de3609e9d 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h @@ -118,7 +118,7 @@ __LABEL($syscall_error) \ # define __local_multiple_threads __libc_multiple_threads # endif -# ifdef PIC +# ifdef __PIC__ # define CENABLE bsr ra, __local_enable_asynccancel !samegp # define CDISABLE bsr ra, __local_disable_asynccancel !samegp # else diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h index 75fcf54fa..3937808d5 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h @@ -27,7 +27,7 @@ /* We push lr onto the stack, so we have to use ldmib instead of ldmia to find the saved arguments. */ -# ifdef PIC +# ifdef __PIC__ # undef DOARGS_5 # undef DOARGS_6 # undef DOARGS_7 @@ -105,7 +105,7 @@ extern int __local_multiple_threads attribute_hidden; # define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1) # else -# if !defined PIC +# if !defined __PIC__ # define SINGLE_THREAD_P \ ldr ip, =__local_multiple_threads; \ ldr ip, [ip]; \ diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h index 134977e07..7b210ff11 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h @@ -104,7 +104,7 @@ # define POPARGS_6 POPARGS_5 ldw -54(%sr0,%sp), %r21 ASM_LINE_SEP # ifdef IS_IN_libpthread -# ifdef PIC +# ifdef __PIC__ # define CENABLE .import __pthread_enable_asynccancel,code ASM_LINE_SEP \ bl __pthread_enable_asynccancel,%r2 ASM_LINE_SEP # define CDISABLE .import __pthread_disable_asynccancel,code ASM_LINE_SEP \ @@ -116,7 +116,7 @@ bl __pthread_disable_asynccancel,%r2 ASM_LINE_SEP # endif # elif !defined NOT_IN_libc -# ifdef PIC +# ifdef __PIC__ # define CENABLE .import __libc_enable_asynccancel,code ASM_LINE_SEP \ bl __libc_enable_asynccancel,%r2 ASM_LINE_SEP # define CDISABLE .import __libc_disable_asynccancel,code ASM_LINE_SEP \ @@ -128,7 +128,7 @@ bl __libc_disable_asynccancel,%r2 ASM_LINE_SEP # endif # else -# ifdef PIC +# ifdef __PIC__ # define CENABLE .import __librt_enable_asynccancel,code ASM_LINE_SEP \ bl __librt_enable_asynccancel,%r2 ASM_LINE_SEP # define CDISABLE .import __librt_disable_asynccancel,code ASM_LINE_SEP \ @@ -167,7 +167,7 @@ nop ASM_LINE_SEP \ ldw MULTIPLE_THREADS_OFFSET(%sr0,%ret0),%ret0 ASM_LINE_SEP \ Lstp: ASM_LINE_SEP -# ifdef PIC +# ifdef __PIC__ /* Slower version uses GOT to get value of __local_multiple_threads */ # define SINGLE_THREAD_P \ addil LT%__local_multiple_threads, %r19 ASM_LINE_SEP \ diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h index a5dbeff1e..0bb16e453 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h @@ -101,7 +101,7 @@ # define CENABLE call __pthread_enable_asynccancel; # define CDISABLE call __pthread_disable_asynccancel # elif defined IS_IN_librt -# ifdef PIC +# ifdef __PIC__ # define CENABLE pushl %ebx; \ call __i686.get_pc_thunk.bx; \ addl $_GLOBAL_OFFSET_TABLE_, %ebx; \ @@ -139,7 +139,7 @@ #endif # ifndef __ASSEMBLER__ -# if defined FLOATING_STACKS && USE___THREAD && defined PIC +# if defined FLOATING_STACKS && USE___THREAD && defined __PIC__ # define SINGLE_THREAD_P \ __builtin_expect (THREAD_GETMEM (THREAD_SELF, \ p_header.data.multiple_threads) == 0, 1) @@ -153,7 +153,7 @@ extern int __local_multiple_threads # define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1) # endif # else -# if !defined PIC +# if !defined __PIC__ # define SINGLE_THREAD_P cmpl $0, __local_multiple_threads # elif defined FLOATING_STACKS && USE___THREAD # define SINGLE_THREAD_P cmpl $0, %gs:MULTIPLE_THREADS_OFFSET diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h index bb798e40d..9cd56755e 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h @@ -77,7 +77,7 @@ # define UNDOCARGS_5 UNDOCARGS_4; move.l (%sp)+, %d5; # ifdef IS_IN_libpthread -# ifdef PIC +# ifdef __PIC__ # define CENABLE jbsr __pthread_enable_asynccancel@PLTPC # define CDISABLE jbsr __pthread_disable_asynccancel@PLTPC # else @@ -85,7 +85,7 @@ # define CDISABLE jbsr __pthread_disable_asynccancel # endif # elif !defined NOT_IN_libc -# ifdef PIC +# ifdef __PIC__ # define CENABLE jbsr __libc_enable_asynccancel@PLTPC # define CDISABLE jbsr __libc_disable_asynccancel@PLTPC # else @@ -93,7 +93,7 @@ # define CDISABLE jbsr __libc_disable_asynccancel # endif # else -# ifdef PIC +# ifdef __PIC__ # define CENABLE jbsr __librt_enable_asynccancel@PLTPC # define CDISABLE jbsr __librt_disable_asynccancel@PLTPC # else @@ -114,7 +114,7 @@ extern int __local_multiple_threads attribute_hidden; # define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1) # else -# if !defined PIC +# if !defined __PIC__ # define SINGLE_THREAD_P tst.l __local_multiple_threads # else # define SINGLE_THREAD_P tst.l (__local_multiple_threads, %pc) diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/m68k/vfork.S b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/m68k/vfork.S index 9f304abbe..8a43ea0db 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/m68k/vfork.S +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/m68k/vfork.S @@ -56,7 +56,7 @@ ENTRY (__vfork) movel %a0,%sp@- # ifdef __ASSUME_VFORK_SYSCALL -# ifndef PIC +# ifndef __PIC__ jbra SYSCALL_ERROR_LABEL # endif # else diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h index 865da8e8c..9925a2f53 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h @@ -89,7 +89,7 @@ # else # define CENABLE bl JUMPTARGET(__librt_enable_asynccancel) # define CDISABLE bl JUMPTARGET(__librt_disable_asynccancel) -# if defined HAVE_AS_REL16 && defined PIC +# if defined HAVE_AS_REL16 && defined __PIC__ # undef CGOTSETUP # define CGOTSETUP \ bcl 20,31,1f; \ @@ -122,7 +122,7 @@ extern int __local_multiple_threads attribute_hidden; # define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1) # else -# if !defined PIC +# if !defined __PIC__ # define SINGLE_THREAD_P \ lis 10,__local_multiple_threads@ha; \ lwz 10,__local_multiple_threads@l(10); \ diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h index 03c6fedbf..48b2caadd 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h @@ -102,7 +102,7 @@ # define __local_multiple_threads __librt_multiple_threads # endif -# if defined IS_IN_librt && defined PIC +# if defined IS_IN_librt && defined __PIC__ # define CENABLE \ mov.l r12,@-r15; \ mov.l 1f,r12; \ @@ -155,7 +155,7 @@ # endif # ifndef __ASSEMBLER__ -# if defined FLOATING_STACKS && USE___THREAD && defined PIC +# if defined FLOATING_STACKS && USE___THREAD && defined __PIC__ # define SINGLE_THREAD_P \ __builtin_expect (THREAD_GETMEM (THREAD_SELF, p_multiple_threads) == 0, 1) # else @@ -163,7 +163,7 @@ extern int __local_multiple_threads attribute_hidden; # define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1) # endif # else -# if !defined PIC +# if !defined __PIC__ # define SINGLE_THREAD_P \ mov.l 1f,r0; \ mov.l @r0,r0; \ diff --git a/libpthread/nptl/sysdeps/i386/sysdep.h b/libpthread/nptl/sysdeps/i386/sysdep.h index c52df2d6d..e49d65759 100644 --- a/libpthread/nptl/sysdeps/i386/sysdep.h +++ b/libpthread/nptl/sysdeps/i386/sysdep.h @@ -112,7 +112,7 @@ lose: SYSCALL_PIC_SETUP \ END (name) #undef JUMPTARGET -#ifdef PIC +#ifdef __PIC__ #define JUMPTARGET(name) name##@PLT #define SYSCALL_PIC_SETUP \ pushl %ebx; \ diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h b/libpthread/nptl/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h index f3f7718e3..49224079e 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h @@ -129,7 +129,7 @@ __LABEL($syscall_error) \ # error Unsupported library # endif -# ifdef PIC +# ifdef __PIC__ # define CENABLE bsr ra, __local_enable_asynccancel !samegp # define CDISABLE bsr ra, __local_disable_asynccancel !samegp # else diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S index de057c8b0..a0dc39c8f 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S @@ -56,7 +56,7 @@ __new_sem_post: ret 1: -#ifdef PIC +#ifdef __PIC__ call __x86.get_pc_thunk.bx #else movl $4f, %ebx @@ -84,7 +84,7 @@ __new_sem_post: weak_alias(__new_sem_post, sem_post) -#ifdef PIC +#ifdef __PIC__ .section .gnu.linkonce.t.__x86.get_pc_thunk.bx,"ax",@progbits .globl __x86.get_pc_thunk.bx .hidden __x86.get_pc_thunk.bx diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S index 278b42ab3..972b49fac 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S @@ -148,7 +148,7 @@ sem_timedwait: cfi_offset(3, -16) /* %ebx */ 3: negl %esi 6: -#ifdef PIC +#ifdef __PIC__ call __x86.get_pc_thunk.bx #else movl $4f, %ebx diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S index 16c41b748..7db64820f 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S @@ -47,7 +47,7 @@ __new_sem_trywait: ret 1: -#ifdef PIC +#ifdef __PIC__ call __x86.get_pc_thunk.cx #else movl $3f, %ecx @@ -73,7 +73,7 @@ __new_sem_trywait: weak_alias(__new_sem_trywait, sem_trywait) -#ifdef PIC +#ifdef __PIC__ .section .gnu.linkonce.t.__x86.get_pc_thunk.cx,"ax",@progbits .globl __x86.get_pc_thunk.cx .hidden __x86.get_pc_thunk.cx diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S index 053630617..c3e6cbce6 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S @@ -94,7 +94,7 @@ __new_sem_wait: cmpl $-EWOULDBLOCK, %esi je 3b negl %esi -#ifdef PIC +#ifdef __PIC__ call __x86.get_pc_thunk.bx #else movl $4f, %ebx diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h index 1033ebc2d..97f3b09e2 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -52,7 +52,7 @@ typedef int lll_lock_t; #define LLL_MUTEX_LOCK_INITIALIZER_WAITERS (2) -#ifdef PIC +#ifdef __PIC__ # define LLL_EBX_LOAD "xchgl %2, %%ebx\n" # define LLL_EBX_REG "D" #else diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S index afdb1c5f9..5ab2c5856 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S @@ -56,7 +56,7 @@ __pthread_once: /* Not yet initialized or initialization in progress. Get the fork generation counter now. */ 6: movl (%ebx), %eax -#ifdef PIC +#ifdef __PIC__ call __x86.get_pc_thunk.cx addl $_GLOBAL_OFFSET_TABLE_, %ecx #endif @@ -67,7 +67,7 @@ __pthread_once: jnz 4f andl $3, %edx -#ifdef PIC +#ifdef __PIC__ orl __fork_generation@GOTOFF(%ecx), %edx #else orl __fork_generation, %edx @@ -169,7 +169,7 @@ __pthread_once_internal = __pthread_once pthread_once = __pthread_once -#ifdef PIC +#ifdef __PIC__ .section .gnu.linkonce.t.__x86.get_pc_thunk.cx,"ax",@progbits .globl __x86.get_pc_thunk.cx .hidden __x86.get_pc_thunk.cx diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/sysdep.h b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/sysdep.h index f9343cc93..674d5c699 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/sysdep.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/sysdep.h @@ -57,7 +57,7 @@ /* We don't want the label for the error handle to be global when we define it here. */ -#ifdef PIC +#ifdef __PIC__ # define SYSCALL_ERROR_LABEL 0f #else # define SYSCALL_ERROR_LABEL syscall_error @@ -103,7 +103,7 @@ #define ret_ERRVAL ret -#ifndef PIC +#ifndef __PIC__ # define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used. */ #else @@ -177,7 +177,7 @@ orl $-1, %eax; \ jmp L(pseudo_end); # endif /* _LIBC_REENTRANT */ -#endif /* PIC */ +#endif /* __PIC__ */ /* The original calling convention for system calls on Linux/i386 is diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h index 84acf3843..0e6225624 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h @@ -98,7 +98,7 @@ # elif defined IS_IN_librt # define CENABLE bl JUMPTARGET(__librt_enable_asynccancel) # define CDISABLE bl JUMPTARGET(__librt_disable_asynccancel) -# if defined HAVE_AS_REL16 && defined PIC +# if defined HAVE_AS_REL16 && defined __PIC__ # undef CGOTSETUP # define CGOTSETUP \ bcl 20,31,1f; \ diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S index 75ce425f8..5812488b2 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S @@ -55,7 +55,7 @@ __pthread_cond_timedwait: mov r4, r8 mov r5, r9 mov r6, r13 -#ifdef PIC +#ifdef __PIC__ mova .Lgot0, r0 mov.l .Lgot0, r12 add r0, r12 @@ -79,7 +79,7 @@ __pthread_cond_timedwait: bt 2f bra 1f nop -#ifdef PIC +#ifdef __PIC__ .align 2 .Lgot0: .long _GLOBAL_OFFSET_TABLE_ @@ -610,7 +610,7 @@ __condvar_tw_cleanup: .LcallUR: mov.l .Lresume, r1 -#ifdef PIC +#ifdef __PIC__ add r12, r1 #endif jsr @r1 @@ -625,7 +625,7 @@ __condvar_tw_cleanup: .Lmlocki5: .long __pthread_mutex_cond_lock-.Lmlocki5b .Lresume: -#ifdef PIC +#ifdef __PIC__ .long _Unwind_Resume@GOTOFF #else .long _Unwind_Resume diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S index 50d98d395..c7df9bf86 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S @@ -48,7 +48,7 @@ __pthread_cond_wait: .Lalloc: mov r4, r8 mov r5, r9 -#ifdef PIC +#ifdef __PIC__ mova .Lgot0, r0 mov.l .Lgot0, r12 add r0, r12 @@ -65,7 +65,7 @@ __pthread_cond_wait: bt 2f bra 1f nop -#ifdef PIC +#ifdef __PIC__ .align 2 .Lgot0: .long _GLOBAL_OFFSET_TABLE_ @@ -473,7 +473,7 @@ __condvar_w_cleanup: .LcallUR: mov.l .Lresume, r1 -#ifdef PIC +#ifdef __PIC__ add r12, r1 #endif jsr @r1 @@ -488,7 +488,7 @@ __condvar_w_cleanup: .Lmlocki3: .long __pthread_mutex_cond_lock-.Lmlocki3b .Lresume: -#ifdef PIC +#ifdef __PIC__ .long _Unwind_Resume@GOTOFF #else .long _Unwind_Resume diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S index 2e8e6a1d5..de83dec1b 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S @@ -69,7 +69,7 @@ __pthread_once: and #3, r0 mov.l .Lfgen, r2 -#ifdef PIC +#ifdef __PIC__ add r12, r2 #endif mov.l @r2, r3 @@ -107,7 +107,7 @@ __pthread_once: .align 2 .Lgot: .long _GLOBAL_OFFSET_TABLE_ -#ifdef PIC +#ifdef __PIC__ .Lfgen: .long __fork_generation@GOTOFF #else diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sysdep.h b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sysdep.h index 546a21231..7e9223b70 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sysdep.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sysdep.h @@ -89,7 +89,7 @@ #define ret_ERRVAL ret -#ifndef PIC +#ifndef __PIC__ # define SYSCALL_ERROR_HANDLER \ mov.l 0f,r1; \ jmp @r1; \ @@ -191,7 +191,7 @@ 0: .long _GLOBAL_OFFSET_TABLE_; \ 1: .long errno@GOT # endif /* _LIBC_REENTRANT */ -#endif /* PIC */ +#endif /* __PIC__ */ # ifdef NEED_SYSCALL_INST_PAD # define SYSCALL_INST_PAD \ diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S index 02db0a4f9..4b434632e 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S @@ -117,7 +117,7 @@ __lll_robust_lock_wait: __lll_robust_timedlock_wait: cfi_startproc # ifndef __ASSUME_FUTEX_CLOCK_REALTIME -# ifdef PIC +# ifdef __PIC__ cmpl $0, __have_futex_clock_realtime(%rip) # else cmpl $0, __have_futex_clock_realtime diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S index f4fb61f70..04b3bf0d0 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S @@ -112,7 +112,7 @@ __pthread_cond_timedwait: addl $(1 << clock_bits), cond_nwaiters(%rdi) /* Install cancellation handler. */ -#ifdef PIC +#ifdef __PIC__ leaq __condvar_cleanup(%rip), %rsi #else leaq __condvar_cleanup, %rsi diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S index 7c1c0e29c..687f3d0de 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S @@ -179,7 +179,7 @@ __pthread_cond_wait: addl $(1 << clock_bits), cond_nwaiters(%rdi) /* Install cancellation handler. */ -#ifdef PIC +#ifdef __PIC__ leaq __condvar_cleanup(%rip), %rsi #else leaq __condvar_cleanup, %rsi diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep.h b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep.h index b13a14f6a..fe92a8ab5 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep.h @@ -66,7 +66,7 @@ /* We don't want the label for the error handle to be global when we define it here. */ -# ifdef PIC +# ifdef __PIC__ # define SYSCALL_ERROR_LABEL 0f # else # define SYSCALL_ERROR_LABEL syscall_error @@ -111,7 +111,7 @@ # define ret_ERRVAL ret -# ifndef PIC +# ifndef __PIC__ # define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used. */ # elif defined(RTLD_PRIVATE_ERRNO) # define SYSCALL_ERROR_HANDLER \ @@ -162,7 +162,7 @@ movl %edx, (%rcx); \ orq $-1, %rax; \ jmp L(pseudo_end); -# endif /* PIC */ +# endif /* __PIC__ */ /* The Linux/x86-64 kernel expects the system call parameters in registers according to the following table: diff --git a/libpthread/nptl/sysdeps/x86_64/sysdep.h b/libpthread/nptl/sysdeps/x86_64/sysdep.h index 122270f91..ac74b7c23 100644 --- a/libpthread/nptl/sysdeps/x86_64/sysdep.h +++ b/libpthread/nptl/sysdeps/x86_64/sysdep.h @@ -95,7 +95,7 @@ lose: \ END (name) #undef JUMPTARGET -#ifdef PIC +#ifdef __PIC__ #define JUMPTARGET(name) name##@PLT #else #define JUMPTARGET(name) name diff --git a/test/tls/tls-macros.h b/test/tls/tls-macros.h index cd31100cf..0eaca6574 100644 --- a/test/tls/tls-macros.h +++ b/test/tls/tls-macros.h @@ -37,7 +37,7 @@ : "=r" (__l)); \ __l; }) -# ifdef PIC +# ifdef __PIC__ # define TLS_IE(x) \ ({ int *__l; \ __asm__ ("movl %%gs:0,%0\n\t" \ @@ -59,7 +59,7 @@ __l; }) # endif -# ifdef PIC +# ifdef __PIC__ # define TLS_LD(x) \ ({ int *__l, __c, __d; \ __asm__ ("leal " #x "@tlsldm(%%ebx),%%eax\n\t" \ @@ -83,7 +83,7 @@ __l; }) # endif -# ifdef PIC +# ifdef __PIC__ # define TLS_GD(x) \ ({ int *__l, __c, __d; \ __asm__ ("leal " #x "@tlsgd(%%ebx),%%eax\n\t" \ @@ -157,7 +157,7 @@ : "=r" (__l), "=r" (__tp)); \ __l; }) -# ifdef PIC +# ifdef __PIC__ # define TLS_IE(x) \ ({ int *__l; void *__tp; \ register void *__gp __asm__("r12"); \ @@ -191,7 +191,7 @@ __l; }) #endif -# ifdef PIC +# ifdef __PIC__ # define TLS_LD(x) \ ({ int *__l; \ register void *__gp __asm__("r12"); \ @@ -245,7 +245,7 @@ __l; }) #endif -# ifdef PIC +# ifdef __PIC__ # define TLS_GD(x) \ ({ int *__l; \ register void *__gp __asm__("r12"); \ @@ -529,7 +529,7 @@ register void *__gp __asm__("$29"); : "=a" (__offset) : : "cc" ); \ (int *) (__builtin_thread_pointer() + __offset); }) -# ifdef PIC +# ifdef __PIC__ # define TLS_IE(x) \ ({ unsigned long __offset; \ __asm__ ("bras %0,1f\n" \ @@ -549,7 +549,7 @@ register void *__gp __asm__("$29"); (int *) (__builtin_thread_pointer() + __offset); }) # endif -# ifdef PIC +# ifdef __PIC__ # define TLS_LD(x) \ ({ unsigned long __offset, __save12; \ __asm__ ("bras %0,1f\n" \ @@ -581,7 +581,7 @@ register void *__gp __asm__("$29"); (int *) (__builtin_thread_pointer() + __offset); }) # endif -# ifdef PIC +# ifdef __PIC__ # define TLS_GD(x) \ ({ unsigned long __offset, __save12; \ __asm__ ("bras %0,1f\n" \ @@ -619,7 +619,7 @@ register void *__gp __asm__("$29"); : "=a" (__offset) : : "cc" ); \ (int *) (__builtin_thread_pointer() + __offset); }) -# ifdef PIC +# ifdef __PIC__ # define TLS_IE(x) \ ({ unsigned long __offset; \ __asm__ ("bras %0,1f\n" \ @@ -639,7 +639,7 @@ register void *__gp __asm__("$29"); (int *) (__builtin_thread_pointer() + __offset); }) # endif -# ifdef PIC +# ifdef __PIC__ # define TLS_LD(x) \ ({ unsigned long __offset, __save12; \ __asm__ ("bras %0,1f\n" \ @@ -677,7 +677,7 @@ register void *__gp __asm__("$29"); (int *) (__builtin_thread_pointer() + __offset); }) # endif -# ifdef PIC +# ifdef __PIC__ # define TLS_GD(x) \ ({ unsigned long __offset, __save12; \ __asm__ ("bras %0,1f\n" \ |