32 files changed, 16 insertions, 15 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/Makefile b/sysdeps/unix/sysv/linux/alpha/Makefile
index 9676feea98..3769befb3c 100644
--- a/sysdeps/unix/sysv/linux/alpha/Makefile
+++ b/sysdeps/unix/sysv/linux/alpha/Makefile
@@ -37,3 +37,8 @@ ifeq ($(subdir),math)
 # Provide these routines here as well.
 libm-routines += multc3 divtc3
 endif   # math
+
+ifeq ($(subdir),nptl)
+# pull in __syscall_error routine, __sigprocmask, __syscall_rt_sigaction
+libpthread-routines += ptw-sysdep ptw-sigprocmask ptw-rt_sigaction
+endif
diff --git a/sysdeps/unix/sysv/linux/alpha/Versions b/sysdeps/unix/sysv/linux/alpha/Versions
index b3cec3a75f..29b82f999b 100644
--- a/sysdeps/unix/sysv/linux/alpha/Versions
+++ b/sysdeps/unix/sysv/linux/alpha/Versions
@@ -94,9 +94,20 @@ ld {
     __libc_alpha_cache_shape;
   }
 }
+libpthread {
+  GLIBC_2.3.3 {
+    # Changed PTHREAD_STACK_MIN.
+    pthread_attr_setstack; pthread_attr_setstacksize;
+  }
+}
 librt {
   GLIBC_2.3 {
     # AIO functions.
     aio_cancel; aio_cancel64;
   }
+  GLIBC_2.3.3 {
+    # Changed timer_t.
+    timer_create; timer_delete; timer_getoverrun; timer_gettime;
+    timer_settime;
+  }
 }
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/aio_cancel.c b/sysdeps/unix/sysv/linux/alpha/aio_cancel.c
index 0d6da82919..0d6da82919 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/aio_cancel.c
+++ b/sysdeps/unix/sysv/linux/alpha/aio_cancel.c
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/bits/local_lim.h b/sysdeps/unix/sysv/linux/alpha/bits/local_lim.h
index 950273e063..950273e063 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/bits/local_lim.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/local_lim.h
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/bits/pthreadtypes.h b/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h
index 3dbe6127dd..3dbe6127dd 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/bits/pthreadtypes.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/bits/semaphore.h b/sysdeps/unix/sysv/linux/alpha/bits/semaphore.h
index 4e30f94c96..4e30f94c96 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/bits/semaphore.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/semaphore.h
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/c++-types.data b/sysdeps/unix/sysv/linux/alpha/c++-types.data
index f264ed84ba..f264ed84ba 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/c++-types.data
+++ b/sysdeps/unix/sysv/linux/alpha/c++-types.data
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/createthread.c b/sysdeps/unix/sysv/linux/alpha/createthread.c
index 9e88ae992a..9e88ae992a 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/createthread.c
+++ b/sysdeps/unix/sysv/linux/alpha/createthread.c
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/ld.abilist b/sysdeps/unix/sysv/linux/alpha/ld.abilist
index 23ff7fa799..23ff7fa799 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/ld.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/ld.abilist
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/alpha/libBrokenLocale.abilist
index f4ca37f44b..f4ca37f44b 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/libBrokenLocale.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libBrokenLocale.abilist
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/alpha/libanl.abilist
index c9755d8a33..c9755d8a33 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/libanl.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libanl.abilist
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 980e08857a..980e08857a 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/alpha/libcrypt.abilist
index 1df145f260..1df145f260 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/libcrypt.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libcrypt.abilist
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/alpha/libdl.abilist
index 62e6b41edb..62e6b41edb 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libdl.abilist
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/libm.abilist b/sysdeps/unix/sysv/linux/alpha/libm.abilist
index d9b44b531a..d9b44b531a 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/libm.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libm.abilist
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/alpha/libnsl.abilist
index 4241e2d887..4241e2d887 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/libnsl.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libnsl.abilist
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index 4c75b17e00..4c75b17e00 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
index 808d0f2f74..808d0f2f74 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libresolv.abilist
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/librt.abilist b/sysdeps/unix/sysv/linux/alpha/librt.abilist
index d710117080..d710117080 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/librt.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/librt.abilist
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/alpha/libthread_db.abilist
index f33138067c..f33138067c 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/libthread_db.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libthread_db.abilist
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/alpha/libutil.abilist
index 7422687e3c..7422687e3c 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/libutil.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libutil.abilist
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/localplt.data b/sysdeps/unix/sysv/linux/alpha/localplt.data
index 6b2e51599c..6b2e51599c 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/localplt.data
+++ b/sysdeps/unix/sysv/linux/alpha/localplt.data
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h b/sysdeps/unix/sysv/linux/alpha/lowlevellock.h
index 361bd342f1..361bd342f1 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/alpha/lowlevellock.h
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/Makefile b/sysdeps/unix/sysv/linux/alpha/nptl/Makefile
deleted file mode 100644
index 8c80840798..0000000000
--- a/sysdeps/unix/sysv/linux/alpha/nptl/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-# pull in __syscall_error routine, __sigprocmask, __syscall_rt_sigaction
-libpthread-routines += ptw-sysdep ptw-sigprocmask ptw-rt_sigaction
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/Versions b/sysdeps/unix/sysv/linux/alpha/nptl/Versions
deleted file mode 100644
index 437c4da28b..0000000000
--- a/sysdeps/unix/sysv/linux/alpha/nptl/Versions
+++ /dev/null
@@ -1,13 +0,0 @@
-libpthread {
-  GLIBC_2.3.3 {
-    # Changed PTHREAD_STACK_MIN.
-    pthread_attr_setstack; pthread_attr_setstacksize;
-  }
-}
-librt {
-  GLIBC_2.3.3 {
-    # Changed timer_t.
-    timer_create; timer_delete; timer_getoverrun; timer_gettime;
-    timer_settime;
-  }
-}
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c b/sysdeps/unix/sysv/linux/alpha/sem_post.c
index befa49723b..befa49723b 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c
+++ b/sysdeps/unix/sysv/linux/alpha/sem_post.c
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h
index 69809bc9e1..69809bc9e1 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c b/sysdeps/unix/sysv/linux/alpha/timer_create.c
index d307135003..d307135003 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c
+++ b/sysdeps/unix/sysv/linux/alpha/timer_create.c
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c b/sysdeps/unix/sysv/linux/alpha/timer_delete.c
index 2dd94f5c7a..2dd94f5c7a 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c
+++ b/sysdeps/unix/sysv/linux/alpha/timer_delete.c
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c b/sysdeps/unix/sysv/linux/alpha/timer_getoverr.c
index 22eaff5cda..22eaff5cda 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c
+++ b/sysdeps/unix/sysv/linux/alpha/timer_getoverr.c
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c b/sysdeps/unix/sysv/linux/alpha/timer_gettime.c
index cea524bae5..cea524bae5 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c
+++ b/sysdeps/unix/sysv/linux/alpha/timer_gettime.c
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c b/sysdeps/unix/sysv/linux/alpha/timer_settime.c
index fa231149d5..fa231149d5 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c
+++ b/sysdeps/unix/sysv/linux/alpha/timer_settime.c