From patchwork Wed Feb 5 17:54:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 37700 Received: (qmail 91063 invoked by alias); 5 Feb 2020 17:54:23 -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 91055 invoked by uid 89); 5 Feb 2020 17:54:22 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mx2.suse.de From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] nptl: update default pthread-offsets.h X-Yow: If this was a SWEDISH MOVIE, I'd take off your GO-GO BOOTS!! Date: Wed, 05 Feb 2020 18:54:19 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Remove unused definitions, and correct __PTHREAD_RWLOCK_FLAGS_OFFSET for __WORDSIZE == 64. Reviewed-by: Adhemerval Zanella --- sysdeps/nptl/pthread-offsets.h | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/sysdeps/nptl/pthread-offsets.h b/sysdeps/nptl/pthread-offsets.h index a399608aa1..3d9c51783d 100644 --- a/sysdeps/nptl/pthread-offsets.h +++ b/sysdeps/nptl/pthread-offsets.h @@ -1,26 +1,16 @@ #include /* These values are based on internal generic types from - mutex-internal.h and rwlock-internal.h. */ + bits/struct_mutex.h and bits/struct_rwlock.h. */ #if __WORDSIZE == 64 -# define __PTHREAD_MUTEX_NUSERS_OFFSET 12 -# define __PTHREAD_MUTEX_KIND_OFFSET 16 -# define __PTHREAD_MUTEX_SPINS_OFFSET 20 -# define __PTHREAD_MUTEX_LIST_OFFSET 24 +# define __PTHREAD_MUTEX_KIND_OFFSET 16 #else -# define __PTHREAD_MUTEX_NUSERS_OFFSET 16 -# define __PTHREAD_MUTEX_KIND_OFFSET 12 -# define __PTHREAD_MUTEX_SPINS_OFFSET 20 -# define __PTHREAD_MUTEX_LIST_OFFSET 20 +# define __PTHREAD_MUTEX_KIND_OFFSET 12 #endif -#if __WORDSIZE == 64 -# define __PTHREAD_RWLOCK_FLAGS_OFFSET 48 +#if __BYTE_ORDER == __BIG_ENDIAN +# define __PTHREAD_RWLOCK_FLAGS_OFFSET 27 #else -# if __BYTE_ORDER == __BIG_ENDIAN -# define __PTHREAD_RWLOCK_FLAGS_OFFSET 27 -# else -# define __PTHREAD_RWLOCK_FLAGS_OFFSET 24 -# endif +# define __PTHREAD_RWLOCK_FLAGS_OFFSET 24 #endif