Move remaining nptl/sysdeps/unix/sysv/linux/x86_64/ files.

26 files changed, 55 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index d73d5eb4eb..d1f0ac6b16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,59 @@
 2014-05-14  Roland McGrath  <roland@hack.frob.com>
 
+	* nptl/sysdeps/unix/sysv/linux/x86_64/Implies: File removed.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/cancellation.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/libc-cancellation.S: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/libc-cancellation.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/libc-lowlevellock.S: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/libc-lowlevellock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/librt-cancellation.S: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/librt-cancellation.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/pthread_once.S: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/pthread_once.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/sem_post.S: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/sem_post.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/sem_trywait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/sem_wait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h: Moved ...
+	* sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h: ... here.
+
 	* nptl/sysdeps/unix/sysv/linux/fork.c: Use <> for fork.h #include.
 	* nptl/sysdeps/unix/sysv/linux/x86_64/fork.c: File removed.
 	* sysdeps/unix/sysv/linux/x86_64/fork.h: New file.
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/Implies b/nptl/sysdeps/unix/sysv/linux/x86_64/Implies
deleted file mode 100644
index ccc7eaa8a4..0000000000
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/Implies
+++ /dev/null
@@ -1 +0,0 @@
-unix/sysv/linux/x86
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S b/sysdeps/unix/sysv/linux/x86_64/cancellation.S
index 89fda5efeb..89fda5efeb 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S
+++ b/sysdeps/unix/sysv/linux/x86_64/cancellation.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/libc-cancellation.S b/sysdeps/unix/sysv/linux/x86_64/libc-cancellation.S
index 019e22fc89..019e22fc89 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/libc-cancellation.S
+++ b/sysdeps/unix/sysv/linux/x86_64/libc-cancellation.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/libc-lowlevellock.S b/sysdeps/unix/sysv/linux/x86_64/libc-lowlevellock.S
index 83e523174f..83e523174f 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/libc-lowlevellock.S
+++ b/sysdeps/unix/sysv/linux/x86_64/libc-lowlevellock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/librt-cancellation.S b/sysdeps/unix/sysv/linux/x86_64/librt-cancellation.S
index 02892effa7..02892effa7 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/librt-cancellation.S
+++ b/sysdeps/unix/sysv/linux/x86_64/librt-cancellation.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
index f2dca070f3..f2dca070f3 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
+++ b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
index c13ca084df..c13ca084df 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S b/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S
index 990b6f9fdb..990b6f9fdb 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S
+++ b/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S b/sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S
index eec17f226f..eec17f226f 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S
+++ b/sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S b/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
index 985e0f1cfa..985e0f1cfa 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
+++ b/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S b/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
index 53d65b6f12..53d65b6f12 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
+++ b/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S b/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
index 0dc23405b0..0dc23405b0 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
+++ b/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
index 0e61d0aa24..0e61d0aa24 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
+++ b/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_once.S b/sysdeps/unix/sysv/linux/x86_64/pthread_once.S
index 2cbe2fae62..2cbe2fae62 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_once.S
+++ b/sysdeps/unix/sysv/linux/x86_64/pthread_once.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S b/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
index 3bbb4c7f62..3bbb4c7f62 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
+++ b/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S b/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
index 40bcc04a9d..40bcc04a9d 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
+++ b/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S b/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
index f57ef5238c..f57ef5238c 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
+++ b/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S b/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S
index d779f7b759..d779f7b759 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S
+++ b/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S b/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
index e444def525..e444def525 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
+++ b/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c b/sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c
index 640d3044fd..a7bbe38156 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c
+++ b/sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c
@@ -11,4 +11,4 @@
 				   header.vgetcpu_cache[1])));		\
   } while (0)
 
-#include "../pthread_setaffinity.c"
+#include <sysdeps/unix/sysv/linux/pthread_setaffinity.c>
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_post.S b/sysdeps/unix/sysv/linux/x86_64/sem_post.S
index 1c11600468..1c11600468 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_post.S
+++ b/sysdeps/unix/sysv/linux/x86_64/sem_post.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S b/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S
index 880610e682..880610e682 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S
+++ b/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S b/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S
index 1893a34737..1893a34737 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S
+++ b/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S b/sysdeps/unix/sysv/linux/x86_64/sem_wait.S
index 8f4d0686ec..8f4d0686ec 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S
+++ b/sysdeps/unix/sysv/linux/x86_64/sem_wait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
index 83cd25fe8d..83cd25fe8d 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h