Move SPARC code out of nptl/sysdeps/sparc/.

20 files changed, 39 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index c1e52417bf..4e0e179c02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,40 @@
 2014-06-12  Roland McGrath  <roland@hack.frob.com>
 
+	* nptl/sysdeps/sparc/Makefile: Moved ...
+	* sysdeps/sparc/nptl/Makefile: ... here.
+	* nptl/sysdeps/sparc/tcb-offsets.sym: Moved ...
+	* sysdeps/sparc/nptl/tcb-offsets.sym: ... here.
+	* nptl/sysdeps/sparc/tls.h: Moved ...
+	* sysdeps/sparc/nptl/tls.h: ... here.
+	* nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S: Moved ...
+	* sysdeps/sparc/sparc32/nptl/pthread_spin_lock.S: ... here.
+	* nptl/sysdeps/sparc/sparc32/pthread_spin_trylock.S: Moved ...
+	* sysdeps/sparc/sparc32/nptl/pthread_spin_trylock.S: ... here.
+	* nptl/sysdeps/sparc/sparc32/pthreaddef.h: Moved ...
+	* sysdeps/sparc/sparc32/nptl/pthreaddef.h: ... here.
+	* nptl/sysdeps/sparc/sparc64/pthread_spin_init.c: Moved ...
+	* sysdeps/sparc/sparc64/nptl/pthread_spin_init.c: ... here.
+	* nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S: Moved ...
+	* sysdeps/sparc/sparc64/nptl/pthread_spin_lock.S: ... here.
+	* nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.S: Moved ...
+	* sysdeps/sparc/sparc64/nptl/pthread_spin_trylock.S: ... here.
+	* nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S: Moved ...
+	* sysdeps/sparc/sparc64/nptl/pthread_spin_unlock.S: ... here.
+	* nptl/sysdeps/sparc/sparc64/pthreaddef.h: Moved ...
+	* sysdeps/sparc/sparc64/nptl/pthreaddef.h: ... here.
+	* nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c: Moved ...
+	* sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_init.c: ... here.
+	Update #include.
+	* nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S: Moved ...
+	* sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_lock.S: ... here.
+	Update #include.
+	* nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S: Moved ...
+	* sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_trylock.S: ... here.
+	Update #include.
+	* nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S: Moved ...
+	* sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_unlock.S: ... here.
+	Update #include.
+
 	* nptl/sysdeps/sparc/tls.h (TLS_DEFINE_INIT_TP): New macro.
 
 	* sysdeps/unix/sysv/linux/sparc/arch-fork.h: New file.
diff --git a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c b/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c
deleted file mode 100644
index d27e550789..0000000000
--- a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sparc64/pthread_spin_init.c>
diff --git a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S b/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S
deleted file mode 100644
index d33b375bf7..0000000000
--- a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S
+++ /dev/null
@@ -1 +0,0 @@
-#include <sparc64/pthread_spin_lock.S>
diff --git a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S b/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S
deleted file mode 100644
index af5b1511bd..0000000000
--- a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S
+++ /dev/null
@@ -1 +0,0 @@
-#include <sparc64/pthread_spin_trylock.S>
diff --git a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S b/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S
deleted file mode 100644
index c40d80fa0f..0000000000
--- a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S
+++ /dev/null
@@ -1 +0,0 @@
-#include <sparc64/pthread_spin_unlock.S>
diff --git a/nptl/sysdeps/sparc/Makefile b/sysdeps/sparc/nptl/Makefile
index 5372867dbd..5372867dbd 100644
--- a/nptl/sysdeps/sparc/Makefile
+++ b/sysdeps/sparc/nptl/Makefile
diff --git a/nptl/sysdeps/sparc/tcb-offsets.sym b/sysdeps/sparc/nptl/tcb-offsets.sym
index 923af8a5b7..923af8a5b7 100644
--- a/nptl/sysdeps/sparc/tcb-offsets.sym
+++ b/sysdeps/sparc/nptl/tcb-offsets.sym
diff --git a/nptl/sysdeps/sparc/tls.h b/sysdeps/sparc/nptl/tls.h
index 5ea9355235..5ea9355235 100644
--- a/nptl/sysdeps/sparc/tls.h
+++ b/sysdeps/sparc/nptl/tls.h
diff --git a/nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S b/sysdeps/sparc/sparc32/nptl/pthread_spin_lock.S
index 3accc69615..3accc69615 100644
--- a/nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S
+++ b/sysdeps/sparc/sparc32/nptl/pthread_spin_lock.S
diff --git a/nptl/sysdeps/sparc/sparc32/pthread_spin_trylock.S b/sysdeps/sparc/sparc32/nptl/pthread_spin_trylock.S
index 68215ab2c9..68215ab2c9 100644
--- a/nptl/sysdeps/sparc/sparc32/pthread_spin_trylock.S
+++ b/sysdeps/sparc/sparc32/nptl/pthread_spin_trylock.S
diff --git a/nptl/sysdeps/sparc/sparc32/pthreaddef.h b/sysdeps/sparc/sparc32/nptl/pthreaddef.h
index eb8d33bcff..eb8d33bcff 100644
--- a/nptl/sysdeps/sparc/sparc32/pthreaddef.h
+++ b/sysdeps/sparc/sparc32/nptl/pthreaddef.h
diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_init.c b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_init.c
new file mode 100644
index 0000000000..c8edcb0c6d
--- /dev/null
+++ b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_init.c
@@ -0,0 +1 @@
+#include <sysdeps/sparc/sparc64/nptl/pthread_spin_init.c>
diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_lock.S b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_lock.S
new file mode 100644
index 0000000000..f2b898d3ad
--- /dev/null
+++ b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_lock.S
@@ -0,0 +1 @@
+#include <sysdeps/sparc/sparc64/nptl/pthread_spin_lock.S>
diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_trylock.S b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_trylock.S
new file mode 100644
index 0000000000..b324906220
--- /dev/null
+++ b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_trylock.S
@@ -0,0 +1 @@
+#include <sysdeps/sparc/sparc64/nptl/pthread_spin_trylock.S>
diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_unlock.S b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_unlock.S
new file mode 100644
index 0000000000..8c56ebe49f
--- /dev/null
+++ b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_unlock.S
@@ -0,0 +1 @@
+#include <sysdeps/sparc/sparc64/nptl/pthread_spin_unlock.S>
diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_init.c b/sysdeps/sparc/sparc64/nptl/pthread_spin_init.c
index 58319ab62d..58319ab62d 100644
--- a/nptl/sysdeps/sparc/sparc64/pthread_spin_init.c
+++ b/sysdeps/sparc/sparc64/nptl/pthread_spin_init.c
diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S b/sysdeps/sparc/sparc64/nptl/pthread_spin_lock.S
index aec66542de..aec66542de 100644
--- a/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S
+++ b/sysdeps/sparc/sparc64/nptl/pthread_spin_lock.S
diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.S b/sysdeps/sparc/sparc64/nptl/pthread_spin_trylock.S
index d10b08b5da..d10b08b5da 100644
--- a/nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.S
+++ b/sysdeps/sparc/sparc64/nptl/pthread_spin_trylock.S
diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S b/sysdeps/sparc/sparc64/nptl/pthread_spin_unlock.S
index 0c18530735..0c18530735 100644
--- a/nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S
+++ b/sysdeps/sparc/sparc64/nptl/pthread_spin_unlock.S
diff --git a/nptl/sysdeps/sparc/sparc64/pthreaddef.h b/sysdeps/sparc/sparc64/nptl/pthreaddef.h
index ee44bcf1af..ee44bcf1af 100644
--- a/nptl/sysdeps/sparc/sparc64/pthreaddef.h
+++ b/sysdeps/sparc/sparc64/nptl/pthreaddef.h