2003-03-12 Roland McGrath <roland@redhat.com>

	* pthread-errnos.sym: New file.
	* Makefile (gen-as-const-headers): New variable, list that file.
	* sysdeps/unix/sysv/linux/i386/i486/sem_wait.S: Include generated
	header <pthread-errnos.h> instead of defining errno values here.
	* sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S: Likewise.
	* sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S: Likewise.
	* sysdeps/unix/sysv/linux/i386/i486/sem_post.S: Likewise.
	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S: Likewise.
	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S:
	Likewise.
	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S:
	Likewise.
	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S: Likewise.
	* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S: Likewise.
	* sysdeps/unix/sysv/linux/i386/i486/lowlevelmutex.S: Likewise.
	* sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/sem_wait.S: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/sem_trywait.S: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/sem_post.S: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/lowlevelmutex.S: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S: Likewise.
	* sysdeps/unix/sysv/linux/sh/sem_trywait.S: Likewise.
	* sysdeps/unix/sysv/linux/sh/sem_timedwait.S: Likewise.
	* sysdeps/unix/sysv/linux/sh/sem_post.S: Likewise.
	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S: Likewise.
	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S: Likewise.
	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S: Likewise.
	* sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S: Likewise.
	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S: Likewise.
	* sysdeps/unix/sysv/linux/sh/lowlevellock.S: Likewise.
	* sysdeps/i386/i486/pthread_spin_trylock.S: Likewise.
	* sysdeps/x86_64/pthread_spin_trylock.S: Likewise.
	* sysdeps/sh/pthread_spin_trylock.S: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S: Likewise.

diff --git a/nptl/Makefile b/nptl/Makefile
index 628eebc1cfa7eacc36c62aa44468e340a6b18ee4..b59ffd86bb007ae361bdd5b52e9ac99ec7d23be4 100644 (file)
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -144,7 +144,7 @@ tests = tst-attr1 tst-attr2 \
        tst-eintr1 \
        tst-tsd1 tst-tsd2 \
        tst-tls1 tst-tls2 \
-       tst-fork1 tst-fork2 tst-fork3 \
+       tst-fork1 tst-fork2 tst-fork3 tst-fork4 \
        tst-atfork1 \
        tst-cancel1 tst-cancel2 tst-cancel3 tst-cancel4 tst-cancel5 \
        tst-cancel6 tst-cancel7 tst-cancel8 tst-cancel9 tst-cancel10 \
@@ -166,6 +166,8 @@ tests = tst-attr1 tst-attr2 \
 
 distribute = eintr.c
 
+gen-as-const-headers = pthread-errnos.sym
+
 LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete,-z,initfirst
 
 

diff --git a/nptl/pthread-errnos.sym b/nptl/pthread-errnos.sym
new file mode 100644 (file)
index 0000000..a3289c6
--- /dev/null
+++ b/nptl/pthread-errnos.sym
@@ -0,0 +1,11 @@
+#include <errno.h>
+
+-- These errno codes are used by some assembly code.
+
+EAGAIN         EAGAIN
+EBUSY          EBUSY
+EDEADLK                EDEADLK
+EINTR          EINTR
+EINVAL         EINVAL
+ETIMEDOUT      ETIMEDOUT
+EWOULDBLOCK    EWOULDBLOCK

diff --git a/nptl/sysdeps/i386/i486/pthread_spin_trylock.S b/nptl/sysdeps/i386/i486/pthread_spin_trylock.S
index 0a27312c726e0aa1d86aac6fd9d96b8504966006..e30072c3d57f3e7b14a5de6d188ef4511b96c75b 100644 (file)
--- a/nptl/sysdeps/i386/i486/pthread_spin_trylock.S
+++ b/nptl/sysdeps/i386/i486/pthread_spin_trylock.S
@@ -17,7 +17,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#define EBUSY  16
+#include <pthread-errnos.h>
 
 
 #ifdef UP

diff --git a/nptl/sysdeps/sh/pthread_spin_trylock.S b/nptl/sysdeps/sh/pthread_spin_trylock.S
index 63ae4d36af982abc93a6594222cea4ffdb6886c4..18112ba23009e7d9adf5001cf10bfe2dcc769e00 100644 (file)
--- a/nptl/sysdeps/sh/pthread_spin_trylock.S
+++ b/nptl/sysdeps/sh/pthread_spin_trylock.S
@@ -16,7 +16,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#define EBUSY  16
+#include <pthread-errnos.h>
 
        .globl  pthread_spin_trylock
        .type   pthread_spin_trylock,@function
@@ -24,7 +24,7 @@
 pthread_spin_trylock:
        tas.b   @r4
        bf/s    1f
-        mov    #EBUSY, r0
+       mov     #EBUSY, r0
        mov     #0, r0
 1:
        rts

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
index adb18e6e33c9d51f7c37a2b152a27d7474481628..f27fe2bc1f71c07c30c4daedc9282605922896d2 100644 (file)
--- 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 f5aa5a48e347fbbecc3488a25f5bca8a8ca1b7b9..d4fb50ac5b9a1a671316285e4550139be9b95e2c 100644 (file)
--- 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 811741b06d707633c883d5f6c88f895f50dab937..9082fd5f4f742839432304d5e3750bca40123dfa 100644 (file)
--- 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 43d00a2300534e833a48e31001112da62bdddcc8..064d30dc345b3e31d4f080c440fa4a8e3e3870d2 100644 (file)
--- 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 a0b2734280565ed55a3239b6043700e548620782..1fd04f815d628377479214993520e44ba856ad44 100644 (file)
--- 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 8c6245afb7bf37bf74b46dfa48d7a18e0e82f3c1..ee9e6fa00e795196a9252bd6c0871ac88f924984 100644 (file)
--- 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 045537234395120f0708b64a5b0c585317ae75e5..6c8b9e6d5683bd3a98957af41249a4eb3bc3ac01 100644 (file)
--- 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 984cb72007cba01841613dda8cd9358b9c9f808f..439004a55b561f03fa700e426f1f53a495d94672 100644 (file)
--- 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 e39a6dde8e64955a0249f6138a72aff164743532..aa3d74593d08cd0e2b7086260136f433052cdb66 100644 (file)
--- 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 4e93ae537cda2ad1730cae6e3dd879399bc8188d..8dfbe9c12e8b09342d0d3de356bad5db93aeb36a 100644 (file)
--- 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 46e6f8095db213e4d7d89024ebd3d886cb2b330e..ba5f5cf427b48d6bbafafb1b0c2d337d1d54fea5 100644 (file)
--- 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
 

diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
index 3a157a0583a1abafbee423c84c9ba346a6756989..ecb005903635a5af8a5b2337cc9255cec26bfa37 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
@@ -17,6 +17,7 @@
    02111-1307 USA.  */
 
 #include <sysdep.h>
+#include <pthread-errnos.h>
 #include "lowlevel-atomic.h"
 
        .text
@@ -26,8 +27,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/sh/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
index f0be38a79752034a8e472377f8b8a4720ca0486c..59aeff70fbae2d71a44dc93ee2a54aa29e73874f 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
@@ -19,6 +19,7 @@
 #include <sysdep.h>
 #include <shlib-compat.h>
 #include <lowlevelcond.h>
+#include <pthread-errnos.h>
 #include "lowlevel-atomic.h"
 
 #define SYS_gettimeofday       __NR_gettimeofday
@@ -26,8 +27,6 @@
 #define FUTEX_WAIT             0
 #define FUTEX_WAKE             1
 
-#define ETIMEDOUT              110
-
 
        .text
 
@@ -164,7 +163,7 @@ __pthread_cond_timedwait:
        mov.l   .Ldisable1, r1
        bsrf    r1
         mov.l  @r15, r4
-.Ldisable1b:   
+.Ldisable1b:
 
        /* Lock.  */
        mov     #1, r3

diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S b/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S
index 2c6adf81c2ceccac2cac8b6545cf0ec57a780ec1..1aa1c72bbf660e30293bbd66e702f8e3530d9e58 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S
@@ -19,15 +19,13 @@
 #include <sysdep.h>
 #include <lowlevelrwlock.h>
 #include <tcb-offsets.h>
+#include <pthread-errnos.h>
 #include "lowlevel-atomic.h"
 
 #define SYS_futex              240
 #define FUTEX_WAIT             0
 #define FUTEX_WAKE             1
 
-#define EAGAIN         11
-#define EDEADLK                35
-
 
        .text
 
@@ -207,7 +205,7 @@ __pthread_rwlock_rdlock:
        .long   __lll_mutex_lock_wait-.Lwait0b
 .Lwake0:
        .long   __lll_mutex_unlock_wake-.Lwake0b
-.Lwait1:       
+.Lwait1:
        .long   __lll_mutex_lock_wait-.Lwait1b
 .Lwake1:
        .long   __lll_mutex_unlock_wake-.Lwake1b

diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S b/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S
index b287dd434ba9187c29ee7c1204f90acc68949aa6..84b5cdda3bf2f0e75aeb5e5fd5ad9b90c0f08ab3 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S
@@ -19,6 +19,7 @@
 #include <sysdep.h>
 #include <lowlevelrwlock.h>
 #include <tcb-offsets.h>
+#include <pthread-errnos.h>
 #include "lowlevel-atomic.h"
 
 #define SYS_gettimeofday       __NR_gettimeofday
@@ -26,10 +27,6 @@
 #define FUTEX_WAIT             0
 #define FUTEX_WAKE             1
 
-#define EAGAIN         11
-#define EDEADLK                35
-#define ETIMEDOUT      110
-
 
        .text
 
@@ -263,11 +260,11 @@ pthread_rwlock_timedrdlock:
 .Ltcboff:
        .word   TLS_PRE_TCB_SIZE
        .align  2
-.Lwait2:       
+.Lwait2:
        .long   __lll_mutex_lock_wait-.Lwait2b
 .Lwake2:
        .long   __lll_mutex_unlock_wake-.Lwake2b
-.Lwait3:       
+.Lwait3:
        .long   __lll_mutex_lock_wait-.Lwait3b
 .Lwake3:
        .long   __lll_mutex_unlock_wake-.Lwake3b

diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S b/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S
index 2e9bf05b0096d771214fc2a6264f8831076b676c..60ff48f90a3598d0a5a242f862dbf53d2059568f 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S
@@ -19,6 +19,7 @@
 #include <sysdep.h>
 #include <lowlevelrwlock.h>
 #include <tcb-offsets.h>
+#include <pthread-errnos.h>
 #include "lowlevel-atomic.h"
 
 #define SYS_gettimeofday       __NR_gettimeofday
@@ -26,10 +27,6 @@
 #define FUTEX_WAIT             0
 #define FUTEX_WAKE             1
 
-#define EAGAIN         11
-#define EDEADLK                35
-#define ETIMEDOUT      110
-
 
        .text
 
@@ -248,11 +245,11 @@ pthread_rwlock_timedwrlock:
 .Ltcboff:
        .word   TLS_PRE_TCB_SIZE
        .align  2
-.Lwait6:       
+.Lwait6:
        .long   __lll_mutex_lock_wait-.Lwait6b
 .Lwake6:
        .long   __lll_mutex_unlock_wake-.Lwake6b
-.Lwait7:       
+.Lwait7:
        .long   __lll_mutex_lock_wait-.Lwait7b
 .Lwake7:
        .long   __lll_mutex_unlock_wake-.Lwake7b

diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S b/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S
index 20c84235cecb202938e44095c7e504b755196df9..06d56e04cb1ca193ef1bbc0f4fa0a4a96412fa36 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S
@@ -19,15 +19,13 @@
 #include <sysdep.h>
 #include <lowlevelrwlock.h>
 #include <tcb-offsets.h>
+#include <pthread-errnos.h>
 #include "lowlevel-atomic.h"
 
 #define SYS_futex              240
 #define FUTEX_WAIT             0
 #define FUTEX_WAKE             1
 
-#define EAGAIN         11
-#define EDEADLK                35
-
 
        .text
 
@@ -187,11 +185,11 @@ __pthread_rwlock_wrlock:
 .Ltcboff:
        .word   TLS_PRE_TCB_SIZE
        .align  2
-.Lwait4:       
+.Lwait4:
        .long   __lll_mutex_lock_wait-.Lwait4b
 .Lwake4:
        .long   __lll_mutex_unlock_wake-.Lwake4b
-.Lwait5:       
+.Lwait5:
        .long   __lll_mutex_lock_wait-.Lwait5b
 .Lwake5:
        .long   __lll_mutex_unlock_wake-.Lwake5b

diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sem_post.S b/nptl/sysdeps/unix/sysv/linux/sh/sem_post.S
index 9f338473393197aa5a50c11b98c0f000d10898ff..90e63ed1848cf76dec981a8d931a842bb9d22cf6 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/sh/sem_post.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/sem_post.S
@@ -18,6 +18,7 @@
 
 #include <sysdep.h>
 #include <shlib-compat.h>
+#include <pthread-errnos.h>
 #include "lowlevel-atomic.h"
 
 
@@ -26,12 +27,6 @@
 #define FUTEX_WAIT             0
 #define FUTEX_WAKE             1
 
-#define EINTR                  4
-#define EAGAIN                 11
-#define EWOULDBLOCK            EAGAIN
-#define EINVAL                 22
-#define ETIMEDOUT              110
-
        .text
 
        .globl  __new_sem_post

diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S b/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S
index 741d66383f7a017896bdbbb711c31cd9886e8083..b6d4d4c88600daa16ff4cc9acaaef1ea0353d714 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S
@@ -18,6 +18,7 @@
 
 #include <sysdep.h>
 #include <shlib-compat.h>
+#include <pthread-errnos.h>
 #include "lowlevel-atomic.h"
 
 
@@ -26,12 +27,6 @@
 #define FUTEX_WAIT             0
 #define FUTEX_WAKE             1
 
-#define EINTR                  4
-#define EAGAIN                 11
-#define EWOULDBLOCK            EAGAIN
-#define EINVAL                 22
-#define ETIMEDOUT              110
-
        .text
 
        .globl  sem_timedwait

diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S b/nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S
index 130536234dd62b14c82dcc7949d0783a17b84488..c80839ef3056669107b53d4a6e08401d40c6a0af 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S
@@ -18,6 +18,7 @@
 
 #include <sysdep.h>
 #include <shlib-compat.h>
+#include <pthread-errnos.h>
 #include "lowlevel-atomic.h"
 
 
@@ -26,12 +27,6 @@
 #define FUTEX_WAIT             0
 #define FUTEX_WAKE             1
 
-#define EINTR                  4
-#define EAGAIN                 11
-#define EWOULDBLOCK            EAGAIN
-#define EINVAL                 22
-#define ETIMEDOUT              110
-
        .text
 
        .globl  __new_sem_trywait

diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
index 39215280d520303d6ac26be1514d1f873c5cd810..9068f3ba4626995c3f78904f2bcdc68b7ae8ec10 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/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
-
 
        /* Modified: %rax, %rsi.  */
        .globl  __lll_lock_wait

diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelmutex.S b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelmutex.S
index 2e36b9a72dd235d0472d894449c04d9c3a76b3b6..4612ba6ccfb74b9362b9123787b269b04545d5f3 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelmutex.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/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/x86_64/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
index d059e64945744ca94eb5dc3354ebe6bbd38356c9..a293c52a9df111fec163f8da4b0a349f94d9cd28 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/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/x86_64/pthread_rwlock_rdlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
index 6ef605cde141de7d2e80bc6d41f08ba68339cbcd..2e8e2979a3a4ca24df65ac8887cd761fa7bba9c9 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
@@ -19,15 +19,13 @@
 
 #include <sysdep.h>
 #include <lowlevelrwlock.h>
+#include <pthread-errnos.h>
 
 
 #define SYS_futex              202
 #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/x86_64/pthread_rwlock_wrlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
index 3de464afc43ccdbd7a9f0a7059e0ecbe8b59369d..585c1869173ea4ac05511b684909ce27ef0040b2 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
@@ -19,15 +19,13 @@
 
 #include <sysdep.h>
 #include <lowlevelrwlock.h>
+#include <pthread-errnos.h>
 
 
 #define SYS_futex              202
 #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/x86_64/sem_post.S b/nptl/sysdeps/unix/sysv/linux/x86_64/sem_post.S
index 6189a9ac6e6b95036d8ce74ba7136bc9480cd68f..43e73e21529eb9da9eb00dd5af3a85ca428b1238 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_post.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/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              202
 #define FUTEX_WAKE             1
 
-#define EINVAL                 22
-
 
        .text
 

diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S
index 8f73d6a2081b0c4fe814f59d52b7664ae59665b5..af52f2a67011874aec103e48856516690590846e 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S
@@ -19,6 +19,7 @@
 
 #include <sysdep.h>
 #include <shlib-compat.h>
+#include <pthread-errnos.h>
 
 #ifndef UP
 # define LOCK lock
@@ -29,10 +30,6 @@
 #define SYS_gettimeofday       __NR_gettimeofday
 #define SYS_futex              202
 
-#define EWOULDBLOCK            11
-#define EINVAL                 22
-#define ETIMEDOUT              110
-
 
        .text
 

diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S
index 5785acff5abda10cb604f1bb4679dba20d336693..8c93dcaa07cd613c35e757264f5cad2e4345e76b 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/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              202
 #define FUTEX_WAKE             1
 
-#define EAGAIN                 11
-
 
        .text
 

diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S
index 69e6658d673b2220529d1ab5292d5f0de971c33b..2d13a95da5b0ee8111f7383d0786efc20431fd36 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S
@@ -19,6 +19,7 @@
 
 #include <sysdep.h>
 #include <shlib-compat.h>
+#include <pthread-errnos.h>
 
 #ifndef UP
 # define LOCK lock
@@ -28,8 +29,6 @@
 
 #define SYS_futex              202
 
-#define EWOULDBLOCK            11
-
 
        .text
 

diff --git a/nptl/sysdeps/x86_64/pthread_spin_trylock.S b/nptl/sysdeps/x86_64/pthread_spin_trylock.S
index 175714d6b0862f516107a534b352b9707cb57fe8..9b51335830b8da87b2916c28b35f36eba1cac1a6 100644 (file)
--- a/nptl/sysdeps/x86_64/pthread_spin_trylock.S
+++ b/nptl/sysdeps/x86_64/pthread_spin_trylock.S
@@ -17,7 +17,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#define EBUSY  16
+#include <pthread-errnos.h>
 
 
 #ifdef UP