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 Netto X-Patchwork-Id: 1215557 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-108316-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="KwckT2tc"; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="xM27g+PU"; dkim-atps=neutral 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 47kLYZ1pmGz9sPK for ; Fri, 27 Dec 2019 07:05:53 +1100 (AEDT) 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=oenHillyI5zsH6QJJH6LPO3lLi3OZWd8dqG61+Qx3jL+8hDKnMQVp wu+MVXnAwnlHZWtOjU5pu87VaR5WR0KAWlmOaU79Ew9G8+B65exuNUB8o/GkV8yt K1r7stGsvyNLFh4mv0cX4OZfT1kdG7IjKDVU78kHkG1DZGEW1dELkA= 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=KwckT2tcLH5zc5FGwG3dcPCFa9Wy 29zwDk2SHuKd9ggWJVFjhMkvBJpcbWgLLZzz1kbUeHu0Fk6T0yXkj9pB0vImzzV4 pO/y11gza4G/hkEjIYuN6dlghQsj5PUXW+9RZP6XBLBkT1F1EfniBAQqy7FRoQvW 4S9WmvKQn8KCme4= 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== 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(-) 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