[uClibc-cvs] uClibc/libpthread/linuxthreads cancel.c,1.2,1.3 oldsemaphore.c,1.1,1.2 pthread.c,1.9,1.10 weaks.c,1.2,1.3 wrapsyscall.c,1.9,1.10

[Erik Andersen]

Update of /var/cvs/uClibc/libpthread/linuxthreads
In directory winder:/tmp/cvs-serv14565/libpthread/linuxthreads

Modified Files:
	cancel.c oldsemaphore.c pthread.c weaks.c wrapsyscall.c 
Log Message:
In a number of places we erroneously used tests such as '#ifdef PIC' when we
should instead have been testing for '#ifdef __PIC__'.  This resulted in
NON-PIC code getting mixed into the shared library.  Oops!!!
 -Erik


Index: cancel.c
===================================================================
RCS file: /var/cvs/uClibc/libpthread/linuxthreads/cancel.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cancel.c	6 Aug 2002 14:49:12 -0000	1.2
+++ cancel.c	30 May 2003 04:47:47 -0000	1.3
@@ -175,7 +175,7 @@
 #endif
 }
 
-#ifndef PIC
+#ifndef __PIC__
 /* We need a hook to force the cancelation wrappers to be linked in when
    static libpthread is used.  */
 extern const int __pthread_provide_wrappers;

Index: oldsemaphore.c
===================================================================
RCS file: /var/cvs/uClibc/libpthread/linuxthreads/oldsemaphore.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- oldsemaphore.c	20 Feb 2002 09:18:44 -0000	1.1
+++ oldsemaphore.c	30 May 2003 04:47:47 -0000	1.2
@@ -224,7 +224,7 @@
   }
 }
 
-#if defined PIC && DO_VERSIONING
+#if defined __PIC__ && DO_VERSIONING
 symbol_version (__old_sem_init, sem_init, GLIBC_2.0);
 symbol_version (__old_sem_wait, sem_wait, GLIBC_2.0);
 symbol_version (__old_sem_trywait, sem_trywait, GLIBC_2.0);

Index: pthread.c
===================================================================
RCS file: /var/cvs/uClibc/libpthread/linuxthreads/pthread.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- pthread.c	4 Mar 2003 10:47:50 -0000	1.9
+++ pthread.c	30 May 2003 04:47:47 -0000	1.10
@@ -1005,7 +1005,7 @@
 #endif
 
 
-#ifndef PIC
+#ifndef __PIC__
 /* We need a hook to force the cancelation wrappers to be linked in when
    static libpthread is used.  */
 extern const int __pthread_provide_wrappers;

Index: weaks.c
===================================================================
RCS file: /var/cvs/uClibc/libpthread/linuxthreads/weaks.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- weaks.c	31 Oct 2002 18:20:18 -0000	1.2
+++ weaks.c	30 May 2003 04:47:47 -0000	1.3
@@ -30,7 +30,7 @@
  */
 
 /* Those are pthread functions which return 0 if successful. */
-//#if defined __HAVE_ELF__ && defined PIC && defined DO_VERSIONING
+//#if defined __HAVE_ELF__ && defined __PIC__ && defined DO_VERSIONING
 //weak_alias (__pthread_return_0, __libc_pthread_attr_init_2_0)
 //symbol_version (__libc_pthread_attr_init_2_0, pthread_attr_init, GLIBC_2.0);
 //weak_alias (__pthread_return_0, __libc_pthread_attr_init_2_1)

Index: wrapsyscall.c
===================================================================
RCS file: /var/cvs/uClibc/libpthread/linuxthreads/wrapsyscall.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- wrapsyscall.c	31 Oct 2002 18:20:18 -0000	1.9
+++ wrapsyscall.c	30 May 2003 04:47:47 -0000	1.10
@@ -34,7 +34,7 @@
 #include <sys/syscall.h>
 
 
-#ifndef PIC
+#ifndef __PIC__
 /* We need a hook to force this file to be linked in when static
    libpthread is used.  */
 const int __pthread_provide_wrappers = 0;