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

14 files changed, 21 insertions, 21 deletions

diff --git a/Makefile b/Makefile
index 752a475f0..e90db678e 100644
--- a/Makefile
+++ b/Makefile
@@ -151,7 +151,7 @@ headers: include/bits/uClibc_config.h
 	    set -e; \
 	    echo " "; \
 	    echo "The path '$(KERNEL_SOURCE)/include/asm' doesn't exist."; \
-	    echo "I bet you didn't set KERNEL_SOURCE, TARGET_ARCH or UCLIBC_HAS_MMU"; \
+	    echo "I bet you did not set KERNEL_SOURCE, TARGET_ARCH or UCLIBC_HAS_MMU"; \
 	    echo "correctly when you configured uClibc.  Please fix these settings."; \
 	    echo " "; \
 	    false; \
diff --git a/libc/sysdeps/linux/alpha/brk.S b/libc/sysdeps/linux/alpha/brk.S
index aa8db2ba9..913b41b2b 100644
--- a/libc/sysdeps/linux/alpha/brk.S
+++ b/libc/sysdeps/linux/alpha/brk.S
@@ -25,7 +25,7 @@
 #define _ERRNO_H
 #include <bits/errno.h>
 
-#ifdef PIC
+#ifdef __PIC__
 .section .bss
 	.align 3
 	.globl __curbrk
diff --git a/libc/sysdeps/linux/i386/bsd-setjmp.S b/libc/sysdeps/linux/i386/bsd-setjmp.S
index 93ae2ea8d..c075bada0 100644
--- a/libc/sysdeps/linux/i386/bsd-setjmp.S
+++ b/libc/sysdeps/linux/i386/bsd-setjmp.S
@@ -42,7 +42,7 @@ setjmp:
 	/* Call __sigjmp_save.  */
 	pushl $1
 	pushl 8(%esp)
-#ifdef	PIC
+#ifdef	__PIC__
 	/* We cannot use the PLT, because it requires that %ebx be set, but
            we can't save and restore our caller's value.  Instead, we do an
            indirect jump through the GOT, using for the temporary register
diff --git a/libc/sysdeps/linux/i386/clone.S b/libc/sysdeps/linux/i386/clone.S
index c52bb7fd8..93183d208 100644
--- a/libc/sysdeps/linux/i386/clone.S
+++ b/libc/sysdeps/linux/i386/clone.S
@@ -65,11 +65,11 @@ __clone:
 CLONE_ERROR_LABEL:
 	negl    %eax
 	pushl   %eax
-#ifdef PIC
-	call	L(here)
-L(here):
+#ifdef __PIC__
+	call .Lhere
+.Lhere:
 	popl	%ebx
-	addl	$_GLOBAL_OFFSET_TABLE_+[.-L(here)], %ebx
+	addl	$_GLOBAL_OFFSET_TABLE_+[.- .Lhere  ], %ebx
 	call    __errno_location@PLT
 #else
 	call	__errno_location
diff --git a/libc/sysdeps/linux/i386/setjmp.S b/libc/sysdeps/linux/i386/setjmp.S
index debef7017..ef9deebd6 100644
--- a/libc/sysdeps/linux/i386/setjmp.S
+++ b/libc/sysdeps/linux/i386/setjmp.S
@@ -42,7 +42,7 @@ __sigsetjmp:
         movl %ebp, (3 *4)(%eax)  
 
 	/* Make a tail call to __sigjmp_save; it takes the same args.  */
-#ifdef	PIC
+#ifdef	__PIC__
 	/* We cannot use the PLT, because it requires that %ebx be set, but
            we can't save and restore our caller's value.  Instead, we do an
            indirect jump through the GOT, using for the temporary register
diff --git a/libc/sysdeps/linux/i386/syscall.S b/libc/sysdeps/linux/i386/syscall.S
index a70a99701..69cafd4fe 100644
--- a/libc/sysdeps/linux/i386/syscall.S
+++ b/libc/sysdeps/linux/i386/syscall.S
@@ -40,7 +40,7 @@ syscall:
 	cmpl $-4095,%eax
 	jbe .Ldone
 
-#ifdef PIC
+#ifdef __PIC__
 	call Lhere
 Lhere:
 	popl %ebx
@@ -63,7 +63,7 @@ Lhere:
 	movl %eax,errno
 #endif /* __UCLIBC_HAS_THREADS__ */
 
-#endif /* PIC */
+#endif /* __PIC__ */
 
 	movl $-1,%eax
 	.p2align 4,,7
diff --git a/libc/sysdeps/linux/i386/vfork.S b/libc/sysdeps/linux/i386/vfork.S
index 176f25cc3..e2d87053b 100644
--- a/libc/sysdeps/linux/i386/vfork.S
+++ b/libc/sysdeps/linux/i386/vfork.S
@@ -12,13 +12,13 @@
 vfork:
 	popl %ecx
 	movl $190,%eax
-#ifdef PIC
+#ifdef __PIC__
 	pushl %ebx
 #endif
 #APP
 	int $0x80
 #NO_APP
-#ifdef PIC
+#ifdef __PIC__
 	popl %ebx
 #endif
 	cmpl $-4095,%eax
@@ -28,7 +28,7 @@ vfork:
 .Lerror:
 	pushl %ecx
 
-#ifdef PIC
+#ifdef __PIC__
 	pushl %ebx
 	call .Lhere
 .Lhere:
@@ -53,7 +53,7 @@ vfork:
 	movl %eax,errno
 #endif /* __UCLIBC_HAS_THREADS__ */
 
-#endif /* PIC */
+#endif /* __PIC__ */
 	
 	movl $-1,%eax
 	ret
diff --git a/libc/sysdeps/linux/mips/syscall.S b/libc/sysdeps/linux/mips/syscall.S
index c197a25c0..b270e315b 100644
--- a/libc/sysdeps/linux/mips/syscall.S
+++ b/libc/sysdeps/linux/mips/syscall.S
@@ -20,7 +20,7 @@
 #include <asm/asm.h>
 #include <asm/regdef.h>
 
-#ifdef PIC
+#ifdef __PIC__
 	.option pic2
 #endif
 .text
diff --git a/libc/sysdeps/linux/powerpc/mcount.S b/libc/sysdeps/linux/powerpc/mcount.S
index a9e3677a1..303a0dd53 100644
--- a/libc/sysdeps/linux/powerpc/mcount.S
+++ b/libc/sysdeps/linux/powerpc/mcount.S
@@ -69,7 +69,7 @@ _mcount:
 	stw	r10,40(r1)
 	stw	r4, 44(r1)
 	stw	r5,  8(r1)
-#ifdef PIC
+#ifdef __PIC__
 	bl	__mcount_internal@plt
 #else
 	bl	__mcount_internal
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;