From patchwork Mon Jul 24 10:24:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 21737 Received: (qmail 77562 invoked by alias); 24 Jul 2017 10:25:10 -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 76372 invoked by uid 89); 24 Jul 2017 10:24:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx1.suse.de From: Andreas Schwab To: Adhemerval Zanella Cc: libc-alpha@sourceware.org Subject: Re: [PATCH v2] Move shared pthread definitions to common headers References: <1492537833-6356-1-git-send-email-adhemerval.zanella@linaro.org> X-Yow: Did you move a lot of KOREAN STEAK KNIVES this trip, Dingy? Date: Mon, 24 Jul 2017 12:24:30 +0200 In-Reply-To: <1492537833-6356-1-git-send-email-adhemerval.zanella@linaro.org> (Adhemerval Zanella's message of "Tue, 18 Apr 2017 14:50:33 -0300") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 On Apr 18 2017, Adhemerval Zanella wrote: > diff --git a/sysdeps/nptl/bits/thread-shared-types.h b/sysdeps/nptl/bits/thread-shared-types.h > new file mode 100644 > index 0000000..a829cee > --- /dev/null > +++ b/sysdeps/nptl/bits/thread-shared-types.h This has extra semicolons that will be flagged by -Wpedantic. In file included from /usr/include/bits/pthreadtypes.h:23:0, from /usr/include/pthread.h:26, from pthread.c:1: /usr/include/bits/thread-shared-types.h:110:31: warning: extra semicolon in struct or union specified [-Wpedantic] __PTHREAD_COMPAT_PADDING_MID; ^ /usr/include/bits/thread-shared-types.h:112:23: warning: extra semicolon in struct or union specified [-Wpedantic] __PTHREAD_SPINS_DATA; ^ /usr/include/bits/thread-shared-types.h:123:31: warning: extra semicolon in struct or union specified [-Wpedantic] __PTHREAD_COMPAT_PADDING_END; ^ Andreas. [BZ #21804] * sysdeps/nptl/bits/thread-shared-types.h (__PTHREAD_SPINS_DATA) [__PTHREAD_MUTEX_LOCK_ELISION && __WORDSIZE == 64]: Remove trailing semicolon. (struct __pthread_mutex_s): Remove semicolon after __PTHREAD_COMPAT_PADDING_MID and __PTHREAD_COMPAT_PADDING_END. * sysdeps/hppa/nptl/bits/pthreadtypes-arch.h (__PTHREAD_COMPAT_PADDING_MID, __PTHREAD_COMPAT_PADDING_END): Add semicolon. diff --git a/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h b/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h index 7befe5de6d..c1585625d1 100644 --- a/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h @@ -43,10 +43,10 @@ /* The old 4-word 16-byte aligned lock. This is initalized to all ones by the Linuxthreads PTHREAD_MUTEX_INITIALIZER. Unused in NPTL. */ -#define __PTHREAD_COMPAT_PADDING_MID int __compat_padding[4] +#define __PTHREAD_COMPAT_PADDING_MID int __compat_padding[4]; /* Two more words are left before the NPTL pthread_mutex_t is larger than Linuxthreads. */ -#define __PTHREAD_COMPAT_PADDING_END int __reserved[2] +#define __PTHREAD_COMPAT_PADDING_END int __reserved[2]; #define __PTHREAD_MUTEX_LOCK_ELISION 0 #define __LOCK_ALIGNMENT __attribute__ ((__aligned__(16))) diff --git a/sysdeps/nptl/bits/thread-shared-types.h b/sysdeps/nptl/bits/thread-shared-types.h index 1e45f2d8ce..68b82b6bd6 100644 --- a/sysdeps/nptl/bits/thread-shared-types.h +++ b/sysdeps/nptl/bits/thread-shared-types.h @@ -77,7 +77,7 @@ typedef struct __pthread_internal_slist # if __WORDSIZE == 64 # define __PTHREAD_SPINS_DATA \ short __spins; \ - short __elision; + short __elision # define __PTHREAD_SPINS 0, 0 # else # define __PTHREAD_SPINS_DATA \ @@ -107,7 +107,7 @@ struct __pthread_mutex_s /* KIND must stay at this position in the structure to maintain binary compatibility with static initializers. */ int __kind; - __PTHREAD_COMPAT_PADDING_MID; + __PTHREAD_COMPAT_PADDING_MID #if __WORDSIZE == 64 __PTHREAD_SPINS_DATA; __pthread_list_t __list; @@ -120,7 +120,7 @@ struct __pthread_mutex_s __pthread_slist_t __list; }; #endif - __PTHREAD_COMPAT_PADDING_END; + __PTHREAD_COMPAT_PADDING_END };