From patchwork Thu Dec 26 20:05:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 182458 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp2122432ild; Thu, 26 Dec 2019 12:05:55 -0800 (PST) X-Google-Smtp-Source: APXvYqx77Zvziozrr3Es0Hn+ZavMw0x4lqjSJqzJQTMByVjkc0AMetgGkr/xnImvg51c+YKECsdo X-Received: by 2002:a9d:630d:: with SMTP id q13mr49450041otk.31.1577390755284; Thu, 26 Dec 2019 12:05:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577390755; cv=none; d=google.com; s=arc-20160816; b=KOiHrNzPmS8Cv5VFf0I74MfPelWmG7LWjURacjElsfEu15Fm5i60LWhPQxryvfIOS6 ZLjkFS+bI3RrnLhSpGEBPnfIDZULjublfw8h049W4xkMjyfcVX1XQ2grz9M3zE5+OcS0 W7ocs/VcOsPwXBuH0gSiQxOziJgyJgP7cgd0a+YEVSBb1XG0B310rcnhicoAKL+ozs1Y JorFDRCrn8n8oj3vhC5cuGbAI/VH3eNjmqR8z+2rAEU2GNrS2gigqyq/WpPowrjVImwI Tlrpw83T/MWB6x9G+EYbk/TAWibHHyhvNwuBfOSF9pNDs3NIUm97thnxRnySmfpTPbcX dSaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=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=XjwPdXk9tuXEeDOPd0yj0nmtTHhZeGD6UIXnZobEoQQ=; b=Ea1cr63/bdnetY3WtnVNWR2iJAWUVhD59WJImx6prVS/19IrP5yYGQisy5vAnev8F3 UezL+Pd8O7TnoSSPQi6ZrmeSfsZEQAeCjkKkAiv5i/oNjQNqtUoxJ0U1NyoyrfX1rYV7 by0oF3CIvkbDs5pHWI769LFVn6963OOkcMNjnkJJr67ATY3BLe1s/nglrbVcSoMISkan mgnCaf2FZLf76y0S09WUfGJQmSxWfKIxQ5Q6RWwM+8nNOn/I5Twwf0sRQ4b00Yw2sCJo KYUSYwELNeILK8iERmRtBIlpTdbVEMLEwu0qo/nu1qSbt/nN0rynX6NOY3O820cLjrlQ ZfIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=ZF3GlRyF; dkim=pass header.i=@linaro.org header.s=google header.b=xM27g+PU; spf=pass (google.com: domain of libc-alpha-return-108316-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-108316-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 k2si16477274otb.272.2019.12.26.12.05.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Dec 2019 12:05:55 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-108316-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=ZF3GlRyF; dkim=pass header.i=@linaro.org header.s=google header.b=xM27g+PU; spf=pass (google.com: domain of libc-alpha-return-108316-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-108316-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; q=dns; s= default; b=yHbOthHwZsziBKc5h5eX+zefj+X9csNHbHcZbdNvwp0p30oLgQE/C P75oP7QtU0nahiRTJop2N1nd+zeKe39IGO4c/9sfb9tze2ho2fGJFnLjaytmc070 B0BrB8nYN6gVN0kiKHjVtgsxbmtg4/4kw28SYA87ZA3SOCDYpMS20g= 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=4Gz7dFo39zdI/BFLcON7xRxM1bM=; b=ZF3GlRyFGwEWFLisBDlCFQjwbSpg Y5yFMSMrhkuKz7nID5VUKDTir7e3I812wGS/eR1yOtYQ0ntY3UmUV34cZmrORFlo KMZJi6wiYCI/ssxKVfhvMI/MqMGinQxR0Y7OSWFflfGGKZjz2a9rmXF0Ld13VajF blk5WyvWiagrrgE= Received: (qmail 61894 invoked by alias); 26 Dec 2019 20:05:46 -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 61885 invoked by uid 89); 26 Dec 2019 20:05:46 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.9 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-pf1-f175.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id; bh=XjwPdXk9tuXEeDOPd0yj0nmtTHhZeGD6UIXnZobEoQQ=; b=xM27g+PUYjqE/gsgl2Qmhj6t9NSm3o6V4WEvDcle2jiZma/jFAWBLkgIoUWik0Xjs6 c0zJf3pTkw5hqhop4uO4bOM4lWWMJz3ovT4u5DYcMJnZOOcHCb1vURjqvAm5V4ysNynu 6UhVZfmH50zW5HuV4T+Y84081I1oA97r/UQ0f89ayFSRJpOnkpQU41laE8HZ+3gJFeq5 qTrQhv4ISf4nwa3RiI8Av+bWK2OzndZlk68hkWlkvQDHdkgMFph1UXU8rn8kZ5sX5ivl cqjHMPopc+zcEqaLEfAytEXtxzfvubM0MqQopX42rOlfD+uSOOiZPzBGHo6K+LRvh+nv Yn2A== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [COMMITTED] nptl: Remove duplicate internal __SIZEOF_PTHREAD_MUTEX_T (BZ#25241) Date: Thu, 26 Dec 2019 17:05:37 -0300 Message-Id: <20191226200537.24723-1-adhemerval.zanella@linaro.org> Checked on x86_64-linux-gnu, i686-linux-gnu, and x86_64-linux-gnu-x32. --- sysdeps/x86/nptl/bits/pthreadtypes-arch.h | 3 --- 1 file changed, 3 deletions(-) -- 2.17.1 diff --git a/sysdeps/x86/nptl/bits/pthreadtypes-arch.h b/sysdeps/x86/nptl/bits/pthreadtypes-arch.h index 426a20751d..7f8a41716c 100644 --- a/sysdeps/x86/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/x86/nptl/bits/pthreadtypes-arch.h @@ -24,20 +24,17 @@ # if __WORDSIZE == 64 # define __SIZEOF_PTHREAD_MUTEX_T 40 # define __SIZEOF_PTHREAD_ATTR_T 56 -# define __SIZEOF_PTHREAD_MUTEX_T 40 # define __SIZEOF_PTHREAD_RWLOCK_T 56 # define __SIZEOF_PTHREAD_BARRIER_T 32 # else # define __SIZEOF_PTHREAD_MUTEX_T 32 # define __SIZEOF_PTHREAD_ATTR_T 32 -# define __SIZEOF_PTHREAD_MUTEX_T 32 # define __SIZEOF_PTHREAD_RWLOCK_T 44 # define __SIZEOF_PTHREAD_BARRIER_T 20 # endif #else # define __SIZEOF_PTHREAD_MUTEX_T 24 # define __SIZEOF_PTHREAD_ATTR_T 36 -# define __SIZEOF_PTHREAD_MUTEX_T 24 # define __SIZEOF_PTHREAD_RWLOCK_T 32 # define __SIZEOF_PTHREAD_BARRIER_T 20 #endif