From 7000d82e01dc04344eaa1772698c9b0c304a892f Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 24 Jun 2014 13:31:04 -0700 Subject: [PATCH] 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. --- ChangeLog | 14 ++++++++++++++ sysdeps/sparc/nptl/pthread_barrier_destroy.c | 1 + sysdeps/sparc/nptl/pthread_barrier_init.c | 1 + sysdeps/sparc/nptl/pthread_barrier_wait.c | 1 + sysdeps/sparc/nptl/sem_init.c | 2 +- sysdeps/sparc/nptl/sem_post.c | 1 + sysdeps/sparc/nptl/sem_timedwait.c | 2 +- sysdeps/sparc/nptl/sem_wait.c | 2 +- .../sparc/nptl/{internaltypes.h => sparc-nptl.h} | 4 +--- sysdeps/sparc/sparc32/pthread_barrier_wait.c | 1 + sysdeps/sparc/sparc32/sem_post.c | 1 + sysdeps/sparc/sparc32/sem_timedwait.c | 2 +- sysdeps/sparc/sparc32/sem_wait.c | 2 +- 13 files changed, 26 insertions(+), 8 deletions(-) rename sysdeps/sparc/nptl/{internaltypes.h => sparc-nptl.h} (90%) diff --git a/ChangeLog b/ChangeLog index a8aa74bf988..f5b5599486c 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 * 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 2221a27e223..883a101a462 100644 --- a/sysdeps/sparc/nptl/pthread_barrier_destroy.c +++ b/sysdeps/sparc/nptl/pthread_barrier_destroy.c @@ -19,6 +19,7 @@ #include #include "pthreadP.h" #include +#include int pthread_barrier_destroy (barrier) diff --git a/sysdeps/sparc/nptl/pthread_barrier_init.c b/sysdeps/sparc/nptl/pthread_barrier_init.c index 6af686361d2..c076386b758 100644 --- a/sysdeps/sparc/nptl/pthread_barrier_init.c +++ b/sysdeps/sparc/nptl/pthread_barrier_init.c @@ -19,6 +19,7 @@ #include #include "pthreadP.h" #include +#include 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 ed5c1f70718..525418ce219 100644 --- a/sysdeps/sparc/nptl/pthread_barrier_wait.c +++ b/sysdeps/sparc/nptl/pthread_barrier_wait.c @@ -20,6 +20,7 @@ #include #include #include +#include /* Wait on barrier. */ int diff --git a/sysdeps/sparc/nptl/sem_init.c b/sysdeps/sparc/nptl/sem_init.c index cbefdc4823a..d33881d5432 100644 --- a/sysdeps/sparc/nptl/sem_init.c +++ b/sysdeps/sparc/nptl/sem_init.c @@ -23,7 +23,7 @@ #include #include "semaphoreP.h" #include - +#include int __new_sem_init (sem, pshared, value) diff --git a/sysdeps/sparc/nptl/sem_post.c b/sysdeps/sparc/nptl/sem_post.c index d83b9d8e2ea..c2dbe0a0ce8 100644 --- a/sysdeps/sparc/nptl/sem_post.c +++ b/sysdeps/sparc/nptl/sem_post.c @@ -24,6 +24,7 @@ #include #include +#include int __new_sem_post (sem_t *sem) diff --git a/sysdeps/sparc/nptl/sem_timedwait.c b/sysdeps/sparc/nptl/sem_timedwait.c index 0557e4e709d..3621f0b2d2f 100644 --- a/sysdeps/sparc/nptl/sem_timedwait.c +++ b/sysdeps/sparc/nptl/sem_timedwait.c @@ -25,7 +25,7 @@ #include #include - +#include 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 cfa1ef37278..ccf714d3918 100644 --- a/sysdeps/sparc/nptl/sem_wait.c +++ b/sysdeps/sparc/nptl/sem_wait.c @@ -25,7 +25,7 @@ #include #include - +#include 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 e5c27408d81..baff918288e 100644 --- a/sysdeps/sparc/nptl/internaltypes.h +++ b/sysdeps/sparc/nptl/sparc-nptl.h @@ -1,6 +1,4 @@ -#ifndef _INTERNALTYPES_H - -#include_next +#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 0fed9088653..318a47beab0 100644 --- a/sysdeps/sparc/sparc32/pthread_barrier_wait.c +++ b/sysdeps/sparc/sparc32/pthread_barrier_wait.c @@ -20,6 +20,7 @@ #include #include #include +#include /* Wait on barrier. */ int diff --git a/sysdeps/sparc/sparc32/sem_post.c b/sysdeps/sparc/sparc32/sem_post.c index d3846c045c8..40650a00239 100644 --- a/sysdeps/sparc/sparc32/sem_post.c +++ b/sysdeps/sparc/sparc32/sem_post.c @@ -24,6 +24,7 @@ #include #include +#include int __new_sem_post (sem_t *sem) diff --git a/sysdeps/sparc/sparc32/sem_timedwait.c b/sysdeps/sparc/sparc32/sem_timedwait.c index 5c48cb385a6..a10382af844 100644 --- a/sysdeps/sparc/sparc32/sem_timedwait.c +++ b/sysdeps/sparc/sparc32/sem_timedwait.c @@ -25,7 +25,7 @@ #include #include - +#include 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 8c072fe5f48..81dcd0940b9 100644 --- a/sysdeps/sparc/sparc32/sem_wait.c +++ b/sysdeps/sparc/sparc32/sem_wait.c @@ -25,7 +25,7 @@ #include #include - +#include void attribute_hidden -- 2.47.3