summaryrefslogtreecommitdiff
path: root/libpthread
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2003-05-30 04:47:47 +0000
committerEric Andersen <andersen@codepoet.org>2003-05-30 04:47:47 +0000
commiteeb9d29da882153b1fa2b1e00178899bb95659b2 (patch)
treef3821d10909b9dab15f70169b1488002e6be770a /libpthread
parent4352cfec686d850f4bd5a27d9afb99867db01a54 (diff)
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
Diffstat (limited to 'libpthread')
-rw-r--r--libpthread/linuxthreads/cancel.c2
-rw-r--r--libpthread/linuxthreads/oldsemaphore.c2
-rw-r--r--libpthread/linuxthreads/pthread.c2
-rw-r--r--libpthread/linuxthreads/weaks.c2
-rw-r--r--libpthread/linuxthreads/wrapsyscall.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/libpthread/linuxthreads/cancel.c b/libpthread/linuxthreads/cancel.c
index 42484bb1e..1356348a7 100644
--- a/libpthread/linuxthreads/cancel.c
+++ b/libpthread/linuxthreads/cancel.c
@@ -175,7 +175,7 @@ void __pthread_perform_cleanup(void)
#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;
diff --git a/libpthread/linuxthreads/oldsemaphore.c b/libpthread/linuxthreads/oldsemaphore.c
index a634bad8e..225af508f 100644
--- a/libpthread/linuxthreads/oldsemaphore.c
+++ b/libpthread/linuxthreads/oldsemaphore.c
@@ -224,7 +224,7 @@ static void sem_restart_list(pthread_descr waiting)
}
}
-#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);
diff --git a/libpthread/linuxthreads/pthread.c b/libpthread/linuxthreads/pthread.c
index 9987c8249..22e3f6a9c 100644
--- a/libpthread/linuxthreads/pthread.c
+++ b/libpthread/linuxthreads/pthread.c
@@ -1005,7 +1005,7 @@ void __pthread_message(char * fmt, ...)
#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;
diff --git a/libpthread/linuxthreads/weaks.c b/libpthread/linuxthreads/weaks.c
index 80ee11185..67f1df5b0 100644
--- a/libpthread/linuxthreads/weaks.c
+++ b/libpthread/linuxthreads/weaks.c
@@ -30,7 +30,7 @@ extern void __pthread_return_void __P ((void));
*/
/* 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)
diff --git a/libpthread/linuxthreads/wrapsyscall.c b/libpthread/linuxthreads/wrapsyscall.c
index fa5b24dc4..6b8a00bb5 100644
--- a/libpthread/linuxthreads/wrapsyscall.c
+++ b/libpthread/linuxthreads/wrapsyscall.c
@@ -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;