From 5418c5ea2ab6a8e82421ebbf8060e52b5b1710a7 Mon Sep 17 00:00:00 2001
From: Carmelo Amoroso <carmelo.amoroso@st.com>
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 <carmelo.amoroso@st.com>
---
 .../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 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'libpthread/nptl/sysdeps/unix/sysv/linux/sh')

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 \
-- 
cgit v1.2.3