Get rid of sparc specific NPTL internaltypes.h header.

	* sysdeps/sparc/nptl/internaltypes.h: Delete.
	* sysdeps/sparc/nptl/sparc-nptl.h: New file.
	* sysdeps/sparc/nptl/pthread_barrier_destroy.c: Include it.
	* sysdeps/sparc/nptl/pthread_barrier_init.c: Likewise.
	* sysdeps/sparc/nptl/pthread_barrier_wait.c: Likewise.
	* sysdeps/sparc/nptl/sem_init.c: Likewise.
	* sysdeps/sparc/nptl/sem_post.c: Likewise.
	* sysdeps/sparc/nptl/sem_timedwait.c: Likewise.
	* sysdeps/sparc/nptl/sem_wait.c: Likewise.
	* sysdeps/sparc/sparc32/nptl/pthread_barrier_wait.c: Likewise.
	* sysdeps/sparc/sparc32/nptl/sem_post.c: Likewise.
	* sysdeps/sparc/sparc32/nptl/sem_timedwait.c: Likewise.
	* sysdeps/sparc/sparc32/nptl/sem_wait.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index a8aa74bf988dbb0fcb02bcc38f8634f4d63ac78e..f5b5599486c268605d3e7b3114ad5fc073209f72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,20 @@
 
        * sysdeps/sparc/fpu/libm-test-ulps: Update.
 
+       * sysdeps/sparc/nptl/internaltypes.h: Delete.
+       * sysdeps/sparc/nptl/sparc-nptl.h: New file.
+       * sysdeps/sparc/nptl/pthread_barrier_destroy.c: Include it.
+       * sysdeps/sparc/nptl/pthread_barrier_init.c: Likewise.
+       * sysdeps/sparc/nptl/pthread_barrier_wait.c: Likewise.
+       * sysdeps/sparc/nptl/sem_init.c: Likewise.
+       * sysdeps/sparc/nptl/sem_post.c: Likewise.
+       * sysdeps/sparc/nptl/sem_timedwait.c: Likewise.
+       * sysdeps/sparc/nptl/sem_wait.c: Likewise.
+       * sysdeps/sparc/sparc32/nptl/pthread_barrier_wait.c: Likewise.
+       * sysdeps/sparc/sparc32/nptl/sem_post.c: Likewise.
+       * sysdeps/sparc/sparc32/nptl/sem_timedwait.c: Likewise.
+       * sysdeps/sparc/sparc32/nptl/sem_wait.c: Likewise.
+
 2014-07-09  Andreas Schwab  <schwab@suse.de>
 
        * sysdeps/powerpc/test-gettimebase.c (do_test): Add newline to

diff --git a/sysdeps/sparc/nptl/pthread_barrier_destroy.c b/sysdeps/sparc/nptl/pthread_barrier_destroy.c
index 2221a27e22302c5bffaa500d3a26629dcb8d7550..883a101a4620aac093777be3abffcbcb48923549 100644 (file)
--- a/sysdeps/sparc/nptl/pthread_barrier_destroy.c
+++ b/sysdeps/sparc/nptl/pthread_barrier_destroy.c
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include "pthreadP.h"
 #include <lowlevellock.h>
+#include <sparc-nptl.h>
 
 int
 pthread_barrier_destroy (barrier)

diff --git a/sysdeps/sparc/nptl/pthread_barrier_init.c b/sysdeps/sparc/nptl/pthread_barrier_init.c
index 6af686361d26643c221e2a3aadc98c7d6a6a0521..c076386b75805b1c3ba700a96f5441c9b9cdc66a 100644 (file)
--- a/sysdeps/sparc/nptl/pthread_barrier_init.c
+++ b/sysdeps/sparc/nptl/pthread_barrier_init.c
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include "pthreadP.h"
 #include <lowlevellock.h>
+#include <sparc-nptl.h>
 
 int
 pthread_barrier_init (barrier, attr, count)

diff --git a/sysdeps/sparc/nptl/pthread_barrier_wait.c b/sysdeps/sparc/nptl/pthread_barrier_wait.c
index ed5c1f70718bcfa6f2eb2fba4b82be1bf89f5894..525418ce219d71b715555d0cb5afb13ece89b927 100644 (file)
--- a/sysdeps/sparc/nptl/pthread_barrier_wait.c
+++ b/sysdeps/sparc/nptl/pthread_barrier_wait.c
@@ -20,6 +20,7 @@
 #include <sysdep.h>
 #include <lowlevellock.h>
 #include <pthreadP.h>
+#include <sparc-nptl.h>
 
 /* Wait on barrier.  */
 int

diff --git a/sysdeps/sparc/nptl/sem_init.c b/sysdeps/sparc/nptl/sem_init.c
index cbefdc4823a7584e4c3b83ce521ca6f7ba9b0994..d33881d54320646abb69571c98e299f30ff8d645 100644 (file)
--- a/sysdeps/sparc/nptl/sem_init.c
+++ b/sysdeps/sparc/nptl/sem_init.c
@@ -23,7 +23,7 @@
 #include <shlib-compat.h>
 #include "semaphoreP.h"
 #include <kernel-features.h>
-
+#include <sparc-nptl.h>
 
 int
 __new_sem_init (sem, pshared, value)

diff --git a/sysdeps/sparc/nptl/sem_post.c b/sysdeps/sparc/nptl/sem_post.c
index d83b9d8e2eac962a9e82d0f9035bcc2afdd0c07f..c2dbe0a0ce8b85483b89f7ef3369430025fea0dc 100644 (file)
--- a/sysdeps/sparc/nptl/sem_post.c
+++ b/sysdeps/sparc/nptl/sem_post.c
@@ -24,6 +24,7 @@
 #include <semaphore.h>
 
 #include <shlib-compat.h>
+#include <sparc-nptl.h>
 
 int
 __new_sem_post (sem_t *sem)

diff --git a/sysdeps/sparc/nptl/sem_timedwait.c b/sysdeps/sparc/nptl/sem_timedwait.c
index 0557e4e709da8746f0e936109875fede91b9c2c3..3621f0b2d2f7516092fb7371ae9db7dc7e7e122b 100644 (file)
--- a/sysdeps/sparc/nptl/sem_timedwait.c
+++ b/sysdeps/sparc/nptl/sem_timedwait.c
@@ -25,7 +25,7 @@
 
 #include <pthreadP.h>
 #include <shlib-compat.h>
-
+#include <sparc-nptl.h>
 
 extern void __sem_wait_cleanup (void *arg) attribute_hidden;
 

diff --git a/sysdeps/sparc/nptl/sem_wait.c b/sysdeps/sparc/nptl/sem_wait.c
index cfa1ef37278350d710351ff59347221f28c8e242..ccf714d391838fc1d00f0860fc3a19ec32bf1d71 100644 (file)
--- a/sysdeps/sparc/nptl/sem_wait.c
+++ b/sysdeps/sparc/nptl/sem_wait.c
@@ -25,7 +25,7 @@
 
 #include <pthreadP.h>
 #include <shlib-compat.h>
-
+#include <sparc-nptl.h>
 
 void
 attribute_hidden

diff --git a/sysdeps/sparc/nptl/internaltypes.h b/sysdeps/sparc/nptl/sparc-nptl.h
similarity index 90%
rename from sysdeps/sparc/nptl/internaltypes.h
rename to sysdeps/sparc/nptl/sparc-nptl.h
index e5c27408d815855cd529be40d2c35736c3767bc9..baff918288e84d3f494aa7d7bd734cb81bb0d4d3 100644 (file)
--- a/sysdeps/sparc/nptl/internaltypes.h
+++ b/sysdeps/sparc/nptl/sparc-nptl.h
@@ -1,6 +1,4 @@
-#ifndef _INTERNALTYPES_H
-
-#include_next <internaltypes.h>
+#ifndef _SPARC_NPTL_H
 
 union sparc_pthread_barrier
 {

diff --git a/sysdeps/sparc/sparc32/pthread_barrier_wait.c b/sysdeps/sparc/sparc32/pthread_barrier_wait.c
index 0fed90886532fc2dd16c6230d3b3dcecb4c88a7b..318a47beab0803c76544ebafb337b7c8b6b0f2ba 100644 (file)
--- a/sysdeps/sparc/sparc32/pthread_barrier_wait.c
+++ b/sysdeps/sparc/sparc32/pthread_barrier_wait.c
@@ -20,6 +20,7 @@
 #include <sysdep.h>
 #include <lowlevellock.h>
 #include <pthreadP.h>
+#include <sparc-nptl.h>
 
 /* Wait on barrier.  */
 int

diff --git a/sysdeps/sparc/sparc32/sem_post.c b/sysdeps/sparc/sparc32/sem_post.c
index d3846c045c8f40fe6ab3dbdd13f63556f8442e95..40650a00239f2852fa16a7706a1671ca703fc799 100644 (file)
--- a/sysdeps/sparc/sparc32/sem_post.c
+++ b/sysdeps/sparc/sparc32/sem_post.c
@@ -24,6 +24,7 @@
 #include <semaphore.h>
 
 #include <shlib-compat.h>
+#include <sparc-nptl.h>
 
 int
 __new_sem_post (sem_t *sem)

diff --git a/sysdeps/sparc/sparc32/sem_timedwait.c b/sysdeps/sparc/sparc32/sem_timedwait.c
index 5c48cb385a64ed4f4e299f21a68d5e847a3ff17a..a10382af84499ec459245cba70cdbb489e9fd8d0 100644 (file)
--- a/sysdeps/sparc/sparc32/sem_timedwait.c
+++ b/sysdeps/sparc/sparc32/sem_timedwait.c
@@ -25,7 +25,7 @@
 
 #include <pthreadP.h>
 #include <shlib-compat.h>
-
+#include <sparc-nptl.h>
 
 extern void __sem_wait_cleanup (void *arg) attribute_hidden;
 

diff --git a/sysdeps/sparc/sparc32/sem_wait.c b/sysdeps/sparc/sparc32/sem_wait.c
index 8c072fe5f486ba78422a06fcd247e73d0924d35b..81dcd0940b93ae9a1ebac81e67a48eedc8ddc147 100644 (file)
--- a/sysdeps/sparc/sparc32/sem_wait.c
+++ b/sysdeps/sparc/sparc32/sem_wait.c
@@ -25,7 +25,7 @@
 
 #include <pthreadP.h>
 #include <shlib-compat.h>
-
+#include <sparc-nptl.h>
 
 void
 attribute_hidden