17 files changed, 38 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c685bc705b..b6f05608e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,37 @@
 2014-05-14  Roland McGrath  <roland@hack.frob.com>
 
+	* nptl/sysdeps/unix/sysv/linux/x86/Makefile: File removed.
+	* sysdeps/unix/sysv/linux/x86/Makefile [$(subdir) = nptl]
+	(libpthread-sysdep_routines): Add elision-related stuff here instead.
+	* nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c: Moved ...
+	* sysdeps/unix/sysv/linux/x86/elision-conf.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86/elision-conf.h: Moved ...
+	* sysdeps/unix/sysv/linux/x86/elision-conf.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86/elision-lock.c: Moved ...
+	* sysdeps/unix/sysv/linux/x86/elision-lock.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86/elision-timed.c: Moved ...
+	* sysdeps/unix/sysv/linux/x86/elision-timed.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86/elision-trylock.c: Moved ...
+	* sysdeps/unix/sysv/linux/x86/elision-trylock.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86/elision-unlock.c: Moved ...
+	* sysdeps/unix/sysv/linux/x86/elision-unlock.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86/force-elision.h: Moved ...
+	* sysdeps/unix/sysv/linux/x86/force-elision.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86/hle.h: Moved ...
+	* sysdeps/unix/sysv/linux/x86/hle.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86/init-arch.c: Moved ...
+	* sysdeps/unix/sysv/linux/x86/init-arch.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86/init-arch.h: Moved ...
+	* sysdeps/unix/sysv/linux/x86/init-arch.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_cond_lock.c: Moved ...
+	* sysdeps/unix/sysv/linux/x86/pthread_mutex_cond_lock.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_lock.c: Moved ...
+	* sysdeps/unix/sysv/linux/x86/pthread_mutex_lock.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_timedlock.c: Moved ...
+	* sysdeps/unix/sysv/linux/x86/pthread_mutex_timedlock.c: ... here.
+	* nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_trylock.c: Moved ...
+	* sysdeps/unix/sysv/linux/x86/pthread_mutex_trylock.c: ... here.
+
 	* sysdeps/unix/sysv/linux/mips/fork.h: New file.
 	* sysdeps/unix/sysv/linux/mips/nptl/fork.c: File removed.
 
diff --git a/nptl/sysdeps/unix/sysv/linux/x86/Makefile b/nptl/sysdeps/unix/sysv/linux/x86/Makefile
deleted file mode 100644
index 61b7552bc9..0000000000
--- a/nptl/sysdeps/unix/sysv/linux/x86/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-libpthread-sysdep_routines += init-arch
-libpthread-sysdep_routines += elision-lock elision-unlock elision-timed \
-			      elision-trylock
diff --git a/sysdeps/unix/sysv/linux/x86/Makefile b/sysdeps/unix/sysv/linux/x86/Makefile
index 6412a9ef36..012125f30c 100644
--- a/sysdeps/unix/sysv/linux/x86/Makefile
+++ b/sysdeps/unix/sysv/linux/x86/Makefile
@@ -16,3 +16,9 @@ abi-x32-ld-soname := ld-linux-x32.so.2
 ifeq ($(subdir),misc)
 sysdep_headers += sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h sys/io.h
 endif
+
+ifeq ($(subdir),nptl)
+libpthread-sysdep_routines += init-arch
+libpthread-sysdep_routines += elision-lock elision-unlock elision-timed \
+			      elision-trylock
+endif
diff --git a/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c b/sysdeps/unix/sysv/linux/x86/elision-conf.c
index e6f5d6d1ab..e6f5d6d1ab 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c
+++ b/sysdeps/unix/sysv/linux/x86/elision-conf.c
diff --git a/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.h b/sysdeps/unix/sysv/linux/x86/elision-conf.h
index 6790b5aa13..6790b5aa13 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.h
+++ b/sysdeps/unix/sysv/linux/x86/elision-conf.h
diff --git a/nptl/sysdeps/unix/sysv/linux/x86/elision-lock.c b/sysdeps/unix/sysv/linux/x86/elision-lock.c
index 385ac31a52..385ac31a52 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86/elision-lock.c
+++ b/sysdeps/unix/sysv/linux/x86/elision-lock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/x86/elision-timed.c b/sysdeps/unix/sysv/linux/x86/elision-timed.c
index 4fdaa0f9e9..4fdaa0f9e9 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86/elision-timed.c
+++ b/sysdeps/unix/sysv/linux/x86/elision-timed.c
diff --git a/nptl/sysdeps/unix/sysv/linux/x86/elision-trylock.c b/sysdeps/unix/sysv/linux/x86/elision-trylock.c
index a478ac18e3..a478ac18e3 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86/elision-trylock.c
+++ b/sysdeps/unix/sysv/linux/x86/elision-trylock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/x86/elision-unlock.c b/sysdeps/unix/sysv/linux/x86/elision-unlock.c
index b9be19ccc4..b9be19ccc4 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86/elision-unlock.c
+++ b/sysdeps/unix/sysv/linux/x86/elision-unlock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/x86/force-elision.h b/sysdeps/unix/sysv/linux/x86/force-elision.h
index 945f8867fc..945f8867fc 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86/force-elision.h
+++ b/sysdeps/unix/sysv/linux/x86/force-elision.h
diff --git a/nptl/sysdeps/unix/sysv/linux/x86/hle.h b/sysdeps/unix/sysv/linux/x86/hle.h
index 4a7b9e3bf7..4a7b9e3bf7 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86/hle.h
+++ b/sysdeps/unix/sysv/linux/x86/hle.h
diff --git a/nptl/sysdeps/unix/sysv/linux/x86/init-arch.c b/sysdeps/unix/sysv/linux/x86/init-arch.c
index 00a94d83dc..00a94d83dc 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86/init-arch.c
+++ b/sysdeps/unix/sysv/linux/x86/init-arch.c
diff --git a/nptl/sysdeps/unix/sysv/linux/x86/init-arch.h b/sysdeps/unix/sysv/linux/x86/init-arch.h
index cd2d0befee..cd2d0befee 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86/init-arch.h
+++ b/sysdeps/unix/sysv/linux/x86/init-arch.h
diff --git a/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_cond_lock.c b/sysdeps/unix/sysv/linux/x86/pthread_mutex_cond_lock.c
index 34c705235a..34c705235a 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_cond_lock.c
+++ b/sysdeps/unix/sysv/linux/x86/pthread_mutex_cond_lock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_lock.c b/sysdeps/unix/sysv/linux/x86/pthread_mutex_lock.c
index b8a33c1869..b8a33c1869 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_lock.c
+++ b/sysdeps/unix/sysv/linux/x86/pthread_mutex_lock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_timedlock.c b/sysdeps/unix/sysv/linux/x86/pthread_mutex_timedlock.c
index d33dd2a112..d33dd2a112 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_timedlock.c
+++ b/sysdeps/unix/sysv/linux/x86/pthread_mutex_timedlock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_trylock.c b/sysdeps/unix/sysv/linux/x86/pthread_mutex_trylock.c
index 6534e9693b..6534e9693b 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_trylock.c
+++ b/sysdeps/unix/sysv/linux/x86/pthread_mutex_trylock.c