From patchwork Wed Nov 6 17:49:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 178746 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp947213ilf; Wed, 6 Nov 2019 09:50:24 -0800 (PST) X-Google-Smtp-Source: APXvYqySrhKKHY5KtV3m0+xQa8kD1HyCuZtj37zuDd1R/u4Sbu45rINOw8RLJaHja3/BvfUJKIvH X-Received: by 2002:a17:906:66d2:: with SMTP id k18mr35359860ejp.278.1573062624507; Wed, 06 Nov 2019 09:50:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573062624; cv=none; d=google.com; s=arc-20160816; b=ugqwYvgZGOS6P0kQRQ0xj1PRJvskWxqayMqke2B5KkF7Ax+dcNyUwUDQwECCRHt3/a WsG8Hmwz8s0t0t81+NhDSGIhXiXbDXATPj85JCaUPxcIbSJUCZprKpshzn2IqxCe+fui Cv0B8Ovw5TkyNyJpm10+I72Bhb3/7cckh0zw26ZcbCqHp/KV5OYA7EJ9ckdHUklgmEma O55YE3edK8hrEhD2FcnxLL+dBwU5WkAlOFzRga8/Ykr3cD8jyPUrKUL5OdNr8IIi1vXH +XEUYhSzJwgIKoPvGUKEvLn1oIMOCB22vITr+sNYD//q6BNAiMhBUrg5jo1WXY8igw5i JLlw== 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 :dkim-signature:delivered-to:sender:list-help:list-post:list-archive :list-subscribe:list-unsubscribe:list-id:precedence:mailing-list :dkim-signature:domainkey-signature; bh=brTjysCM0LlhLVFfq5Xi1oKif9pQZlMBMI1/60wmvGg=; b=eO43yZvJoUec9P9ugP384Ni8366TdQSGZAoifpsVen2mWMAS3El2Gg5mt/lgUghzOa ixbbSYKIBeh+XPSc51hU42+3HksWIQvCx7S3m9lqWOFx0uqyK1Z8oh0+HKsxSgs6rPDp dk+bgXQKDP7LcBl/EhKP0O2UPC0pULYoJmf7j4jX93U8KP/4KjiA/9lP2RAydHezeKLt bstfDCg6j/aIjN7oxupvEmVMwqSnlRpYKfuipUjGflMpM78qurZFhJuHFREaVtRJG5oQ zFGIt06l9JTaGpaH1COe/n5Zti/HbkPM6mbX9pDVcqJI2js3yJ0vuyl/hSQoXx8Eyn8Y 15gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=AIuYoQuV; dkim=pass header.i=@linaro.org header.s=google header.b=OjTf6SM5; spf=pass (google.com: domain of libc-alpha-return-106709-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-106709-patch=linaro.org@sourceware.org"; dmarc=pass (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 x6si13561419ejb.400.2019.11.06.09.50.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Nov 2019 09:50:24 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-106709-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=AIuYoQuV; dkim=pass header.i=@linaro.org header.s=google header.b=OjTf6SM5; spf=pass (google.com: domain of libc-alpha-return-106709-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-106709-patch=linaro.org@sourceware.org"; dmarc=pass (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=UT9Bfs7yqe1j/aM+kbfGDrTuCtgnitx ArrhH6ls1xg+FU3m4JvZ7YckJsunlXOG5pvptwgQxmcUCRLGAAhUtQ0i1f+VV53z W3h2J68Ci9RO94SwQ7umAnayVX3k82Kh85ho4B8iOJTC+8Dn21jT/W2wIxuLADBB hUloVyNzsAT0= 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=SbBALLmWaHzZwA4U7pFOp2Lzmyo=; b=AIuYo QuV+hFxDz3jcTKRiU0wrjrzglrh73oprt6vBSqzMfA7r/FvHwQzvSicegGENjJpc RHPDnMV7V55SaC749vtQiQkraumVX34gllZmii+CNXLIw61iMKdq5MTjvcYYdYV8 mU+D0NhIkvXwM4aeG4WN8r8PoQZy4HXswpaiyM= Received: (qmail 52782 invoked by alias); 6 Nov 2019 17:50:11 -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 52766 invoked by uid 89); 6 Nov 2019 17:50:11 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-qt1-f195.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=brTjysCM0LlhLVFfq5Xi1oKif9pQZlMBMI1/60wmvGg=; b=OjTf6SM53LJXnsjAYJLv4UQ8ETU/dRDBbKe5stLjzUBK8RDiJU4wua31jP414RhGBq HRKC5okvxxsi4dazFtwHf4r7mSyc5TprdAmNvbSOOVrle/MJVmOqDQtQAnkK74MAAi4r m2VejH9gduVJ1NaRcFnX0WOGO/o8yinIXgrXMen42OykyhZcbBquUGLW8jk6ootWggKR lCWVxK7xdZnGrLTFyeyGZHZW2BEHvX+6XMHIIXVri/rRCfs/TjXUAGwindGDIjApfLjV kWiGPHmRUw/7r+Eqk64vipI4cx9sAxqJ0ttArX7XFPFJXtJWW2GA83Ipef6vzHQFP1Wi bYvg== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 2/7] nptl: Remove rwlock elision definitions Date: Wed, 6 Nov 2019 14:49:56 -0300 Message-Id: <20191106175001.12182-2-adhemerval.zanella@linaro.org> In-Reply-To: <20191106175001.12182-1-adhemerval.zanella@linaro.org> References: <20191106175001.12182-1-adhemerval.zanella@linaro.org> The new rwlock implementation added by cc25c8b4c1196 (2.25) removed support for lock-elision. This patch removes remaining the arch-specific unused definitions. Checked with a build against all affected ABIs. --- sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h | 2 -- sysdeps/alpha/nptl/bits/pthreadtypes-arch.h | 2 -- sysdeps/arm/nptl/bits/pthreadtypes-arch.h | 2 -- sysdeps/csky/nptl/bits/pthreadtypes-arch.h | 2 -- sysdeps/hppa/nptl/bits/pthreadtypes-arch.h | 2 -- sysdeps/ia64/nptl/bits/pthreadtypes-arch.h | 2 -- sysdeps/m68k/nptl/bits/pthreadtypes-arch.h | 2 -- sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h | 2 -- sysdeps/mips/nptl/bits/pthreadtypes-arch.h | 2 -- sysdeps/nios2/nptl/bits/pthreadtypes-arch.h | 2 -- sysdeps/nptl/pthread.h | 6 +++--- sysdeps/powerpc/nptl/bits/pthreadtypes-arch.h | 7 ++----- sysdeps/riscv/nptl/bits/pthreadtypes-arch.h | 2 -- sysdeps/s390/nptl/bits/pthreadtypes-arch.h | 2 -- sysdeps/sh/nptl/bits/pthreadtypes-arch.h | 2 -- sysdeps/sparc/nptl/bits/pthreadtypes-arch.h | 2 -- sysdeps/x86/nptl/bits/pthreadtypes-arch.h | 12 ++---------- 17 files changed, 7 insertions(+), 46 deletions(-) -- 2.17.1 diff --git a/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h b/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h index 758b127a1a..61c02e7bbc 100644 --- a/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h @@ -66,6 +66,4 @@ struct __pthread_rwlock_arch_t unsigned int __flags; }; -#define __PTHREAD_RWLOCK_ELISION_EXTRA 0 - #endif /* bits/pthreadtypes.h */ diff --git a/sysdeps/alpha/nptl/bits/pthreadtypes-arch.h b/sysdeps/alpha/nptl/bits/pthreadtypes-arch.h index c5e252fc9d..f5b7d1940e 100644 --- a/sysdeps/alpha/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/alpha/nptl/bits/pthreadtypes-arch.h @@ -56,6 +56,4 @@ struct __pthread_rwlock_arch_t unsigned int __flags; }; -#define __PTHREAD_RWLOCK_ELISION_EXTRA 0 - #endif /* bits/pthreadtypes.h */ diff --git a/sysdeps/arm/nptl/bits/pthreadtypes-arch.h b/sysdeps/arm/nptl/bits/pthreadtypes-arch.h index 78b37eb5b8..a2c550f62a 100644 --- a/sysdeps/arm/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/arm/nptl/bits/pthreadtypes-arch.h @@ -66,6 +66,4 @@ struct __pthread_rwlock_arch_t int __cur_writer; }; -#define __PTHREAD_RWLOCK_ELISION_EXTRA 0 - #endif /* bits/pthreadtypes.h */ diff --git a/sysdeps/csky/nptl/bits/pthreadtypes-arch.h b/sysdeps/csky/nptl/bits/pthreadtypes-arch.h index 58be51dcfd..c1656ae2f6 100644 --- a/sysdeps/csky/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/csky/nptl/bits/pthreadtypes-arch.h @@ -65,6 +65,4 @@ struct __pthread_rwlock_arch_t int __cur_writer; }; -#define __PTHREAD_RWLOCK_ELISION_EXTRA 0 - #endif diff --git a/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h b/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h index 13b8223cfa..7c97b89d60 100644 --- a/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h @@ -86,6 +86,4 @@ struct __pthread_rwlock_arch_t int __reserved4; }; -#define __PTHREAD_RWLOCK_ELISION_EXTRA 0 - #endif /* bits/pthreadtypes.h */ diff --git a/sysdeps/ia64/nptl/bits/pthreadtypes-arch.h b/sysdeps/ia64/nptl/bits/pthreadtypes-arch.h index e0c1374546..8eb1bd5ebe 100644 --- a/sysdeps/ia64/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/ia64/nptl/bits/pthreadtypes-arch.h @@ -58,6 +58,4 @@ struct __pthread_rwlock_arch_t unsigned int __flags; }; -#define __PTHREAD_RWLOCK_ELISION_EXTRA 0 - #endif /* bits/pthreadtypes.h */ diff --git a/sysdeps/m68k/nptl/bits/pthreadtypes-arch.h b/sysdeps/m68k/nptl/bits/pthreadtypes-arch.h index 792cb32289..cefce56593 100644 --- a/sysdeps/m68k/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/m68k/nptl/bits/pthreadtypes-arch.h @@ -58,6 +58,4 @@ struct __pthread_rwlock_arch_t int __cur_writer; }; -#define __PTHREAD_RWLOCK_ELISION_EXTRA 0 - #endif /* bits/pthreadtypes.h */ diff --git a/sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h b/sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h index 7cf1ff6a72..00b50df227 100644 --- a/sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h @@ -67,6 +67,4 @@ struct __pthread_rwlock_arch_t int __cur_writer; }; -# define __PTHREAD_RWLOCK_ELISION_EXTRA 0 - #endif /* bits/pthreadtypes.h. */ diff --git a/sysdeps/mips/nptl/bits/pthreadtypes-arch.h b/sysdeps/mips/nptl/bits/pthreadtypes-arch.h index 0bb703511c..629cd72048 100644 --- a/sysdeps/mips/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/mips/nptl/bits/pthreadtypes-arch.h @@ -84,6 +84,4 @@ struct __pthread_rwlock_arch_t #endif }; -#define __PTHREAD_RWLOCK_ELISION_EXTRA 0 - #endif /* bits/pthreadtypes.h */ diff --git a/sysdeps/nios2/nptl/bits/pthreadtypes-arch.h b/sysdeps/nios2/nptl/bits/pthreadtypes-arch.h index dcd3499a86..bba904bcc4 100644 --- a/sysdeps/nios2/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/nios2/nptl/bits/pthreadtypes-arch.h @@ -67,6 +67,4 @@ struct __pthread_rwlock_arch_t int __cur_writer; }; -#define __PTHREAD_RWLOCK_ELISION_EXTRA 0 - #endif /* bits/pthreadtypes.h */ diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h index a4ff323b76..f2b21accbc 100644 --- a/sysdeps/nptl/pthread.h +++ b/sysdeps/nptl/pthread.h @@ -131,17 +131,17 @@ enum /* Read-write lock initializers. */ # define PTHREAD_RWLOCK_INITIALIZER \ - { { 0, 0, 0, 0, 0, 0, 0, 0, __PTHREAD_RWLOCK_ELISION_EXTRA, 0, 0 } } + { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } # ifdef __USE_GNU # ifdef __PTHREAD_RWLOCK_INT_FLAGS_SHARED # define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \ - { { 0, 0, 0, 0, 0, 0, 0, 0, __PTHREAD_RWLOCK_ELISION_EXTRA, 0, \ + { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \ PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP } } # else # if __BYTE_ORDER == __LITTLE_ENDIAN # define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \ { { 0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP, \ - 0, __PTHREAD_RWLOCK_ELISION_EXTRA, 0, 0 } } + 0, 0, 0, 0 } } # else # define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP,\ diff --git a/sysdeps/powerpc/nptl/bits/pthreadtypes-arch.h b/sysdeps/powerpc/nptl/bits/pthreadtypes-arch.h index 4ad33d8850..9810aab057 100644 --- a/sysdeps/powerpc/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/powerpc/nptl/bits/pthreadtypes-arch.h @@ -59,22 +59,19 @@ struct __pthread_rwlock_arch_t #if __WORDSIZE == 64 int __cur_writer; int __shared; - unsigned char __rwelision; - unsigned char __pad1[7]; + unsigned long int __pad1; unsigned long int __pad2; /* FLAGS must stay at this position in the structure to maintain binary compatibility. */ unsigned int __flags; -# define __PTHREAD_RWLOCK_ELISION_EXTRA 0, {0, 0, 0, 0, 0, 0, 0 } #else - unsigned char __rwelision; + unsigned char __pad1; unsigned char __pad2; unsigned char __shared; /* FLAGS must stay at this position in the structure to maintain binary compatibility. */ unsigned char __flags; int __cur_writer; -# define __PTHREAD_RWLOCK_ELISION_EXTRA 0 #endif }; diff --git a/sysdeps/riscv/nptl/bits/pthreadtypes-arch.h b/sysdeps/riscv/nptl/bits/pthreadtypes-arch.h index 33f0ee43fe..77b60bf8f7 100644 --- a/sysdeps/riscv/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/riscv/nptl/bits/pthreadtypes-arch.h @@ -63,6 +63,4 @@ struct __pthread_rwlock_arch_t unsigned int __flags; }; -#define __PTHREAD_RWLOCK_ELISION_EXTRA 0 - #endif /* bits/pthreadtypes.h */ diff --git a/sysdeps/s390/nptl/bits/pthreadtypes-arch.h b/sysdeps/s390/nptl/bits/pthreadtypes-arch.h index 28754b7aa6..1cb1d7216a 100644 --- a/sysdeps/s390/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/s390/nptl/bits/pthreadtypes-arch.h @@ -74,6 +74,4 @@ struct __pthread_rwlock_arch_t #endif }; -#define __PTHREAD_RWLOCK_ELISION_EXTRA 0 - #endif /* bits/pthreadtypes.h */ diff --git a/sysdeps/sh/nptl/bits/pthreadtypes-arch.h b/sysdeps/sh/nptl/bits/pthreadtypes-arch.h index 219a861398..e7bbfe1861 100644 --- a/sysdeps/sh/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/sh/nptl/bits/pthreadtypes-arch.h @@ -66,6 +66,4 @@ struct __pthread_rwlock_arch_t unsigned long int __cur_writer; }; -#define __PTHREAD_RWLOCK_ELISION_EXTRA 0 - #endif /* bits/pthreadtypes.h */ diff --git a/sysdeps/sparc/nptl/bits/pthreadtypes-arch.h b/sysdeps/sparc/nptl/bits/pthreadtypes-arch.h index c5c0563c58..47093a57a2 100644 --- a/sysdeps/sparc/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/sparc/nptl/bits/pthreadtypes-arch.h @@ -76,6 +76,4 @@ struct __pthread_rwlock_arch_t #endif }; -#define __PTHREAD_RWLOCK_ELISION_EXTRA 0 - #endif /* bits/pthreadtypes.h */ diff --git a/sysdeps/x86/nptl/bits/pthreadtypes-arch.h b/sysdeps/x86/nptl/bits/pthreadtypes-arch.h index 97361b0a80..1f05ca088c 100644 --- a/sysdeps/x86/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/x86/nptl/bits/pthreadtypes-arch.h @@ -73,14 +73,7 @@ struct __pthread_rwlock_arch_t #ifdef __x86_64__ int __cur_writer; int __shared; - signed char __rwelision; -# ifdef __ILP32__ - unsigned char __pad1[3]; -# define __PTHREAD_RWLOCK_ELISION_EXTRA 0, { 0, 0, 0 } -# else - unsigned char __pad1[7]; -# define __PTHREAD_RWLOCK_ELISION_EXTRA 0, { 0, 0, 0, 0, 0, 0, 0 } -# endif + unsigned long int __pad1; unsigned long int __pad2; /* FLAGS must stay at this position in the structure to maintain binary compatibility. */ @@ -91,8 +84,7 @@ struct __pthread_rwlock_arch_t binary compatibility. */ unsigned char __flags; unsigned char __shared; - signed char __rwelision; -# define __PTHREAD_RWLOCK_ELISION_EXTRA 0 + unsigned char __pad1; unsigned char __pad2; int __cur_writer; #endif