aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-06-24 13:31:04 -0700
committerDavid S. Miller <davem@davemloft.net>2014-07-09 22:19:09 -0700
commit7000d82e01dc04344eaa1772698c9b0c304a892f (patch)
treeb13bdcc10b4aaef22ab0e0e652ee1628d27103b4
parentd69b7f5ac02989ce3d8577eed86da3e0c8af6c1c (diff)
downloadglibc-7000d82e01dc04344eaa1772698c9b0c304a892f.zip
glibc-7000d82e01dc04344eaa1772698c9b0c304a892f.tar.gz
glibc-7000d82e01dc04344eaa1772698c9b0c304a892f.tar.bz2
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.
-rw-r--r--ChangeLog14
-rw-r--r--sysdeps/sparc/nptl/pthread_barrier_destroy.c1
-rw-r--r--sysdeps/sparc/nptl/pthread_barrier_init.c1
-rw-r--r--sysdeps/sparc/nptl/pthread_barrier_wait.c1
-rw-r--r--sysdeps/sparc/nptl/sem_init.c2
-rw-r--r--sysdeps/sparc/nptl/sem_post.c1
-rw-r--r--sysdeps/sparc/nptl/sem_timedwait.c2
-rw-r--r--sysdeps/sparc/nptl/sem_wait.c2
-rw-r--r--sysdeps/sparc/nptl/sparc-nptl.h (renamed from sysdeps/sparc/nptl/internaltypes.h)4
-rw-r--r--sysdeps/sparc/sparc32/pthread_barrier_wait.c1
-rw-r--r--sysdeps/sparc/sparc32/sem_post.c1
-rw-r--r--sysdeps/sparc/sparc32/sem_timedwait.c2
-rw-r--r--sysdeps/sparc/sparc32/sem_wait.c2
13 files changed, 26 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index a8aa74b..f5b5599 100644
--- 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 2221a27..883a101 100644
--- 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 6af6863..c076386 100644
--- 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 ed5c1f7..525418c 100644
--- 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 cbefdc4..d33881d 100644
--- 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 d83b9d8..c2dbe0a 100644
--- 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 0557e4e..3621f0b 100644
--- 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 cfa1ef3..ccf714d 100644
--- 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
index e5c2740..baff918 100644
--- 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 0fed908..318a47b 100644
--- 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 d3846c0..40650a0 100644
--- 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 5c48cb3..a10382a 100644
--- 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 8c072fe..81dcd09 100644
--- 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