Update.

2002-12-12  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S: Correct
	access to __libc_locking_needed for PIC.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 5b2f6c69d7977ef0c911d92c78dda271c6c38157..377731d80ce856c107ac7afc3c41af39d1acba26 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-12  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S: Correct
+       access to __libc_locking_needed for PIC.
+
 2002-12-12  Jakub Jelinek  <jakub@redhat.com>
 
        * sysdeps/pthread/bits/libc-lock.h (__libc_locking_needed): Only

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
index 9a124ab0c2b1eaa39eedfb6f2315a7ac217d1d97..107590974c7a31a11adaec59da0bf28d0f3289ee 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
@@ -48,7 +48,13 @@ __lll_lock_wait:
 
        orl     $-1, %eax       /* Load -1.  */
 #ifndef UP
+# ifdef PIC
+       call    __i686.get_pc_thunk.bx
+       addl    $_GLOBAL_OFFSET_TABLE_, %ebx
+       cmpl    $0, __libc_locking_needed@GOTOFF(%ebx)
+# else
        cmpl    $0, __libc_locking_needed
+# endif
        je,pt   0f
        lock
 0:
@@ -77,7 +83,13 @@ lll_unlock_wake_cb:
 
        movl    20(%esp), %ebx
 #ifndef UP
+# ifdef PIC
+       call    __i686.get_pc_thunk.bx
+       addl    $_GLOBAL_OFFSET_TABLE_, %ebx
+       cmpl    $0, __libc_locking_needed@GOTOFF(%ebx)
+# else
        cmpl    $0, __libc_locking_needed
+# endif
        je,pt   0f
        lock
 0:
@@ -182,3 +194,12 @@ __lll_timedwait_tid:
 6:     movl    $ETIMEDOUT, %eax
        jmp     3b
        .size   __lll_timedwait_tid,.-__lll_timedwait_tid
+
+
+       .section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits
+       .globl __i686.get_pc_thunk.bx
+       .hidden __i686.get_pc_thunk.bx
+       .type __i686.get_pc_thunk.bx,@function
+__i686.get_pc_thunk.bx:
+       movl    (%esp), %ebx
+       ret

diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index 395121edbb5672932f8e5514fa1ef0240a47ff83..7bf146e8be4554340ab6f652f14126f96038dfcd 100644 (file)
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -94,6 +94,7 @@
 __i686.get_pc_thunk.reg:                                                     \
   movl (%esp), %e##reg;                                                              \
   ret;                                                                       \
+  .size __i686.get_pc_thunk.reg, . - __i686.get_pc_thunk.reg;                \
   .previous;                                                                 \
   call __i686.get_pc_thunk.reg
 # endif