From patchwork Thu Jul 10 05:19:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 368462 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5B21F14011F for ; Thu, 10 Jul 2014 15:20:10 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:message-id:to:subject:from:mime-version :content-type:content-transfer-encoding; q=dns; s=default; b=BSc Jml/BCctDE1tzSn6G5uM1zFkEQ45DiEYaOV2lpXKe5ZmarNiocl/e2IslRaNsx4K d14rkTtZCgBLxe8MVJkarxzAoLUIYgGvuU6pRfZvA1MT3hJbgrVej9Z0z2lN22Ac YSo04JrtASnmvQs8m8ILEI1Ml3ckp14mJxDycBMw= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:message-id:to:subject:from:mime-version :content-type:content-transfer-encoding; s=default; bh=/6DRfXo51 N9uNbnIAeKDcmaAknk=; b=wv3arWXioVtzH/kGzXk0rwrZkqlxXMaoBI7DELtBN XYtKTL/lZMXyNj7eQRDR9BDTfgS3sGpAgRTN4JICZ0fk7EK2TRDT/Y1/8/+lBGPS 8DU1iXAMQc7pHsoHMU7XoC416+ncFZHmzXXGZ/FcGDQOs1Hj1Z302lDGX5APxbpM g8= Received: (qmail 5192 invoked by alias); 10 Jul 2014 05:20:04 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 5103 invoked by uid 89); 10 Jul 2014 05:20:00 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.5 required=5.0 tests=AWL, BAYES_50 autolearn=ham version=3.3.2 X-HELO: shards.monkeyblade.net Date: Wed, 09 Jul 2014 22:19:53 -0700 (PDT) Message-Id: <20140709.221953.1735606319721222570.davem@davemloft.net> To: libc-alpha@sourceware.org Subject: [PATCH COMMITTED] Get rid of sparc specific NPTL internaltypes.h header. From: David Miller Mime-Version: 1.0 * 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/internaltypes.h | 35 ---------------------------- 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 +- sysdeps/sparc/nptl/sparc-nptl.h | 33 ++++++++++++++++++++++++++ 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 +- 14 files changed, 58 insertions(+), 40 deletions(-) delete mode 100644 sysdeps/sparc/nptl/internaltypes.h create mode 100644 sysdeps/sparc/nptl/sparc-nptl.h 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 * sysdeps/powerpc/test-gettimebase.c (do_test): Add newline to diff --git a/sysdeps/sparc/nptl/internaltypes.h b/sysdeps/sparc/nptl/internaltypes.h deleted file mode 100644 index e5c2740..0000000 --- a/sysdeps/sparc/nptl/internaltypes.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef _INTERNALTYPES_H - -#include_next - -union sparc_pthread_barrier -{ - struct pthread_barrier b; - struct sparc_pthread_barrier_s - { - unsigned int curr_event; - int lock; - unsigned int left; - unsigned int init_count; - unsigned char left_lock; - unsigned char pshared; - } s; -}; - -struct sparc_new_sem -{ - unsigned int value; - unsigned char lock; - unsigned char private; - unsigned char pad[2]; - unsigned long int nwaiters; -}; - -struct sparc_old_sem -{ - unsigned int value; - unsigned char lock; - unsigned char private; -}; - -#endif 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 #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 6af6863..c076386 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 ed5c1f7..525418c 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 cbefdc4..d33881d 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 d83b9d8..c2dbe0a 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 0557e4e..3621f0b 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 cfa1ef3..ccf714d 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/sparc-nptl.h b/sysdeps/sparc/nptl/sparc-nptl.h new file mode 100644 index 0000000..baff918 --- /dev/null +++ b/sysdeps/sparc/nptl/sparc-nptl.h @@ -0,0 +1,33 @@ +#ifndef _SPARC_NPTL_H + +union sparc_pthread_barrier +{ + struct pthread_barrier b; + struct sparc_pthread_barrier_s + { + unsigned int curr_event; + int lock; + unsigned int left; + unsigned int init_count; + unsigned char left_lock; + unsigned char pshared; + } s; +}; + +struct sparc_new_sem +{ + unsigned int value; + unsigned char lock; + unsigned char private; + unsigned char pad[2]; + unsigned long int nwaiters; +}; + +struct sparc_old_sem +{ + unsigned int value; + unsigned char lock; + unsigned char private; +}; + +#endif 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 #include #include +#include /* 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 #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 5c48cb3..a10382a 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 8c072fe..81dcd09 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