From patchwork Mon Oct 16 20:44:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 115985 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp4102068qgn; Mon, 16 Oct 2017 13:44:45 -0700 (PDT) X-Received: by 10.159.218.68 with SMTP id x4mr9582195plv.291.1508186685523; Mon, 16 Oct 2017 13:44:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508186685; cv=none; d=google.com; s=arc-20160816; b=ZYj45NAC3Esm43qE35WKJJkwlUcI0YqBx3LEvDFhCmHrl+ERFe09PAIBFp5liEMNx+ IQa7b1Lc/2mwkQdGLk3CxKza4V0CyGsUU0kcC10f6sH3DrBKsoZiKBh+dC6Mc0HAolre DqhJ8PAYpmVyNT3tipSMHU3hLlDcYRjbKF8vjAr0zYYQVA+eXMZn+1DaCziVR/7Bvg3G VPqmh3XQnDTam8dtr8Jl8MKzXCmbctGMWF02Z6I1u6BKPDWIom8DBsEaoT6RpGTKFnvO Xjk5S6vl1fHhBXVCIeTfUC92wQJyvrGbtNf7s//TFFjdAqRUfYgmUM+9pl19U01lXusF jQQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:to:from:delivered-to:sender:list-help :list-post:list-archive:list-subscribe:list-unsubscribe:list-id :precedence:mailing-list:dkim-signature:domainkey-signature :arc-authentication-results; bh=m/5tH104ZN96Sico6s3Ge4O3RmPMjvvUR8IQfcAIQYA=; b=mCLeR4KH16PsbmFBomiJ/wbmL/Wv2XvmaeQa9kg4kVgUkxIF/k8Ow5So1G4l5ZU3bC 2Pg+m56y06MMyYMnxwUhAqjJvs2XQ3bAv8IgQWjNkxOI4Z4qN4LFCas20zY0DxmUFCJM Rmg/LcFc09H9rtHEkNJc86Om7ZZjm02PtARSGBhazJ9MVckxJuXKgcdGU6U5A+Tl3h4l /VZIzLayeG48b7lkAbffeU9Oz6cUTdTKttLFlqB5F3CkvIcBCpKBbmg0Q/UEPIPiGtEV 8wQ+KFo3dTDei4xPI96S4ugzf75LzIdHMnFlSg9dlzOJ/9qduSZJj3kL5K+VwvbPtlhq 8cVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=BTFuQnnH; spf=pass (google.com: domain of libc-alpha-return-85910-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-85910-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id p25si4257831pgn.126.2017.10.16.13.44.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 13:44:45 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-85910-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=BTFuQnnH; spf=pass (google.com: domain of libc-alpha-return-85910-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-85910-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; q=dns; s= default; b=MPQ0Av46gY09Oqs3PRQjER88m5ip/e/jL67XCPiSRyFqPlHxWsWjK BjItQikb0QEW0IEhOTnShq1Cr/cARft43ejFPrZ6YDTcMNPqZvzrVAupPw39D5/V YHqUd2QCGNfRoCWiVkdpTQC2bt5Mq0GY5EAIO8UZczUSxjstIL25ao= 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:from:to:subject:date:message-id; s=default; bh=SSHlotsvFv5H7tBKzRoyO2KElIA=; b=BTFuQnnHN62nQo8Hb+y9zeZ7Neql dyUURU0n+z4tYUEeNnZ+mA7txl74cn2ef4WMLthf0CgRwFIX90CUkkfa4swzfr0m WHF7cRP9YrDXPH9iMC0k2ANo3mM6plJ0ECIRcNoyMa55k+52fTX2xb+lXv6OMySS bCf9dviMFtBP3Kk= Received: (qmail 129283 invoked by alias); 16 Oct 2017 20:44:25 -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 129254 invoked by uid 89); 16 Oct 2017 20:44:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-23.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS, UNWANTED_LANGUAGE_BODY autolearn=ham version=3.3.2 spammy= X-HELO: mail-qt0-f176.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=m/5tH104ZN96Sico6s3Ge4O3RmPMjvvUR8IQfcAIQYA=; b=ieuHyAWl4Tyg/t6LShIMhM2iEoSlTRwSQXYP9c+T12l/fZQe9My1By6zKRrfxATnPH c6buLbA3n3e4neLHpRelbC/1zpzEhoJ030nRwP9aJ6Jg/5sOiz9MH4+GkR+XI+y1UCvL HbgDTcq0TZfjx59oCC4XgA6tTD3Y1hcv7s+jPj6qVONVuN8rfKGHZLPRMsU2Erx9KSFA b/RPlnz/3dNsq3VbJvHeedZ82RDN4eIdV47/svbW6fYO9tEylJZb1cUieb3hFgvj0mMp bG2+FF7dzJbwqLxhrY/hgASqlASEl5diISwMjIgVtg2/yl8D9qIxnOyv+J6DYmN/lc/c HzYA== X-Gm-Message-State: AMCzsaVh5GD0QWu6tj3A1ixypyIWz07F/QavRrNw2plV1MUUAuIkfBSj AfnBYe0gJBsOvuTKvuiVoJgQmi6Utdk= X-Google-Smtp-Source: AOwi7QArAIq3XqcSgJXjGDJXOfCCKnaWjiceKhKn+BS9G/3jLX5LpL0ZE/fqx/zC+Ue8R256zyjyDg== X-Received: by 10.200.12.69 with SMTP id l5mr16590043qti.268.1508186660233; Mon, 16 Oct 2017 13:44:20 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 1/3] Define __PTHREAD_MUTEX_HAVE_PREV for all architectures [BZ #22298] Date: Mon, 16 Oct 2017 18:44:11 -0200 Message-Id: <1508186653-24430-1-git-send-email-adhemerval.zanella@linaro.org> It is incorrect to define __PTHREAD_MUTEX_HAVE_PREV to 1 only when __WORDSIZE == 64. On x32, for instance, __PTHREAD_MUTEX_HAVE_PREV should be 1, but it has __WORDSIZE == 32. This patch defines __PTHREAD_MUTEX_HAVE_PREV for all architectures and its check is changed from "#ifdef" to "#if" to support values of 0 or 1. Checked on x86_64-linux-gnu and with a build for all major ABIs affected. H.J. Lu Adhemerval Zanella * nptl/allocatestack.c (allocate_stack): Check if __PTHREAD_MUTEX_HAVE_PREV is non-zero, instead if __PTHREAD_MUTEX_HAVE_PREV is defined. * nptl/descr.h (pthread): Likewise. * nptl/nptl-init.c (__pthread_initialize_minimal_internal): Likewise. * nptl/pthread_create.c (START_THREAD_DEFN): Likewise. * sysdeps/nptl/fork.c (__libc_fork): Likewise. * sysdeps/nptl/pthread.h (PTHREAD_MUTEX_INITIALIZER): Likewise. * sysdeps/nptl/bits/thread-shared-types.h (__pthread_internal_list, __pthread_mutex_s): Check __PTHREAD_MUTEX_HAVE_PREV instead of __WORDSIZE. * sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h (__PTHREAD_MUTEX_HAVE_PREV): New define. * sysdeps/alpha/nptl/bits/pthreadtypes-arch.h (__PTHREAD_MUTEX_HAVE_PREV): Likewise. * sysdeps/arm/nptl/bits/pthreadtypes-arch.h (__PTHREAD_MUTEX_HAVE_PREV): Likewise. * sysdeps/hppa/nptl/bits/pthreadtypes-arch.h (__PTHREAD_MUTEX_HAVE_PREV): Likewise. * sysdeps/ia64/nptl/bits/pthreadtypes-arch.h (__PTHREAD_MUTEX_HAVE_PREV): Likewise. * sysdeps/m68k/nptl/bits/pthreadtypes-arch.h (__PTHREAD_MUTEX_HAVE_PREV): Likewise. * sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h (__PTHREAD_MUTEX_HAVE_PREV): Likewise. * sysdeps/mips/nptl/bits/pthreadtypes-arch.h (__PTHREAD_MUTEX_HAVE_PREV): Likewise. * sysdeps/nios2/nptl/bits/pthreadtypes-arch.h (__PTHREAD_MUTEX_HAVE_PREV): Likewise. * sysdeps/powerpc/nptl/bits/pthreadtypes-arch.h (__PTHREAD_MUTEX_HAVE_PREV): Likewise. * sysdeps/s390/nptl/bits/pthreadtypes-arch.h (__PTHREAD_MUTEX_HAVE_PREV): Likewise. * sysdeps/sh/nptl/bits/pthreadtypes-arch.h (__PTHREAD_MUTEX_HAVE_PREV): Likewise. * sysdeps/sparc/nptl/bits/pthreadtypes-arch.h (__PTHREAD_MUTEX_HAVE_PREV): Likewise. * sysdeps/tile/nptl/bits/pthreadtypes-arch.h (__PTHREAD_MUTEX_HAVE_PREV): Likewise. * sysdeps/x86/nptl/bits/pthreadtypes-arch.h (__PTHREAD_MUTEX_HAVE_PREV): Likewise. --- ChangeLog | 46 ++++++++++++++++++++++++ nptl/allocatestack.c | 2 +- nptl/descr.h | 2 +- nptl/nptl-init.c | 2 +- nptl/pthread_create.c | 4 +-- sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h | 5 +++ sysdeps/alpha/nptl/bits/pthreadtypes-arch.h | 1 + sysdeps/arm/nptl/bits/pthreadtypes-arch.h | 1 + sysdeps/hppa/nptl/bits/pthreadtypes-arch.h | 1 + sysdeps/ia64/nptl/bits/pthreadtypes-arch.h | 1 + sysdeps/m68k/nptl/bits/pthreadtypes-arch.h | 1 + sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h | 1 + sysdeps/mips/nptl/bits/pthreadtypes-arch.h | 1 + sysdeps/nios2/nptl/bits/pthreadtypes-arch.h | 1 + sysdeps/nptl/bits/thread-shared-types.h | 12 ++++--- sysdeps/nptl/fork.c | 2 +- sysdeps/nptl/pthread.h | 2 +- sysdeps/powerpc/nptl/bits/pthreadtypes-arch.h | 1 + sysdeps/s390/nptl/bits/pthreadtypes-arch.h | 1 + sysdeps/sh/nptl/bits/pthreadtypes-arch.h | 1 + sysdeps/sparc/nptl/bits/pthreadtypes-arch.h | 1 + sysdeps/tile/nptl/bits/pthreadtypes-arch.h | 1 + sysdeps/x86/nptl/bits/pthreadtypes-arch.h | 5 +++ 23 files changed, 83 insertions(+), 12 deletions(-) -- 2.7.4 diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c index ad9add8..1cc7893 100644 --- a/nptl/allocatestack.c +++ b/nptl/allocatestack.c @@ -753,7 +753,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, - offsetof (pthread_mutex_t, __data.__list.__next)); pd->robust_head.list_op_pending = NULL; -#ifdef __PTHREAD_MUTEX_HAVE_PREV +#if __PTHREAD_MUTEX_HAVE_PREV pd->robust_prev = &pd->robust_head; #endif pd->robust_head.list = &pd->robust_head; diff --git a/nptl/descr.h b/nptl/descr.h index c5ad0c8..c83b17b 100644 --- a/nptl/descr.h +++ b/nptl/descr.h @@ -169,7 +169,7 @@ struct pthread pid_t pid_ununsed; /* List of robust mutexes the thread is holding. */ -#ifdef __PTHREAD_MUTEX_HAVE_PREV +#if __PTHREAD_MUTEX_HAVE_PREV void *robust_prev; struct robust_list_head robust_head; diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c index 2921607..869e926 100644 --- a/nptl/nptl-init.c +++ b/nptl/nptl-init.c @@ -297,7 +297,7 @@ __pthread_initialize_minimal_internal (void) /* Initialize the robust mutex data. */ { -#ifdef __PTHREAD_MUTEX_HAVE_PREV +#if __PTHREAD_MUTEX_HAVE_PREV pd->robust_prev = &pd->robust_head; #endif pd->robust_head.list = &pd->robust_head; diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c index 992331e..51ae60d 100644 --- a/nptl/pthread_create.c +++ b/nptl/pthread_create.c @@ -518,7 +518,7 @@ START_THREAD_DEFN #ifndef __ASSUME_SET_ROBUST_LIST /* If this thread has any robust mutexes locked, handle them now. */ -# ifdef __PTHREAD_MUTEX_HAVE_PREV +# if __PTHREAD_MUTEX_HAVE_PREV void *robust = pd->robust_head.list; # else __pthread_slist_t *robust = pd->robust_list.__next; @@ -536,7 +536,7 @@ START_THREAD_DEFN __list.__next)); robust = *((void **) robust); -# ifdef __PTHREAD_MUTEX_HAVE_PREV +# if __PTHREAD_MUTEX_HAVE_PREV this->__list.__prev = NULL; # endif this->__list.__next = NULL; diff --git a/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h b/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h index d13a75d..3c43707 100644 --- a/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h @@ -45,6 +45,11 @@ #define __PTHREAD_COMPAT_PADDING_MID #define __PTHREAD_COMPAT_PADDING_END #define __PTHREAD_MUTEX_LOCK_ELISION 0 +#ifdef __ILP32__ +#define __PTHREAD_MUTEX_HAVE_PREV 0 +#else +#define __PTHREAD_MUTEX_HAVE_PREV 1 +#endif #define __LOCK_ALIGNMENT #define __ONCE_ALIGNMENT diff --git a/sysdeps/alpha/nptl/bits/pthreadtypes-arch.h b/sysdeps/alpha/nptl/bits/pthreadtypes-arch.h index b6f6cb1..687028a 100644 --- a/sysdeps/alpha/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/alpha/nptl/bits/pthreadtypes-arch.h @@ -33,6 +33,7 @@ #define __PTHREAD_COMPAT_PADDING_MID #define __PTHREAD_COMPAT_PADDING_END #define __PTHREAD_MUTEX_LOCK_ELISION 0 +#define __PTHREAD_MUTEX_HAVE_PREV 1 #define __LOCK_ALIGNMENT #define __ONCE_ALIGNMENT diff --git a/sysdeps/arm/nptl/bits/pthreadtypes-arch.h b/sysdeps/arm/nptl/bits/pthreadtypes-arch.h index 3f9eca4..fac38ac 100644 --- a/sysdeps/arm/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/arm/nptl/bits/pthreadtypes-arch.h @@ -34,6 +34,7 @@ #define __PTHREAD_COMPAT_PADDING_MID #define __PTHREAD_COMPAT_PADDING_END #define __PTHREAD_MUTEX_LOCK_ELISION 0 +#define __PTHREAD_MUTEX_HAVE_PREV 0 #define __LOCK_ALIGNMENT #define __ONCE_ALIGNMENT diff --git a/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h b/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h index c158562..7ad0ce7 100644 --- a/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h @@ -48,6 +48,7 @@ pthread_mutex_t is larger than Linuxthreads. */ #define __PTHREAD_COMPAT_PADDING_END int __reserved[2]; #define __PTHREAD_MUTEX_LOCK_ELISION 0 +#define __PTHREAD_MUTEX_HAVE_PREV 0 #define __LOCK_ALIGNMENT __attribute__ ((__aligned__(16))) #define __ONCE_ALIGNMENT diff --git a/sysdeps/ia64/nptl/bits/pthreadtypes-arch.h b/sysdeps/ia64/nptl/bits/pthreadtypes-arch.h index 631cb33..d456aba 100644 --- a/sysdeps/ia64/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/ia64/nptl/bits/pthreadtypes-arch.h @@ -33,6 +33,7 @@ #define __PTHREAD_COMPAT_PADDING_MID #define __PTHREAD_COMPAT_PADDING_END #define __PTHREAD_MUTEX_LOCK_ELISION 0 +#define __PTHREAD_MUTEX_HAVE_PREV 1 #define __LOCK_ALIGNMENT #define __ONCE_ALIGNMENT diff --git a/sysdeps/m68k/nptl/bits/pthreadtypes-arch.h b/sysdeps/m68k/nptl/bits/pthreadtypes-arch.h index 845b9e6..25e93be 100644 --- a/sysdeps/m68k/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/m68k/nptl/bits/pthreadtypes-arch.h @@ -35,6 +35,7 @@ #define __PTHREAD_COMPAT_PADDING_MID #define __PTHREAD_COMPAT_PADDING_END #define __PTHREAD_MUTEX_LOCK_ELISION 0 +#define __PTHREAD_MUTEX_HAVE_PREV 0 #define __LOCK_ALIGNMENT __attribute__ ((__aligned__ (4))) #define __ONCE_ALIGNMENT __attribute__ ((__aligned__ (4))) diff --git a/sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h b/sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h index d687e2c..b9130b6 100644 --- a/sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h @@ -35,6 +35,7 @@ #define __PTHREAD_COMPAT_PADDING_MID #define __PTHREAD_COMPAT_PADDING_END #define __PTHREAD_MUTEX_LOCK_ELISION 0 +#define __PTHREAD_MUTEX_HAVE_PREV 0 #define __LOCK_ALIGNMENT #define __ONCE_ALIGNMENT diff --git a/sysdeps/mips/nptl/bits/pthreadtypes-arch.h b/sysdeps/mips/nptl/bits/pthreadtypes-arch.h index 6aa1bda..c5cc1f8 100644 --- a/sysdeps/mips/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/mips/nptl/bits/pthreadtypes-arch.h @@ -42,6 +42,7 @@ #define __PTHREAD_COMPAT_PADDING_MID #define __PTHREAD_COMPAT_PADDING_END #define __PTHREAD_MUTEX_LOCK_ELISION 0 +#define __PTHREAD_MUTEX_HAVE_PREV (_MIPS_SIM == _ABI64) #define __LOCK_ALIGNMENT #define __ONCE_ALIGNMENT diff --git a/sysdeps/nios2/nptl/bits/pthreadtypes-arch.h b/sysdeps/nios2/nptl/bits/pthreadtypes-arch.h index e2732f9..431da41 100644 --- a/sysdeps/nios2/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/nios2/nptl/bits/pthreadtypes-arch.h @@ -35,6 +35,7 @@ #define __PTHREAD_COMPAT_PADDING_MID #define __PTHREAD_COMPAT_PADDING_END #define __PTHREAD_MUTEX_LOCK_ELISION 0 +#define __PTHREAD_MUTEX_HAVE_PREV 0 #define __LOCK_ALIGNMENT #define __ONCE_ALIGNMENT diff --git a/sysdeps/nptl/bits/thread-shared-types.h b/sysdeps/nptl/bits/thread-shared-types.h index 68b82b6..0d24529 100644 --- a/sysdeps/nptl/bits/thread-shared-types.h +++ b/sysdeps/nptl/bits/thread-shared-types.h @@ -59,7 +59,10 @@ /* Common definition of pthread_mutex_t. */ -#if __WORDSIZE == 64 +/* __PTHREAD_MUTEX_HAVE_PREV also defines the internal layout of + __pthread_mutex_s internal __nusers, __PTHREAD_SPINS_DATA, and + __list members. */ +#if __PTHREAD_MUTEX_HAVE_PREV typedef struct __pthread_internal_list { struct __pthread_internal_list *__prev; @@ -74,7 +77,7 @@ typedef struct __pthread_internal_slist /* Lock elision support. */ #if __PTHREAD_MUTEX_LOCK_ELISION -# if __WORDSIZE == 64 +# if __PTHREAD_MUTEX_HAVE_PREV # define __PTHREAD_SPINS_DATA \ short __spins; \ short __elision @@ -101,17 +104,16 @@ struct __pthread_mutex_s int __lock __LOCK_ALIGNMENT; unsigned int __count; int __owner; -#if __WORDSIZE == 64 +#if __PTHREAD_MUTEX_HAVE_PREV unsigned int __nusers; #endif /* KIND must stay at this position in the structure to maintain binary compatibility with static initializers. */ int __kind; __PTHREAD_COMPAT_PADDING_MID -#if __WORDSIZE == 64 +#if __PTHREAD_MUTEX_HAVE_PREV __PTHREAD_SPINS_DATA; __pthread_list_t __list; -# define __PTHREAD_MUTEX_HAVE_PREV 1 #else unsigned int __nusers; __extension__ union diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c index 4bb87e2..48676c2 100644 --- a/sysdeps/nptl/fork.c +++ b/sysdeps/nptl/fork.c @@ -166,7 +166,7 @@ __libc_fork (void) inherit the correct value from the parent. We do not need to clear the pending operation because it must have been zero when fork was called. */ -# ifdef __PTHREAD_MUTEX_HAVE_PREV +# if __PTHREAD_MUTEX_HAVE_PREV self->robust_prev = &self->robust_head; # endif self->robust_head.list = &self->robust_head; diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h index 632ea7b..2b2b386 100644 --- a/sysdeps/nptl/pthread.h +++ b/sysdeps/nptl/pthread.h @@ -83,7 +83,7 @@ enum #endif -#ifdef __PTHREAD_MUTEX_HAVE_PREV +#if __PTHREAD_MUTEX_HAVE_PREV # define PTHREAD_MUTEX_INITIALIZER \ { { 0, 0, 0, 0, 0, __PTHREAD_SPINS, { 0, 0 } } } # ifdef __USE_GNU diff --git a/sysdeps/powerpc/nptl/bits/pthreadtypes-arch.h b/sysdeps/powerpc/nptl/bits/pthreadtypes-arch.h index f29119b..d56897b 100644 --- a/sysdeps/powerpc/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/powerpc/nptl/bits/pthreadtypes-arch.h @@ -42,6 +42,7 @@ #define __PTHREAD_COMPAT_PADDING_MID #define __PTHREAD_COMPAT_PADDING_END #define __PTHREAD_MUTEX_LOCK_ELISION 1 +#define __PTHREAD_MUTEX_HAVE_PREV (__WORDSIZE == 64) #define __LOCK_ALIGNMENT #define __ONCE_ALIGNMENT diff --git a/sysdeps/s390/nptl/bits/pthreadtypes-arch.h b/sysdeps/s390/nptl/bits/pthreadtypes-arch.h index 3a9ac57..e4c164a 100644 --- a/sysdeps/s390/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/s390/nptl/bits/pthreadtypes-arch.h @@ -45,6 +45,7 @@ #else #define __PTHREAD_MUTEX_LOCK_ELISION 0 #endif +#define __PTHREAD_MUTEX_HAVE_PREV (__WORDSIZE == 64) #define __LOCK_ALIGNMENT #define __ONCE_ALIGNMENT diff --git a/sysdeps/sh/nptl/bits/pthreadtypes-arch.h b/sysdeps/sh/nptl/bits/pthreadtypes-arch.h index b2615fe..711e7bb 100644 --- a/sysdeps/sh/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/sh/nptl/bits/pthreadtypes-arch.h @@ -34,6 +34,7 @@ #define __PTHREAD_COMPAT_PADDING_MID #define __PTHREAD_COMPAT_PADDING_END #define __PTHREAD_MUTEX_LOCK_ELISION 0 +#define __PTHREAD_MUTEX_HAVE_PREV 0 #define __LOCK_ALIGNMENT #define __ONCE_ALIGNMENT diff --git a/sysdeps/sparc/nptl/bits/pthreadtypes-arch.h b/sysdeps/sparc/nptl/bits/pthreadtypes-arch.h index 1e188cf..6e7f47a 100644 --- a/sysdeps/sparc/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/sparc/nptl/bits/pthreadtypes-arch.h @@ -43,6 +43,7 @@ #define __PTHREAD_COMPAT_PADDING_MID #define __PTHREAD_COMPAT_PADDING_END #define __PTHREAD_MUTEX_LOCK_ELISION 0 +#define __PTHREAD_MUTEX_HAVE_PREV (__WORDSIZE == 64) #define __LOCK_ALIGNMENT #define __ONCE_ALIGNMENT diff --git a/sysdeps/tile/nptl/bits/pthreadtypes-arch.h b/sysdeps/tile/nptl/bits/pthreadtypes-arch.h index 145ee42..c753a9b 100644 --- a/sysdeps/tile/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/tile/nptl/bits/pthreadtypes-arch.h @@ -43,6 +43,7 @@ #define __PTHREAD_COMPAT_PADDING_MID #define __PTHREAD_COMPAT_PADDING_END #define __PTHREAD_MUTEX_LOCK_ELISION 0 +#define __PTHREAD_MUTEX_HAVE_PREV (__WORDSIZE == 64) #define __LOCK_ALIGNMENT #define __ONCE_ALIGNMENT diff --git a/sysdeps/x86/nptl/bits/pthreadtypes-arch.h b/sysdeps/x86/nptl/bits/pthreadtypes-arch.h index fd86806..1df1e02 100644 --- a/sysdeps/x86/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/x86/nptl/bits/pthreadtypes-arch.h @@ -51,6 +51,11 @@ #define __PTHREAD_COMPAT_PADDING_MID #define __PTHREAD_COMPAT_PADDING_END #define __PTHREAD_MUTEX_LOCK_ELISION 1 +#ifdef __x86_64__ +# define __PTHREAD_MUTEX_HAVE_PREV 1 +#else +# define __PTHREAD_MUTEX_HAVE_PREV 0 +#endif #define __LOCK_ALIGNMENT #define __ONCE_ALIGNMENT From patchwork Mon Oct 16 20:44:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 115984 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp4101952qgn; Mon, 16 Oct 2017 13:44:35 -0700 (PDT) X-Received: by 10.99.109.14 with SMTP id i14mr9353354pgc.355.1508186675050; Mon, 16 Oct 2017 13:44:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508186675; cv=none; d=google.com; s=arc-20160816; b=vXjiYbZZ8nuHdLPP0uMv+FoAyYOXAtBV5rCDk6tz0AW4Ll3gfZ+rwSM7ZzbH14C7l2 jnqlOKZhE6XqC7AnH8KWhPN0GHxZDDr7WcglP0ZAEPlS89jScYQ4ajfEFAB5jRrIPEBV UQEHw9r5I3b8PKz8tGkQD6Bzb5nbjElG6aH/M5ICqfc+NHwloBEjDdEEWQ+1U70MQsSV SV6ydOayHf7vum/rwRHIv/ryejGKe7nAeelzFNUO9dGhTNqo9+x98CmpIVz7S85vWuV3 SqfFD1u11rpESAiOLbtqWUi+7cYmHU/j/OGyBr7pTQrdAvLOABBBnmR0E0ykLmYF1ntN Xh8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from:delivered-to :sender:list-help:list-post:list-archive:list-subscribe :list-unsubscribe:list-id:precedence:mailing-list:dkim-signature :domainkey-signature:arc-authentication-results; bh=vcLy6mTbmx3qTJFjc/XbTmoN3uvrsvc2sIYM9GajkvE=; b=Ne0C/hkwDnLtf0CaF+R1XE3T8x6LHYGjJpidTjpcjkx5dQgyDE4KptD0im7U3UgKYc wa6usp4Bhu6RDg34LICEpJk38pbBKmZSybrpmuAsDxGN20xNdl/FzJ+i5iGmxmGrKEmS ZSoXerBbMF6xaxG9OVIbn6Eh2IL/CMTl0bJZV3HfZCi47mrDBAimNtFiudfiitU3IzQY m7KGpXAk8oc7ZTJiO9Gqcg8i/5H7xJ6ZgeDwspkQBKbchlcGQ1JgBnVIJoMWWMuVsUlj wYzJ/hadGlKdx4ZmObtUhzkJu1++6wWSiQApBBUENaDBUYPEmKioNUk10KF22YLMRr8w 3Kbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=aPy5uRyN; spf=pass (google.com: domain of libc-alpha-return-85909-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-85909-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id f3si4829731pfd.366.2017.10.16.13.44.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 13:44:35 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-85909-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=aPy5uRyN; spf=pass (google.com: domain of libc-alpha-return-85909-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-85909-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=m74MYwh0BiF9Kyf+rlfuHhwxJI1aG7U E/bLqIwfuvqn+q6ujNRksvws/OdaJT1q36GFNHPJquYwDbpv/xGc0nGAXIZzFGq/ XzxU0CIJzpYAoBURcdFzIF9efyUbbnnNXEnAVchd2Sxnj7LaNbtfG4IVhEcwcNOY CooUlQyEP78I= 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:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=ni07b+AW4jpa2nzooWysK3kjEdw=; b=aPy5u RyNzCNrqEb5Cfhdg/6kb1PpW4X/Dj2ty9fW4bHn88lPo33T4IIi/xogU09lL9pXA ACWuNpD77UTfWAytGfDzwqzahtBqt7kaVH2lOxEyx2m74ma6Xf7+zA3UdKbcsDGG 6quakEvmVJqnKVwUI6sG/RHycArrd8jcTxOruk= Received: (qmail 129273 invoked by alias); 16 Oct 2017 20:44:25 -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 129252 invoked by uid 89); 16 Oct 2017 20:44:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-qk0-f180.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=vcLy6mTbmx3qTJFjc/XbTmoN3uvrsvc2sIYM9GajkvE=; b=WyiDYO9PzD4OQaJ/XHzAzwi6MMQl3q/Srz6zx48a57mEeM5jQJ2o+3hoUiznJgaqZ1 r4CP0ePorRYgdkVe5GXUGQLeIiA1KaNUMTDcDE1Hh4Sp0/NoARc38vgSXyDDlS9oDYDA zKomghZKz0QX7iK/Ynrlb62VSlPSDuTftoY2rInSpodOad+Cncdg23HEUt76Fzc3JFsr xcwe1MvU6mTg0Rx1wmJcB2/M1nd16IT8hGS7EiyOX7q1Z6EkCpyz07QJRo4amQrlciNF XT0MOlwFYM8B9O/hBxLCf9J6PQkUJUbEn5fHJJFBqlDH/+X7SryQcw2/FvsP1nj5kZDN WYAw== X-Gm-Message-State: AMCzsaUrv0LzsVBAvuNo+I0F6UucXNzKQSd7kg3DW3VpZP+KLHVxK64z tYREDnuR2BtMqfGTPRyxtlUFf4mhoMU= X-Google-Smtp-Source: ABhQp+SE05shdOE5Zgy0GgG37ZYY2ykV2WMkNv7FvNWf8unnqWfYL4C2bqO2vFnksE//Aq7Cnr9DjQ== X-Received: by 10.55.15.42 with SMTP id z42mr15416673qkg.181.1508186661666; Mon, 16 Oct 2017 13:44:21 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 2/3] nptl: Change tst-typesizes to _Static_assert Date: Mon, 16 Oct 2017 18:44:12 -0200 Message-Id: <1508186653-24430-2-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1508186653-24430-1-git-send-email-adhemerval.zanella@linaro.org> References: <1508186653-24430-1-git-send-email-adhemerval.zanella@linaro.org> Instead of rely on runtime check to assure correct pthread types size a better strategy would use _Static_assert to trigger an error on build time (and thus allowing to check to potentially ABI breakage on cross-compiling make check). Checked on x86_64-linux-gnu and with a build check for all affected ABIs (aarch64-linux-gnu, alpha-linux-gnu, arm-linux-gnueabihf, hppa-linux-gnu, i686-linux-gnu, ia64-linux-gnu, m68k-linux-gnu, microblaze-linux-gnu, mips64-linux-gnu, mips64-n32-linux-gnu, mips-linux-gnu, powerpc64le-linux-gnu, powerpc-linux-gnu, s390-linux-gnu, s390x-linux-gnu, sh4-linux-gnu, sparc64-linux-gnu, sparcv9-linux-gnu, tilegx-linux-gnu, tilegx-linux-gnu-x32, tilepro-linux-gnu, x86_64-linux-gnu, and x86_64-linux-x32). * nptl/tst-typesizes.c: Make sizes check _Static_asserts at built time. --- ChangeLog | 3 ++ nptl/tst-typesizes.c | 77 +++++++++++++--------------------------------------- 2 files changed, 22 insertions(+), 58 deletions(-) -- 2.7.4 diff --git a/nptl/tst-typesizes.c b/nptl/tst-typesizes.c index 78ed773..3355614 100644 --- a/nptl/tst-typesizes.c +++ b/nptl/tst-typesizes.c @@ -20,56 +20,26 @@ #include #include -static const struct -{ - const char *name; - size_t expected; - size_t is; -} types[] = - { -#define T(t, c) \ - { #t, c, sizeof (t) } - T (pthread_attr_t, __SIZEOF_PTHREAD_ATTR_T), - T (pthread_mutex_t, __SIZEOF_PTHREAD_MUTEX_T), - T (pthread_mutexattr_t, __SIZEOF_PTHREAD_MUTEXATTR_T), - T (pthread_cond_t, __SIZEOF_PTHREAD_COND_T), - T (pthread_condattr_t, __SIZEOF_PTHREAD_CONDATTR_T), - T (pthread_rwlock_t, __SIZEOF_PTHREAD_RWLOCK_T), - T (pthread_rwlockattr_t, __SIZEOF_PTHREAD_RWLOCKATTR_T), - T (pthread_barrier_t, __SIZEOF_PTHREAD_BARRIER_T), - T (pthread_barrierattr_t, __SIZEOF_PTHREAD_BARRIERATTR_T) - }; - static int do_test (void) { - int result = 0; - -#define TEST_TYPE(name) \ - printf ("%s: ", #name); \ - if (sizeof (name) != sizeof (((name *) 0)->__size)) \ - { \ - printf ("expected %zu, is %zu\n", \ - sizeof (((name *) 0)->__size), sizeof (name)); \ - result = 1; \ - } \ - else \ - puts ("OK") - - TEST_TYPE (pthread_mutex_t); - TEST_TYPE (pthread_cond_t); - TEST_TYPE (pthread_rwlock_t); - -#define TEST_TYPE2(name, internal) \ - printf ("%s: ", #name); \ - if (sizeof (((name *) 0)->__size) < sizeof (internal)) \ - { \ - printf ("expected %zu, is %zu\n", \ - sizeof (((name *) 0)->__size), sizeof (internal)); \ - result = 1; \ - } \ - else \ - puts ("OK") +#define TEST_TYPE(__type, __size) \ + _Static_assert (sizeof (__type) == __size, \ + "sizeof (" #__type ") != " #__size) + + TEST_TYPE (pthread_attr_t, __SIZEOF_PTHREAD_ATTR_T); + TEST_TYPE (pthread_mutex_t, __SIZEOF_PTHREAD_MUTEX_T); + TEST_TYPE (pthread_mutexattr_t, __SIZEOF_PTHREAD_MUTEXATTR_T); + TEST_TYPE (pthread_cond_t, __SIZEOF_PTHREAD_COND_T); + TEST_TYPE (pthread_condattr_t, __SIZEOF_PTHREAD_CONDATTR_T); + TEST_TYPE (pthread_rwlock_t, __SIZEOF_PTHREAD_RWLOCK_T); + TEST_TYPE (pthread_rwlockattr_t, __SIZEOF_PTHREAD_RWLOCKATTR_T); + TEST_TYPE (pthread_barrier_t, __SIZEOF_PTHREAD_BARRIER_T); + TEST_TYPE (pthread_barrierattr_t, __SIZEOF_PTHREAD_BARRIERATTR_T); + +#define TEST_TYPE2(__type, __internal) \ + _Static_assert (sizeof ((__type *) 0)->__size >= sizeof (__internal), \ + "sizeof (" #__type ".__size) > sizeof (" #__internal ")") TEST_TYPE2 (pthread_attr_t, struct pthread_attr); TEST_TYPE2 (pthread_mutexattr_t, struct pthread_mutexattr); @@ -80,16 +50,7 @@ do_test (void) TEST_TYPE2 (sem_t, struct new_sem); TEST_TYPE2 (sem_t, struct old_sem); - for (size_t i = 0; i < sizeof (types) / sizeof (types[0]); ++i) - if (types[i].expected != types[i].is) - { - printf ("%s: expected %zu, is %zu\n", - types[i].name, types[i].expected, types[i].is); - result = 1; - } - - return result; + return 0; } -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" +#include From patchwork Mon Oct 16 20:44:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 115986 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp4102187qgn; Mon, 16 Oct 2017 13:44:55 -0700 (PDT) X-Received: by 10.99.63.199 with SMTP id m190mr9163864pga.275.1508186695665; Mon, 16 Oct 2017 13:44:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508186695; cv=none; d=google.com; s=arc-20160816; b=isr9fvBcg9Ms1RU5r+BUjvQW1k/6AA6PLKUk4KjgI1E+9nvEKw4tIWYYm4sJlPyma+ jtpy/w7AUBiulDfnuxqd3Ki25KD5yGXypJ7qA2+XEIMjeipRDlvdpGtthdO8vicA273n cc+cAiUNeQsjyuHw4H5QMPRSRDC7huGcrT+L2D8enasUbUAjW/7iU2nmqSyrYju83Iwe cDHvsVVr5mVMwGYbNptrLqpa+loBuxM34oGtkoNtYUTqgCp5SqWGplOuADupSQUB2AvY SpNPuBzs5tdMwpvdKv9aQ2YqEjIJ27G59FkjU1666ANf5WNFQGZ89jmaC/1oVr0j3M2l R1ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from:delivered-to :sender:list-help:list-post:list-archive:list-subscribe :list-unsubscribe:list-id:precedence:mailing-list:dkim-signature :domainkey-signature:arc-authentication-results; bh=SxY9o0lFmGDWsEgBdEcj2E20+ZACfqk092HBREZXF4c=; b=AWmI4fSphmg7IJnKYHTyyBcLzsc/Ls0s0V07FiZGk85l/i9ZG1DCgDm08aT+i84Wcp kctSrqXL9HjMmwJUuJhzX7Y5uP26voiBuG0RwJQ8KFBxmNfMxr9prBNvR6OTAoNqtbUC OG8fJMPQQRG4PW8nuY7aX9vDYbXtqB6tWLa01jci9KNDYwIbWE4/dnRSBzNXBmUxNCyP ojKkR6NakUmPbqFaMQZsIHJ4fiebn6B3M/pIfXcOssjrQL1hNV/x+K6uOEiRqhKGdZP0 haxhmuV/UrPsNav8f6KHGHrw4V0JwR+wkhKTRpO/aR8yGpdiseVPpRUsOKcsT80DXOw1 ExGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Q+31r1gl; spf=pass (google.com: domain of libc-alpha-return-85911-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-85911-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id u128si4815226pfu.502.2017.10.16.13.44.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 13:44:55 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-85911-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Q+31r1gl; spf=pass (google.com: domain of libc-alpha-return-85911-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-85911-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=uGCfnsNJ9k06+VdWF6+ykvO1LfcvFg+ HYVGlns9MrkUPO/6QkeIUHScX5FBvJ6DKDDOU1C84xOfejZgr8U5zU6AmwKEc74k 8ST4G8x8ZnsdDIqb+xzT46m1AJgL2hACDBIyAM1LTVsmD6NTakB6yObYQMMkxal1 zfCtw7FLIWG8= 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:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=MDm6mG4RAZRt4OeFyOw6LjI2/6U=; b=Q+31r 1glNE1LFiFouSuHWeD2s0cldD6W8CaIlKiQQqVqUAqoEXp9YounZjpANQKa3GnFu T3x9LIJFcWRZn1CsBRzLh6a1lF9joKMzCUoU+Xln7JoB/XOqZUwlOGX/fgYobFio PDjDWnh0599EtyUD4ph8U1pqCj7rwixD63JtPs= Received: (qmail 129633 invoked by alias); 16 Oct 2017 20:44:27 -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 129574 invoked by uid 89); 16 Oct 2017 20:44:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=(unknown) X-HELO: mail-qk0-f177.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=SxY9o0lFmGDWsEgBdEcj2E20+ZACfqk092HBREZXF4c=; b=gSixvUTogAoD1kApklohDil8NaE9ZYX8eRA2fQxxta5ix8IE2FbDCsKVlErk0JpXBA DYYAnUffVwH2xb8Ps+gaUEFC7+9UXJwS5s7jaR1Rr1K2CpLcgg/ZXdnJmeWlGLS2QDOx I5azUTu/IOVOsatzZtlcYvxM90rUmY65nbbJXSIoz6gs3BZ+rBG5e38cQ0C9LPfRORQX rAv+jfP5dzPxntAKLQAF+uuu6dbmK5e0ZCmf8P4MlkmObX1BqSkdi27mqS08vPP2+/T3 I9PNyuQ32vNEMAcqDvzDtHIbpnKZV1uHf3B/1Rj2tT1uS3HwY+5pS7niawGV5oN7ry/D lGAg== X-Gm-Message-State: AMCzsaViIE2vRGDw9vZrNA26nfqYZbiTrtXMQtX64y/EwlHLiOoRuyZS ejQObmXyq48VVn9BkA32RJJa8YUmXkY= X-Google-Smtp-Source: ABhQp+Rd0Hy2fl1hzU1n+nUU+kNAeqbFYmqVSwCH7smK+Ez+FEjwnRFrrU/EcInuPvXxBAC3ZB1Adg== X-Received: by 10.55.137.198 with SMTP id l189mr16559355qkd.169.1508186663110; Mon, 16 Oct 2017 13:44:23 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 3/3] nptl: Add tests for internal pthread_mutex_t offsets Date: Mon, 16 Oct 2017 18:44:13 -0200 Message-Id: <1508186653-24430-3-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1508186653-24430-1-git-send-email-adhemerval.zanella@linaro.org> References: <1508186653-24430-1-git-send-email-adhemerval.zanella@linaro.org> This patch adds a new build test to check for internal fields offsets uses on pthread_mutex_t static initialization macros (PTHREAD_MUTEX_INITIALIZER, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP, and PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP). Currently the only field which is statically initialized to a non zero/null value is pthread_mutex_t.__data.__kind value. A new internal header (pthread-offset.h) is added to each major ABI with the reference value. Checked on x86_64-linux-gnu and with a build check for all affected ABIs (aarch64-linux-gnu, alpha-linux-gnu, arm-linux-gnueabihf, hppa-linux-gnu, i686-linux-gnu, ia64-linux-gnu, m68k-linux-gnu, microblaze-linux-gnu, mips64-linux-gnu, mips64-n32-linux-gnu, mips-linux-gnu, powerpc64le-linux-gnu, powerpc-linux-gnu, s390-linux-gnu, s390x-linux-gnu, sh4-linux-gnu, sparc64-linux-gnu, sparcv9-linux-gnu, tilegx-linux-gnu, tilegx-linux-gnu-x32, tilepro-linux-gnu, x86_64-linux-gnu, and x86_64-linux-x32). * nptl/Makefile (tests-internal): Add tst-offsets. * nptl/tst-offsets.c: New file. * sysdeps/aarch64/nptl/pthread-offsets.h: Likewise. * sysdeps/alpha/nptl/pthread-offsets.h: Likewise. * sysdeps/arm/nptl/pthread-offsets.h: Likewise. * sysdeps/hppa/nptl/pthread-offsets.h: Likewise. * sysdeps/i386/nptl/pthread-offsets.h: Likewise. * sysdeps/ia64/nptl/pthread-offsets.h: Likewise. * sysdeps/m68k/nptl/pthread-offsets.h: Likewise. * sysdeps/microblaze/nptl/pthread-offsets.h: Likewise. * sysdeps/mips/nptl/pthread-offsets.h: Likewise. * sysdeps/nios2/nptl/pthread-offsets.h: Likewise. * sysdeps/powerpc/nptl/pthread-offsets.h: Likewise. * sysdeps/s390/nptl/pthread-offsets.h: Likewise. * sysdeps/sh/nptl/pthread-offsets.h: Likewise. * sysdeps/sparc/nptl/pthread-offsets.h: Likewise. * sysdeps/tile/nptl/pthread-offsets.h: Likewise. * sysdeps/x86_64/nptl/pthread-offsets.h: Likewise. --- ChangeLog | 19 ++++++++++++++ nptl/Makefile | 2 +- nptl/tst-offsets.c | 41 +++++++++++++++++++++++++++++++ sysdeps/aarch64/nptl/pthread-offsets.h | 1 + sysdeps/alpha/nptl/pthread-offsets.h | 1 + sysdeps/arm/nptl/pthread-offsets.h | 1 + sysdeps/hppa/nptl/pthread-offsets.h | 1 + sysdeps/i386/nptl/pthread-offsets.h | 1 + sysdeps/ia64/nptl/pthread-offsets.h | 1 + sysdeps/m68k/nptl/pthread-offsets.h | 1 + sysdeps/microblaze/nptl/pthread-offsets.h | 1 + sysdeps/mips/nptl/pthread-offsets.h | 5 ++++ sysdeps/nios2/nptl/pthread-offsets.h | 1 + sysdeps/powerpc/nptl/pthread-offsets.h | 7 ++++++ sysdeps/s390/nptl/pthread-offsets.h | 7 ++++++ sysdeps/sh/nptl/pthread-offsets.h | 1 + sysdeps/sparc/nptl/pthread-offsets.h | 7 ++++++ sysdeps/tile/nptl/pthread-offsets.h | 7 ++++++ sysdeps/x86_64/nptl/pthread-offsets.h | 1 + 19 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 nptl/tst-offsets.c create mode 100644 sysdeps/aarch64/nptl/pthread-offsets.h create mode 100644 sysdeps/alpha/nptl/pthread-offsets.h create mode 100644 sysdeps/arm/nptl/pthread-offsets.h create mode 100644 sysdeps/hppa/nptl/pthread-offsets.h create mode 100644 sysdeps/i386/nptl/pthread-offsets.h create mode 100644 sysdeps/ia64/nptl/pthread-offsets.h create mode 100644 sysdeps/m68k/nptl/pthread-offsets.h create mode 100644 sysdeps/microblaze/nptl/pthread-offsets.h create mode 100644 sysdeps/mips/nptl/pthread-offsets.h create mode 100644 sysdeps/nios2/nptl/pthread-offsets.h create mode 100644 sysdeps/powerpc/nptl/pthread-offsets.h create mode 100644 sysdeps/s390/nptl/pthread-offsets.h create mode 100644 sysdeps/sh/nptl/pthread-offsets.h create mode 100644 sysdeps/sparc/nptl/pthread-offsets.h create mode 100644 sysdeps/tile/nptl/pthread-offsets.h create mode 100644 sysdeps/x86_64/nptl/pthread-offsets.h -- 2.7.4 diff --git a/nptl/Makefile b/nptl/Makefile index d819349..7492b06 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -304,7 +304,7 @@ tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \ tst-thread_local1 tst-mutex-errorcheck tst-robust10 \ tst-robust-fork tst-create-detached tst-memstream -tests-internal := tst-typesizes \ +tests-internal := tst-typesizes tst-offsets \ tst-rwlock19 tst-rwlock20 \ tst-sem11 tst-sem12 tst-sem13 \ tst-barrier5 tst-signal7 tst-mutex8 tst-mutex8-static \ diff --git a/nptl/tst-offsets.c b/nptl/tst-offsets.c new file mode 100644 index 0000000..1aa8a0e --- /dev/null +++ b/nptl/tst-offsets.c @@ -0,0 +1,41 @@ +/* Check pthread internal offsets. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include + +#include + +#define STR_HELPER(x) #x +#define STR(x) STR_HELPER(x) + +static int +do_test (void) +{ + /* Check if internal fields in pthread_mutex_t used by static initializers + have the expected offset. */ + _Static_assert (offsetof (pthread_mutex_t, __data.__kind) == + __PTHREAD_MUTEX_KIND_OFFSET, + "offset of __kind field != " + STR (__PTHREAD_MUTEX_KIND_OFFSET)); + + return 0; +} + +#include diff --git a/sysdeps/aarch64/nptl/pthread-offsets.h b/sysdeps/aarch64/nptl/pthread-offsets.h new file mode 100644 index 0000000..aaca502 --- /dev/null +++ b/sysdeps/aarch64/nptl/pthread-offsets.h @@ -0,0 +1 @@ +#define __PTHREAD_MUTEX_KIND_OFFSET 16 diff --git a/sysdeps/alpha/nptl/pthread-offsets.h b/sysdeps/alpha/nptl/pthread-offsets.h new file mode 100644 index 0000000..aaca502 --- /dev/null +++ b/sysdeps/alpha/nptl/pthread-offsets.h @@ -0,0 +1 @@ +#define __PTHREAD_MUTEX_KIND_OFFSET 16 diff --git a/sysdeps/arm/nptl/pthread-offsets.h b/sysdeps/arm/nptl/pthread-offsets.h new file mode 100644 index 0000000..235677f --- /dev/null +++ b/sysdeps/arm/nptl/pthread-offsets.h @@ -0,0 +1 @@ +#define __PTHREAD_MUTEX_KIND_OFFSET 12 diff --git a/sysdeps/hppa/nptl/pthread-offsets.h b/sysdeps/hppa/nptl/pthread-offsets.h new file mode 100644 index 0000000..235677f --- /dev/null +++ b/sysdeps/hppa/nptl/pthread-offsets.h @@ -0,0 +1 @@ +#define __PTHREAD_MUTEX_KIND_OFFSET 12 diff --git a/sysdeps/i386/nptl/pthread-offsets.h b/sysdeps/i386/nptl/pthread-offsets.h new file mode 100644 index 0000000..235677f --- /dev/null +++ b/sysdeps/i386/nptl/pthread-offsets.h @@ -0,0 +1 @@ +#define __PTHREAD_MUTEX_KIND_OFFSET 12 diff --git a/sysdeps/ia64/nptl/pthread-offsets.h b/sysdeps/ia64/nptl/pthread-offsets.h new file mode 100644 index 0000000..aaca502 --- /dev/null +++ b/sysdeps/ia64/nptl/pthread-offsets.h @@ -0,0 +1 @@ +#define __PTHREAD_MUTEX_KIND_OFFSET 16 diff --git a/sysdeps/m68k/nptl/pthread-offsets.h b/sysdeps/m68k/nptl/pthread-offsets.h new file mode 100644 index 0000000..235677f --- /dev/null +++ b/sysdeps/m68k/nptl/pthread-offsets.h @@ -0,0 +1 @@ +#define __PTHREAD_MUTEX_KIND_OFFSET 12 diff --git a/sysdeps/microblaze/nptl/pthread-offsets.h b/sysdeps/microblaze/nptl/pthread-offsets.h new file mode 100644 index 0000000..235677f --- /dev/null +++ b/sysdeps/microblaze/nptl/pthread-offsets.h @@ -0,0 +1 @@ +#define __PTHREAD_MUTEX_KIND_OFFSET 12 diff --git a/sysdeps/mips/nptl/pthread-offsets.h b/sysdeps/mips/nptl/pthread-offsets.h new file mode 100644 index 0000000..6dd3dea --- /dev/null +++ b/sysdeps/mips/nptl/pthread-offsets.h @@ -0,0 +1,5 @@ +#if _MIPS_SIM == _ABI64 +# define __PTHREAD_MUTEX_KIND_OFFSET 16 +#else +# define __PTHREAD_MUTEX_KIND_OFFSET 12 +#endif diff --git a/sysdeps/nios2/nptl/pthread-offsets.h b/sysdeps/nios2/nptl/pthread-offsets.h new file mode 100644 index 0000000..235677f --- /dev/null +++ b/sysdeps/nios2/nptl/pthread-offsets.h @@ -0,0 +1 @@ +#define __PTHREAD_MUTEX_KIND_OFFSET 12 diff --git a/sysdeps/powerpc/nptl/pthread-offsets.h b/sysdeps/powerpc/nptl/pthread-offsets.h new file mode 100644 index 0000000..f88961b --- /dev/null +++ b/sysdeps/powerpc/nptl/pthread-offsets.h @@ -0,0 +1,7 @@ +#include + +#if __WORDSIZE == 64 +# define __PTHREAD_MUTEX_KIND_OFFSET 16 +#else +# define __PTHREAD_MUTEX_KIND_OFFSET 12 +#endif diff --git a/sysdeps/s390/nptl/pthread-offsets.h b/sysdeps/s390/nptl/pthread-offsets.h new file mode 100644 index 0000000..f88961b --- /dev/null +++ b/sysdeps/s390/nptl/pthread-offsets.h @@ -0,0 +1,7 @@ +#include + +#if __WORDSIZE == 64 +# define __PTHREAD_MUTEX_KIND_OFFSET 16 +#else +# define __PTHREAD_MUTEX_KIND_OFFSET 12 +#endif diff --git a/sysdeps/sh/nptl/pthread-offsets.h b/sysdeps/sh/nptl/pthread-offsets.h new file mode 100644 index 0000000..235677f --- /dev/null +++ b/sysdeps/sh/nptl/pthread-offsets.h @@ -0,0 +1 @@ +#define __PTHREAD_MUTEX_KIND_OFFSET 12 diff --git a/sysdeps/sparc/nptl/pthread-offsets.h b/sysdeps/sparc/nptl/pthread-offsets.h new file mode 100644 index 0000000..f88961b --- /dev/null +++ b/sysdeps/sparc/nptl/pthread-offsets.h @@ -0,0 +1,7 @@ +#include + +#if __WORDSIZE == 64 +# define __PTHREAD_MUTEX_KIND_OFFSET 16 +#else +# define __PTHREAD_MUTEX_KIND_OFFSET 12 +#endif diff --git a/sysdeps/tile/nptl/pthread-offsets.h b/sysdeps/tile/nptl/pthread-offsets.h new file mode 100644 index 0000000..f88961b --- /dev/null +++ b/sysdeps/tile/nptl/pthread-offsets.h @@ -0,0 +1,7 @@ +#include + +#if __WORDSIZE == 64 +# define __PTHREAD_MUTEX_KIND_OFFSET 16 +#else +# define __PTHREAD_MUTEX_KIND_OFFSET 12 +#endif diff --git a/sysdeps/x86_64/nptl/pthread-offsets.h b/sysdeps/x86_64/nptl/pthread-offsets.h new file mode 100644 index 0000000..aaca502 --- /dev/null +++ b/sysdeps/x86_64/nptl/pthread-offsets.h @@ -0,0 +1 @@ +#define __PTHREAD_MUTEX_KIND_OFFSET 16