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

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

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;
+  }
+}

sysdeps/unix/sysv/linux/ia64/nptl/Makefile

@@ -1,3 +0,0 @@
-ifeq ($(subdir),nptl)
-libpthread-sysdep_routines += __ia64_longjmp unwind_longjmp __sigstack_longjmp
-endif

sysdeps/unix/sysv/linux/ia64/nptl/Versions

@@ -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;
-  }
-}

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)