From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 74598 invoked by alias); 31 Dec 2019 10:48:36 -0000 Mailing-List: contact glibc-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: glibc-cvs-owner@sourceware.org List-Subscribe: Received: (qmail 74579 invoked by uid 9299); 31 Dec 2019 10:48:36 -0000 Date: Tue, 31 Dec 2019 10:48:00 -0000 Message-ID: <20191231104836.74578.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc/fw/builtin-syscalls-4] nptl: Remove duplicate internal __SIZEOF_PTHREAD_MUTEX_T (BZ#25241) X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/fw/builtin-syscalls-4 X-Git-Oldrev: b8c210bcc74840d24c61d39bde15bea9daf3e271 X-Git-Newrev: 11519fd0c908df2dad50f36a48eb4d0d12ea83a8 X-SW-Source: 2019-q4/txt/msg00696.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=11519fd0c908df2dad50f36a48eb4d0d12ea83a8 commit 11519fd0c908df2dad50f36a48eb4d0d12ea83a8 Author: Adhemerval Zanella Date: Thu Dec 26 17:03:13 2019 -0300 nptl: Remove duplicate internal __SIZEOF_PTHREAD_MUTEX_T (BZ#25241) Checked on x86_64-linux-gnu, i686-linux-gnu, and x86_64-linux-gnu-x32. Diff: --- 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 426a207..7f8a417 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