IA64: Consolidate nptl/ subdirectories under linux/...

31 files changed, 18 insertions, 17 deletions

diff --git a/sysdeps/unix/sysv/linux/ia64/Makefile b/sysdeps/unix/sysv/linux/ia64/Makefile
index bbfd6a2392..f1049c3c47 100644
--- a/sysdeps/unix/sysv/linux/ia64/Makefile
+++ b/sysdeps/unix/sysv/linux/ia64/Makefile
@@ -26,3 +26,7 @@ endif
 # This is a crude attempt to silence the compiler which complains about
 # then 'current' definition in the kernel headers.
 CPPFLAGS += -D_ASM_IA64_CURRENT_H
+
+ifeq ($(subdir),nptl)
+libpthread-sysdep_routines += __ia64_longjmp unwind_longjmp __sigstack_longjmp
+endif
diff --git a/sysdeps/unix/sysv/linux/ia64/Versions b/sysdeps/unix/sysv/linux/ia64/Versions
index 13d710a078..b38d6ef62e 100644
--- a/sysdeps/unix/sysv/linux/ia64/Versions
+++ b/sysdeps/unix/sysv/linux/ia64/Versions
@@ -23,3 +23,16 @@ libc {
     getunwind;
   }
 }
+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/ia64/nptl/__ia64_longjmp.S b/sysdeps/unix/sysv/linux/ia64/__ia64_longjmp.S
index 274f7588d5..274f7588d5 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/__ia64_longjmp.S
+++ b/sysdeps/unix/sysv/linux/ia64/__ia64_longjmp.S
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/__sigstack_longjmp.c b/sysdeps/unix/sysv/linux/ia64/__sigstack_longjmp.c
index 8c6a85b3a9..8c6a85b3a9 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/__sigstack_longjmp.c
+++ b/sysdeps/unix/sysv/linux/ia64/__sigstack_longjmp.c
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/c++-types.data b/sysdeps/unix/sysv/linux/ia64/c++-types.data
index 23c11dc41b..23c11dc41b 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/c++-types.data
+++ b/sysdeps/unix/sysv/linux/ia64/c++-types.data
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h b/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h
index 64c6ecd4bc..64c6ecd4bc 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
+++ b/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/ld.abilist b/sysdeps/unix/sysv/linux/ia64/ld.abilist
index 9ad04eddad..9ad04eddad 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/ld.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/ld.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/ia64/libBrokenLocale.abilist
index b7aa242c86..b7aa242c86 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/libBrokenLocale.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libBrokenLocale.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/ia64/libanl.abilist
index c9755d8a33..c9755d8a33 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/libanl.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libanl.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
index 067552d175..067552d175 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/libc.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/ia64/libcrypt.abilist
index 1df145f260..1df145f260 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libcrypt.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/ia64/libdl.abilist
index 62e6b41edb..62e6b41edb 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libdl.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libm.abilist b/sysdeps/unix/sysv/linux/ia64/libm.abilist
index db8b279110..db8b279110 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/libm.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libm.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/ia64/libnsl.abilist
index 4241e2d887..4241e2d887 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/libnsl.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libnsl.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
index a84c113594..a84c113594 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
index 808d0f2f74..808d0f2f74 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libresolv.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/librt.abilist b/sysdeps/unix/sysv/linux/ia64/librt.abilist
index 371d135c8d..371d135c8d 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/librt.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/librt.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/ia64/libthread_db.abilist
index f33138067c..f33138067c 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/libthread_db.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libthread_db.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/ia64/libutil.abilist
index 7422687e3c..7422687e3c 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/libutil.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libutil.abilist
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/localplt.data b/sysdeps/unix/sysv/linux/ia64/localplt.data
index ba488163bb..ba488163bb 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/localplt.data
+++ b/sysdeps/unix/sysv/linux/ia64/localplt.data
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h b/sysdeps/unix/sysv/linux/ia64/lowlevellock.h
index e84f530834..e84f530834 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/ia64/lowlevellock.h
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/Makefile b/sysdeps/unix/sysv/linux/ia64/nptl/Makefile
deleted file mode 100644
index ff98f1a494..0000000000
--- a/sysdeps/unix/sysv/linux/ia64/nptl/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-ifeq ($(subdir),nptl)
-libpthread-sysdep_routines += __ia64_longjmp unwind_longjmp __sigstack_longjmp
-endif
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/Versions b/sysdeps/unix/sysv/linux/ia64/nptl/Versions
deleted file mode 100644
index 437c4da28b..0000000000
--- a/sysdeps/unix/sysv/linux/ia64/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/ia64/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
index 5b08748949..5b08748949 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/timer_create.c b/sysdeps/unix/sysv/linux/ia64/timer_create.c
index d307135003..d307135003 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/timer_create.c
+++ b/sysdeps/unix/sysv/linux/ia64/timer_create.c
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/timer_delete.c b/sysdeps/unix/sysv/linux/ia64/timer_delete.c
index 2dd94f5c7a..2dd94f5c7a 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/timer_delete.c
+++ b/sysdeps/unix/sysv/linux/ia64/timer_delete.c
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/timer_getoverr.c b/sysdeps/unix/sysv/linux/ia64/timer_getoverr.c
index 22eaff5cda..22eaff5cda 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/timer_getoverr.c
+++ b/sysdeps/unix/sysv/linux/ia64/timer_getoverr.c
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/timer_gettime.c b/sysdeps/unix/sysv/linux/ia64/timer_gettime.c
index cea524bae5..cea524bae5 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/timer_gettime.c
+++ b/sysdeps/unix/sysv/linux/ia64/timer_gettime.c
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/timer_settime.c b/sysdeps/unix/sysv/linux/ia64/timer_settime.c
index fa231149d5..fa231149d5 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/timer_settime.c
+++ b/sysdeps/unix/sysv/linux/ia64/timer_settime.c
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/unwind-forcedunwind.c b/sysdeps/unix/sysv/linux/ia64/unwind-forcedunwind.c
index dd5229458b..8bc2e9721c 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/unwind-forcedunwind.c
+++ b/sysdeps/unix/sysv/linux/ia64/unwind-forcedunwind.c
@@ -26,7 +26,7 @@ static _Unwind_Word (*libgcc_s_getbsp) (struct _Unwind_Context *);
 #define ARCH_CANCEL_INIT(handle) \
   ((libgcc_s_getbsp = __libc_dlsym (handle, "_Unwind_GetBSP")) == NULL)
 
-#include <sysdeps/pthread/unwind-forcedunwind.c>
+#include <sysdeps/nptl/unwind-forcedunwind.c>
 
 _Unwind_Word
 _Unwind_GetBSP (struct _Unwind_Context *context)
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/unwind_longjmp.c b/sysdeps/unix/sysv/linux/ia64/unwind_longjmp.c
index 0b55598e85..0b55598e85 100644
--- a/sysdeps/unix/sysv/linux/ia64/nptl/unwind_longjmp.c
+++ b/sysdeps/unix/sysv/linux/ia64/unwind_longjmp.c