diff options
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/i386')
11 files changed, 11 insertions, 34 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S index adb18e6e33..f27fe2bc1f 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S @@ -18,6 +18,7 @@ 02111-1307 USA. */ #include <sysdep.h> +#include <pthread-errnos.h> .text @@ -34,8 +35,6 @@ #define FUTEX_WAIT 0 #define FUTEX_WAKE 1 -#define ETIMEDOUT 110 - .globl __lll_lock_wait .type __lll_lock_wait,@function diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelmutex.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelmutex.S index f5aa5a48e3..d4fb50ac5b 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelmutex.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelmutex.S @@ -18,6 +18,7 @@ 02111-1307 USA. */ #include <sysdep.h> +#include <pthread-errnos.h> .text @@ -34,10 +35,6 @@ #define FUTEX_WAIT 0 #define FUTEX_WAKE 1 -#define EWOULDBLOCK 11 -#define EINVAL 22 -#define ETIMEDOUT 110 - .globl __lll_mutex_lock_wait .type __lll_mutex_lock_wait,@function diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S index 811741b06d..9082fd5f4f 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S @@ -20,6 +20,7 @@ #include <sysdep.h> #include <shlib-compat.h> #include <lowlevelcond.h> +#include <pthread-errnos.h> #ifdef UP # define LOCK @@ -32,8 +33,6 @@ #define FUTEX_WAIT 0 #define FUTEX_WAKE 1 -#define ETIMEDOUT 110 - .text diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S index 43d00a2300..064d30dc34 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S @@ -19,15 +19,13 @@ #include <sysdep.h> #include <lowlevelrwlock.h> +#include <pthread-errnos.h> #define SYS_futex 240 #define FUTEX_WAIT 0 #define FUTEX_WAKE 1 -#define EAGAIN 11 -#define EDEADLK 35 - #ifndef UP # define LOCK lock #else diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S index a0b2734280..1fd04f815d 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S @@ -19,6 +19,7 @@ #include <sysdep.h> #include <lowlevelrwlock.h> +#include <pthread-errnos.h> #define SYS_gettimeofday __NR_gettimeofday @@ -26,11 +27,6 @@ #define FUTEX_WAIT 0 #define FUTEX_WAKE 1 -#define EAGAIN 11 -#define EINVAL 22 -#define EDEADLK 35 -#define ETIMEDOUT 110 - #ifndef UP # define LOCK lock #else diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S index 8c6245afb7..ee9e6fa00e 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S @@ -19,6 +19,7 @@ #include <sysdep.h> #include <lowlevelrwlock.h> +#include <pthread-errnos.h> #define SYS_gettimeofday __NR_gettimeofday @@ -26,11 +27,6 @@ #define FUTEX_WAIT 0 #define FUTEX_WAKE 1 -#define EAGAIN 11 -#define EINVAL 22 -#define EDEADLK 35 -#define ETIMEDOUT 110 - #ifndef UP # define LOCK lock #else diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S index 0455372343..6c8b9e6d56 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S @@ -19,15 +19,13 @@ #include <sysdep.h> #include <lowlevelrwlock.h> +#include <pthread-errnos.h> #define SYS_futex 240 #define FUTEX_WAIT 0 #define FUTEX_WAKE 1 -#define EAGAIN 11 -#define EDEADLK 35 - #ifndef UP # define LOCK lock #else 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 984cb72007..439004a55b 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S @@ -19,6 +19,7 @@ #include <sysdep.h> #include <shlib-compat.h> +#include <pthread-errnos.h> #ifndef UP # define LOCK lock @@ -29,8 +30,6 @@ #define SYS_futex 240 #define FUTEX_WAKE 1 -#define EINVAL 22 - .text 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 e39a6dde8e..aa3d74593d 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S @@ -19,6 +19,7 @@ #include <sysdep.h> #include <shlib-compat.h> +#include <pthread-errnos.h> #ifndef UP # define LOCK lock @@ -30,10 +31,6 @@ #define SYS_futex 240 #define FUTEX_WAKE 1 -#define EWOULDBLOCK 11 -#define EINVAL 22 -#define ETIMEDOUT 110 - .text 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 4e93ae537c..8dfbe9c12e 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S @@ -19,6 +19,7 @@ #include <sysdep.h> #include <shlib-compat.h> +#include <pthread-errnos.h> #ifndef UP # define LOCK lock @@ -29,8 +30,6 @@ #define SYS_futex 240 #define FUTEX_WAKE 1 -#define EAGAIN 11 - .text 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 46e6f8095d..ba5f5cf427 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S @@ -19,6 +19,7 @@ #include <sysdep.h> #include <shlib-compat.h> +#include <pthread-errnos.h> #ifndef UP # define LOCK lock @@ -29,8 +30,6 @@ #define SYS_futex 240 #define FUTEX_WAKE 1 -#define EWOULDBLOCK 11 - .text |