61 files changed, 153 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 342840a94e..7c57a6e77d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,158 @@
 2014-05-14  Roland McGrath  <roland@hack.frob.com>
 
+	* nptl/sysdeps/unix/sysv/linux/i386/Implies: File removed.
+	* nptl/sysdeps/unix/sysv/linux/i386/i786/Implies: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i786/Implies: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i586/sem_wait.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i586/sem_wait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_wrlock.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_wrlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_timedwait.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i586/pthread_cond_timedwait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_barrier_wait.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i586/pthread_barrier_wait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_unlock.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_unlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i586/sem_timedwait.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i586/sem_timedwait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_signal.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i586/pthread_cond_signal.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i586/libc-lowlevellock.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i586/libc-lowlevellock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_wait.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i586/pthread_cond_wait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i586/lowlevelrobustlock.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i586/lowlevelrobustlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_broadcast.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i586/pthread_cond_broadcast.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_timedrdlock.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_timedrdlock.S:
+	... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i586/sem_trywait.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i586/sem_trywait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i586/sem_post.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i586/sem_post.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_timedwrlock.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_timedwrlock.S:
+	... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_rdlock.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_rdlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i586/lowlevellock.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i586/lowlevellock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i486/sem_wait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S:
+	... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i486/sem_post.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S:
+	... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h: Moved ...
+	* sysdeps/unix/sysv/linux/i386/dl-sysdep.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h: Moved ...
+	* sysdeps/unix/sysv/linux/i386/lowlevellock.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i686/sem_wait.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i686/sem_wait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_wrlock.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_wrlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_barrier_wait.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i686/pthread_barrier_wait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_unlock.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_unlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i686/sem_timedwait.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i686/sem_timedwait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_signal.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i686/pthread_cond_signal.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i686/libc-lowlevellock.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i686/libc-lowlevellock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_wait.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i686/pthread_cond_wait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i686/lowlevelrobustlock.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i686/lowlevelrobustlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_broadcast.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i686/pthread_cond_broadcast.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_timedrdlock.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_timedrdlock.S:
+	... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i686/sem_trywait.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i686/sem_trywait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i686/sem_post.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i686/sem_post.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_timedwrlock.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_timedwrlock.S:
+	... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_rdlock.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_rdlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/i686/lowlevellock.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/i686/lowlevellock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Moved ...
+	* sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/smp.h: Moved ...
+	* sysdeps/unix/sysv/linux/i386/smp.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S: Moved ...
+	* sysdeps/unix/sysv/linux/i386/pthread_once.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/i386/createthread.c: Moved ...
+	* sysdeps/unix/sysv/linux/i386/createthread.c: ... here.
+
 	* sysdeps/unix/sysv/linux/powerpc/fork.h: New file.
 	* nptl/sysdeps/unix/sysv/linux/powerpc/fork.c: File removed.
 
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/Implies b/nptl/sysdeps/unix/sysv/linux/i386/Implies
deleted file mode 100644
index ccc7eaa8a4..0000000000
--- a/nptl/sysdeps/unix/sysv/linux/i386/Implies
+++ /dev/null
@@ -1 +0,0 @@
-unix/sysv/linux/x86
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/createthread.c b/sysdeps/unix/sysv/linux/i386/createthread.c
index c45661fe1e..c45661fe1e 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/createthread.c
+++ b/sysdeps/unix/sysv/linux/i386/createthread.c
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h b/sysdeps/unix/sysv/linux/i386/dl-sysdep.h
index c314b4dadd..c314b4dadd 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/dl-sysdep.h
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
index 83e523174f..83e523174f 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S b/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
index 4ed46fc63e..4ed46fc63e 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
+++ b/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S b/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S
index 1b2933dadc..1b2933dadc 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S
+++ b/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S b/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S
index aa755a1737..aa755a1737 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S
+++ b/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S b/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
index 60702ce8fe..60702ce8fe 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
+++ b/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S b/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
index b086d92dae..b086d92dae 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
+++ b/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S b/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
index 91888d774e..91888d774e 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
+++ b/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
index c7e79712b8..c7e79712b8 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
+++ b/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S b/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
index a81bc06d7c..a81bc06d7c 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
+++ b/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S b/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S
index bc1001ce9c..bc1001ce9c 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S
+++ b/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedrdlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S b/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S
index 9abba58ca8..9abba58ca8 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S
+++ b/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_timedwrlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S b/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S
index 738c067780..738c067780 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S
+++ b/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_unlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S b/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
index 8345cae1ea..8345cae1ea 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
+++ b/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S b/sysdeps/unix/sysv/linux/i386/i486/sem_post.S
index bc091a0926..bc091a0926 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S
+++ b/sysdeps/unix/sysv/linux/i386/i486/sem_post.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S b/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S
index 94d052afc0..94d052afc0 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S
+++ b/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S b/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S
index 69611eac5d..69611eac5d 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S
+++ b/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S b/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
index 14d616fc91..14d616fc91 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
+++ b/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i586/libc-lowlevellock.S b/sysdeps/unix/sysv/linux/i386/i586/libc-lowlevellock.S
index f567c1d6d5..f567c1d6d5 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i586/libc-lowlevellock.S
+++ b/sysdeps/unix/sysv/linux/i386/i586/libc-lowlevellock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i586/lowlevellock.S b/sysdeps/unix/sysv/linux/i386/i586/lowlevellock.S
index 0c3acf811c..0c3acf811c 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i586/lowlevellock.S
+++ b/sysdeps/unix/sysv/linux/i386/i586/lowlevellock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i586/lowlevelrobustlock.S b/sysdeps/unix/sysv/linux/i386/i586/lowlevelrobustlock.S
index 3c0b4251cc..3c0b4251cc 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i586/lowlevelrobustlock.S
+++ b/sysdeps/unix/sysv/linux/i386/i586/lowlevelrobustlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_barrier_wait.S b/sysdeps/unix/sysv/linux/i386/i586/pthread_barrier_wait.S
index f92b35f53c..f92b35f53c 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_barrier_wait.S
+++ b/sysdeps/unix/sysv/linux/i386/i586/pthread_barrier_wait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_broadcast.S b/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_broadcast.S
index 94a4f547cf..94a4f547cf 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_broadcast.S
+++ b/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_broadcast.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_signal.S b/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_signal.S
index bb24e30759..bb24e30759 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_signal.S
+++ b/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_signal.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_timedwait.S b/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_timedwait.S
index bde665529e..bde665529e 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_timedwait.S
+++ b/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_timedwait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_wait.S b/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_wait.S
index be30c3084b..be30c3084b 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_wait.S
+++ b/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_wait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_rdlock.S b/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_rdlock.S
index 85127c7824..85127c7824 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_rdlock.S
+++ b/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_rdlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_timedrdlock.S b/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_timedrdlock.S
index 5a843e5986..5a843e5986 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_timedrdlock.S
+++ b/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_timedrdlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_timedwrlock.S b/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_timedwrlock.S
index a8ca4cf51a..a8ca4cf51a 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_timedwrlock.S
+++ b/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_timedwrlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_unlock.S b/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_unlock.S
index 8018c8fa98..8018c8fa98 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_unlock.S
+++ b/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_unlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_wrlock.S b/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_wrlock.S
index 0b4cfa8637..0b4cfa8637 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_wrlock.S
+++ b/sysdeps/unix/sysv/linux/i386/i586/pthread_rwlock_wrlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i586/sem_post.S b/sysdeps/unix/sysv/linux/i386/i586/sem_post.S
index 28ebd2746e..28ebd2746e 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i586/sem_post.S
+++ b/sysdeps/unix/sysv/linux/i386/i586/sem_post.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i586/sem_timedwait.S b/sysdeps/unix/sysv/linux/i386/i586/sem_timedwait.S
index 46f19590aa..46f19590aa 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i586/sem_timedwait.S
+++ b/sysdeps/unix/sysv/linux/i386/i586/sem_timedwait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i586/sem_trywait.S b/sysdeps/unix/sysv/linux/i386/i586/sem_trywait.S
index bce1cbca1f..bce1cbca1f 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i586/sem_trywait.S
+++ b/sysdeps/unix/sysv/linux/i386/i586/sem_trywait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i586/sem_wait.S b/sysdeps/unix/sysv/linux/i386/i586/sem_wait.S
index abe0e9fbdb..abe0e9fbdb 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i586/sem_wait.S
+++ b/sysdeps/unix/sysv/linux/i386/i586/sem_wait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h b/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h
index 3c71fb7041..3c71fb7041 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/libc-lowlevellock.S b/sysdeps/unix/sysv/linux/i386/i686/libc-lowlevellock.S
index f567c1d6d5..f567c1d6d5 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i686/libc-lowlevellock.S
+++ b/sysdeps/unix/sysv/linux/i386/i686/libc-lowlevellock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/lowlevellock.S b/sysdeps/unix/sysv/linux/i386/i686/lowlevellock.S
index 0c3acf811c..0c3acf811c 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i686/lowlevellock.S
+++ b/sysdeps/unix/sysv/linux/i386/i686/lowlevellock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/lowlevelrobustlock.S b/sysdeps/unix/sysv/linux/i386/i686/lowlevelrobustlock.S
index 3c0b4251cc..3c0b4251cc 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i686/lowlevelrobustlock.S
+++ b/sysdeps/unix/sysv/linux/i386/i686/lowlevelrobustlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_barrier_wait.S b/sysdeps/unix/sysv/linux/i386/i686/pthread_barrier_wait.S
index f92b35f53c..f92b35f53c 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_barrier_wait.S
+++ b/sysdeps/unix/sysv/linux/i386/i686/pthread_barrier_wait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_broadcast.S b/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_broadcast.S
index 94a4f547cf..94a4f547cf 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_broadcast.S
+++ b/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_broadcast.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_signal.S b/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_signal.S
index bb24e30759..bb24e30759 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_signal.S
+++ b/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_signal.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S b/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S
index 12f67620d0..12f67620d0 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S
+++ b/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_wait.S b/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_wait.S
index be30c3084b..be30c3084b 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_wait.S
+++ b/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_wait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_rdlock.S b/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_rdlock.S
index 85127c7824..85127c7824 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_rdlock.S
+++ b/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_rdlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_timedrdlock.S b/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_timedrdlock.S
index 5a843e5986..5a843e5986 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_timedrdlock.S
+++ b/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_timedrdlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_timedwrlock.S b/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_timedwrlock.S
index a8ca4cf51a..a8ca4cf51a 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_timedwrlock.S
+++ b/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_timedwrlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_unlock.S b/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_unlock.S
index e52344b66a..e52344b66a 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_unlock.S
+++ b/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_unlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_wrlock.S b/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_wrlock.S
index 0b4cfa8637..0b4cfa8637 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_wrlock.S
+++ b/sysdeps/unix/sysv/linux/i386/i686/pthread_rwlock_wrlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/sem_post.S b/sysdeps/unix/sysv/linux/i386/i686/sem_post.S
index 28ebd2746e..28ebd2746e 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i686/sem_post.S
+++ b/sysdeps/unix/sysv/linux/i386/i686/sem_post.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/sem_timedwait.S b/sysdeps/unix/sysv/linux/i386/i686/sem_timedwait.S
index 46f19590aa..46f19590aa 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i686/sem_timedwait.S
+++ b/sysdeps/unix/sysv/linux/i386/i686/sem_timedwait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/sem_trywait.S b/sysdeps/unix/sysv/linux/i386/i686/sem_trywait.S
index bce1cbca1f..bce1cbca1f 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i686/sem_trywait.S
+++ b/sysdeps/unix/sysv/linux/i386/i686/sem_trywait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/sem_wait.S b/sysdeps/unix/sysv/linux/i386/i686/sem_wait.S
index abe0e9fbdb..abe0e9fbdb 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i686/sem_wait.S
+++ b/sysdeps/unix/sysv/linux/i386/i686/sem_wait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i786/Implies b/sysdeps/unix/sysv/linux/i386/i786/Implies
index 7cb7d9a678..7cb7d9a678 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i786/Implies
+++ b/sysdeps/unix/sysv/linux/i386/i786/Implies
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/sysdeps/unix/sysv/linux/i386/lowlevellock.h
index 6903f92bd0..6903f92bd0 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/i386/lowlevellock.h
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S b/sysdeps/unix/sysv/linux/i386/pthread_once.S
index dacd724d8b..dacd724d8b 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S
+++ b/sysdeps/unix/sysv/linux/i386/pthread_once.S
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/smp.h b/sysdeps/unix/sysv/linux/i386/smp.h
index 072e01081e..072e01081e 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/smp.h
+++ b/sysdeps/unix/sysv/linux/i386/smp.h
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
index 4f4318d0bd..4f4318d0bd 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h