diff options
author | Ulrich Drepper <drepper@redhat.com> | 2005-01-26 20:02:05 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2005-01-26 20:02:05 +0000 |
commit | ea9c93ccbb8ef6d4bf5054dedd8cdb8a9d67e144 (patch) | |
tree | 7edcff7da8a35c606e71154d831fa6fb32dbccbe /nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S | |
parent | 24992143d8109a1472f5daa1c9d6a742638a5366 (diff) | |
download | glibc-ea9c93ccbb8ef6d4bf5054dedd8cdb8a9d67e144.tar glibc-ea9c93ccbb8ef6d4bf5054dedd8cdb8a9d67e144.tar.gz glibc-ea9c93ccbb8ef6d4bf5054dedd8cdb8a9d67e144.tar.bz2 glibc-ea9c93ccbb8ef6d4bf5054dedd8cdb8a9d67e144.zip |
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.
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S')
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S | 11 |
1 files changed, 8 insertions, 3 deletions
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 5b24476936..318b53a873 100644 --- 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) |