Update.

2005-01-26  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/kernel-features.h: Found reference to
	MSG_NOSIGNAL being in 2.2 kernels.

diff --git a/ChangeLog b/ChangeLog
index 77a3174..8b3e3e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-26  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/unix/sysv/linux/kernel-features.h: Found reference to
+       MSG_NOSIGNAL being in 2.2 kernels.
+
 2005-01-26  Jakub Jelinek  <jakub@redhat.com>
 
        * sysdeps/unix/sysv/linux/i386/sysdep.h

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 61aca26..e299ba9 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,15 @@
+2005-01-26  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S (__new_sem_trywait):
+       Use direct %gs segment access or, if NO_TLS_DIRECT_SEG_REFS,
+       at least gotntpoff relocation and addition.
+       * sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S (sem_timedwait):
+       Likewise.
+       * sysdeps/unix/sysv/linux/i386/i486/sem_post.S (__new_sem_post):
+       Likewise.
+       * sysdeps/unix/sysv/linux/i386/i486/sem_wait.S (__new_sem_wait):
+       Likewise.
+
 2005-01-06  Ulrich Drepper  <drepper@redhat.com>
 
        * allocatestack.c (init_one_static_tls): Adjust initialization of DTV

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S
index 3d67329..71e96d2 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -65,9 +65,14 @@ __new_sem_post:
 #endif
        addl    $_GLOBAL_OFFSET_TABLE_, %ebx
 #if USE___THREAD
-       movl    %gs:0, %edx
-       subl    errno@gottpoff(%ebx), %edx
+# ifdef NO_TLS_DIRECT_SEG_REFS
+       movl    errno@gotntpoff(%ebx), %edx
+       addl    %gs:0, %edx
        movl    $EINVAL, (%edx)
+# else
+       movl    errno@gotntpoff(%ebx), %edx
+       movl    $EINVAL, %gs:(%edx)
+# endif
 #else
        call    __errno_location@plt
        movl    $EINVAL, (%eax)

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S
index 5b24476..318b53a 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -158,9 +158,14 @@ sem_timedwait:
 #endif
        addl    $_GLOBAL_OFFSET_TABLE_, %ebx
 #if USE___THREAD
-       movl    %gs:0, %edx
-       subl    errno@gottpoff(%ebx), %edx
+# ifdef NO_TLS_DIRECT_SEG_REFS
+       movl    errno@gotntpoff(%ebx), %edx
+       addl    %gs:0, %edx
        movl    %esi, (%edx)
+# else
+       movl    errno@gotntpoff(%ebx), %edx
+       movl    %esi, %gs:(%edx)
+# endif
 #else
        call    __errno_location@plt
        movl    %esi, (%eax)

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S
index a7c405d..d36a108 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -55,9 +55,14 @@ __new_sem_trywait:
 #endif
        addl    $_GLOBAL_OFFSET_TABLE_, %ecx
 #if USE___THREAD
-       movl    %gs:0, %edx
-       subl    errno@gottpoff(%ecx), %edx
+# ifdef NO_TLS_DIRECT_SEG_REFS
+       movl    errno@gotntpoff(%ecx), %edx
+       addl    %gs:0, %edx
        movl    $EAGAIN, (%edx)
+# else
+       movl    errno@gotntpoff(%ecx), %edx
+       movl    $EAGAIN, %gs:(%edx)
+# endif
 #else
        call    __errno_location@plt
        movl    $EAGAIN, (%eax)

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
index b7674dc..1605b69 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -102,9 +102,14 @@ __new_sem_wait:
 #endif
        addl    $_GLOBAL_OFFSET_TABLE_, %ebx
 #if USE___THREAD
-       movl    %gs:0, %edx
-       subl    errno@gottpoff(%ebx), %edx
+# ifdef NO_TLS_DIRECT_SEG_REFS
+       movl    errno@gotntpoff(%ebx), %edx
+       addl    %gs:0, %edx
        movl    %esi, (%edx)
+# else
+       movl    errno@gotntpoff(%ebx), %edx
+       movl    %esi, %gs:(%edx)
+# endif
 #else
        call    __errno_location@plt
        movl    %esi, (%eax)

diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 39b980e..83ebe0c 100644 (file)
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -79,8 +79,8 @@
 # define __ASSUME_SIOCGIFNAME          1
 #endif
 
-/* MSG_NOSIGNAL was at least available with Linux 2.3.15.  */
-#if __LINUX_KERNEL_VERSION >= 131855
+/* MSG_NOSIGNAL was at least available with Linux 2.2.0.  */
+#if __LINUX_KERNEL_VERSION >= 131584
 # define __ASSUME_MSG_NOSIGNAL         1
 #endif