Move x86_64 code out of nptl/ subdirectory.

14 files changed, 32 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ccb56eabe..2d1b5c7fbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2014-06-11  Roland McGrath  <roland@hack.frob.com>
+
+	* nptl/sysdeps/x86_64/64/shlib-versions: Moved ...
+	* sysdeps/x86_64/64/nptl/shlib-versions: ... here.
+	* nptl/sysdeps/x86_64/Makefile: Moved ...
+	* sysdeps/x86_64/nptl/Makefile: ... here.
+	* nptl/sysdeps/x86_64/configure: Moved ...
+	* sysdeps/x86_64/nptl/configure: ... here.
+	* nptl/sysdeps/x86_64/configure.ac: Moved ...
+	* sysdeps/x86_64/nptl/configure.ac: ... here.
+	* nptl/sysdeps/x86_64/pthread_spin_init.c: Moved ...
+	* sysdeps/x86_64/nptl/pthread_spin_init.c: ... here.
+	* nptl/sysdeps/x86_64/pthread_spin_lock.S: Moved ...
+	* sysdeps/x86_64/nptl/pthread_spin_lock.S: ... here.
+	* nptl/sysdeps/x86_64/pthread_spin_trylock.S: Moved ...
+	* sysdeps/x86_64/nptl/pthread_spin_trylock.S: ... here.
+	* nptl/sysdeps/x86_64/pthread_spin_unlock.S: Moved ...
+	* sysdeps/x86_64/nptl/pthread_spin_unlock.S: ... here.
+	* nptl/sysdeps/x86_64/pthreaddef.h: Moved ...
+	* sysdeps/x86_64/nptl/pthreaddef.h: ... here.
+	* nptl/sysdeps/x86_64/tcb-offsets.sym: Moved ...
+	* sysdeps/x86_64/nptl/tcb-offsets.sym: ... here.
+	* nptl/sysdeps/x86_64/tls.h: Moved ...
+	* sysdeps/x86_64/nptl/tls.h: ... here.
+	* nptl/sysdeps/x86_64/x32/shlib-versions: Moved ...
+	* sysdeps/x86_64/x32/nptl/shlib-versions: ... here.
+	* nptl/sysdeps/x86_64/x32/tls.h: Moved ...
+	* sysdeps/x86_64/x32/nptl/tls.h: ... here.
+
+	* sysdeps/x86_64/x32/nptl/tls.h: Use #include_next.
+
 2014-06-11  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
 	* sysdeps/powerpc/fpu/libm-test-ulps: Update.
diff --git a/nptl/sysdeps/x86_64/64/shlib-versions b/sysdeps/x86_64/64/nptl/shlib-versions
index 5093c4c18b..5093c4c18b 100644
--- a/nptl/sysdeps/x86_64/64/shlib-versions
+++ b/sysdeps/x86_64/64/nptl/shlib-versions
diff --git a/nptl/sysdeps/x86_64/Makefile b/sysdeps/x86_64/nptl/Makefile
index de43419bc9..de43419bc9 100644
--- a/nptl/sysdeps/x86_64/Makefile
+++ b/sysdeps/x86_64/nptl/Makefile
diff --git a/nptl/sysdeps/x86_64/configure b/sysdeps/x86_64/nptl/configure
index c9dea5a7a1..c9dea5a7a1 100644
--- a/nptl/sysdeps/x86_64/configure
+++ b/sysdeps/x86_64/nptl/configure
diff --git a/nptl/sysdeps/x86_64/configure.ac b/sysdeps/x86_64/nptl/configure.ac
index 0ba0cc3726..0ba0cc3726 100644
--- a/nptl/sysdeps/x86_64/configure.ac
+++ b/sysdeps/x86_64/nptl/configure.ac
diff --git a/nptl/sysdeps/x86_64/pthread_spin_init.c b/sysdeps/x86_64/nptl/pthread_spin_init.c
index 55696204c1..55696204c1 100644
--- a/nptl/sysdeps/x86_64/pthread_spin_init.c
+++ b/sysdeps/x86_64/nptl/pthread_spin_init.c
diff --git a/nptl/sysdeps/x86_64/pthread_spin_lock.S b/sysdeps/x86_64/nptl/pthread_spin_lock.S
index 71c93a4cec..71c93a4cec 100644
--- a/nptl/sysdeps/x86_64/pthread_spin_lock.S
+++ b/sysdeps/x86_64/nptl/pthread_spin_lock.S
diff --git a/nptl/sysdeps/x86_64/pthread_spin_trylock.S b/sysdeps/x86_64/nptl/pthread_spin_trylock.S
index ba1e8b51e5..ba1e8b51e5 100644
--- a/nptl/sysdeps/x86_64/pthread_spin_trylock.S
+++ b/sysdeps/x86_64/nptl/pthread_spin_trylock.S
diff --git a/nptl/sysdeps/x86_64/pthread_spin_unlock.S b/sysdeps/x86_64/nptl/pthread_spin_unlock.S
index 6cd4feaf2a..6cd4feaf2a 100644
--- a/nptl/sysdeps/x86_64/pthread_spin_unlock.S
+++ b/sysdeps/x86_64/nptl/pthread_spin_unlock.S
diff --git a/nptl/sysdeps/x86_64/pthreaddef.h b/sysdeps/x86_64/nptl/pthreaddef.h
index 485a6252df..485a6252df 100644
--- a/nptl/sysdeps/x86_64/pthreaddef.h
+++ b/sysdeps/x86_64/nptl/pthreaddef.h
diff --git a/nptl/sysdeps/x86_64/tcb-offsets.sym b/sysdeps/x86_64/nptl/tcb-offsets.sym
index cf863752ee..cf863752ee 100644
--- a/nptl/sysdeps/x86_64/tcb-offsets.sym
+++ b/sysdeps/x86_64/nptl/tcb-offsets.sym
diff --git a/nptl/sysdeps/x86_64/tls.h b/sysdeps/x86_64/nptl/tls.h
index 3e811b6aea..3e811b6aea 100644
--- a/nptl/sysdeps/x86_64/tls.h
+++ b/sysdeps/x86_64/nptl/tls.h
diff --git a/nptl/sysdeps/x86_64/x32/shlib-versions b/sysdeps/x86_64/x32/nptl/shlib-versions
index 8fcad2e566..8fcad2e566 100644
--- a/nptl/sysdeps/x86_64/x32/shlib-versions
+++ b/sysdeps/x86_64/x32/nptl/shlib-versions
diff --git a/nptl/sysdeps/x86_64/x32/tls.h b/sysdeps/x86_64/x32/nptl/tls.h
index 7060616a5c..bd73d3f9a1 100644
--- a/nptl/sysdeps/x86_64/x32/tls.h
+++ b/sysdeps/x86_64/x32/nptl/tls.h
@@ -19,7 +19,7 @@
 #ifndef _X32_TLS_H
 #define _X32_TLS_H	1
 
-#include <sysdeps/x86_64/tls.h>
+#include_next <tls.h>
 
 #ifndef __ASSEMBLER__