From 5418c5ea2ab6a8e82421ebbf8060e52b5b1710a7 Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Wed, 16 Dec 2009 08:48:08 +0100 Subject: build: Get rids of PIC macro using compiler flag __PIC__ instead Based on Peter Mazinger's comments on a recent commit, I decided to get rids of all occurrences of PIC changing them to __PIC__ Signed-off-by: Carmelo Amoroso --- libpthread/nptl/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h | 2 +- libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S | 4 ++-- libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S | 2 +- libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S | 4 ++-- libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S | 2 +- libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h | 2 +- libpthread/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S | 6 +++--- libpthread/nptl/sysdeps/unix/sysv/linux/i386/sysdep.h | 6 +++--- .../sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h | 2 +- .../nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S | 8 ++++---- libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S | 8 ++++---- libpthread/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S | 4 ++-- libpthread/nptl/sysdeps/unix/sysv/linux/sh/sysdep.h | 4 ++-- .../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S | 2 +- .../nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S | 2 +- .../nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S | 2 +- libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep.h | 6 +++--- 17 files changed, 33 insertions(+), 33 deletions(-) (limited to 'libpthread/nptl/sysdeps/unix') 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: -- cgit v1.2.3