From patchwork Wed Nov 6 17:50:00 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: 178749 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp947886ilf; Wed, 6 Nov 2019 09:50:59 -0800 (PST) X-Google-Smtp-Source: APXvYqzU/kCFD/Lje3VBdK6+9QTT8tVmZ8IArcXfazBmM9cqGOKupRhS3k5IAFQjX1smE2JNSJxX X-Received: by 2002:a50:9555:: with SMTP id v21mr4220531eda.90.1573062659478; Wed, 06 Nov 2019 09:50:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573062659; cv=none; d=google.com; s=arc-20160816; b=0c07Cb6ChuJ/M9kfSiIxmgXECmWScaFxpyN9S8R6niZSZSq4zFQpuhcsyzIUoH3MAW Xx0XiY1YRQwi9T3P+wOAO4ARCHaJVvCFxbDzLaXl+kkYxqbmY53kn8vU9w3sVmuEn2DE I07pTkXh26mkTOQH8Lqatc8XUOgxF71tT4GSQHLeCvUJH8xXE9ui336kQxQ25qhhrNRn iHk6cm5q8GRhNYfDSMOkfVAdmfjFisaBzGbA9wiyhmq3mgz/yaiWkA9KUmzcfnY0Tvm1 OsJNLyDTEdW+aq3MVvPsQqyTvDHdwlITWeJDH0/SmztKtjP5LOgua4qVfr3X1PehifiB Juzg== 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=RfMttWPhaoTx19rl5Cje9pZUkl9PX3DbsM4ccHtTqZo=; b=Kox8516bh5iL8j4LbWDd6Q+iNf+hqyUpjWADkyX+lev3XONQwSeFxkxDpg5Ws9c8aa 6W6utAP3W2nOp4CgWmor8ZnbLHpCjo+p0GjQS8jUkX59cLie0y04c/sx2pp0hnBuQimY PQRoUDXovII8ZPAyxxN+2dIaiS78Z1bC3MxFkeI2FNXv7JUyu8mbhbDm5lLtbUckBAhv tayA2ZH57d5KS1pRjv2ECC5tvCBDQvNNQhLw+djkZf+svZbuy4RrOPSYtUlQ3dacu8Nm kakMi4Fbvw28gINUVPJ9HyTRmtjmyrvWZ1i+K0l5Cs8dNXHgF+f5G/CRT3D4ppwY+DIh s6bA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=HU79WVDZ; dkim=pass header.i=@linaro.org header.s=google header.b=zNNTnCPc; spf=pass (google.com: domain of libc-alpha-return-106712-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-106712-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 j52si15009215eda.438.2019.11.06.09.50.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Nov 2019 09:50:59 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-106712-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=HU79WVDZ; dkim=pass header.i=@linaro.org header.s=google header.b=zNNTnCPc; spf=pass (google.com: domain of libc-alpha-return-106712-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-106712-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=jEnQWnH9qGGLMoqrZuQc7bsn6AuyzHB bmtBColYzYPS3q2hcQl7O3dfAgvUhwp+0qL0X4nAbJPDvzjBmWJa0ZWCwrv+LyLf o928YDFE8xPptCxFQSA+D6ksjdiWL18YHxtPHbVZpk8f9hMAsIBupgnkng9MiiPt mxqXXyym7ALY= 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=MmHHzj4U+I7InjmkW0R3QxqTUnI=; b=HU79W VDZsUo4lfnbVd7X4dv+nxN3SPXcWAczgTduf83HxKmTQKAJpZ/ei4AFkI51YVe3/ QYN77nzcc5aV8k5hIb9qRFKL9EO/xFDd9Zrj2aRCapOlIZDSiI5D9/uidzJmKwwa hP/mz+JGKm4WtmqIgv3CRn7PgHrAXNPZfCfcLI= Received: (qmail 53689 invoked by alias); 6 Nov 2019 17:50:19 -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 53585 invoked by uid 89); 6 Nov 2019 17:50:19 -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, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-qt1-f196.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=RfMttWPhaoTx19rl5Cje9pZUkl9PX3DbsM4ccHtTqZo=; b=zNNTnCPcnuaqjnHJ9BbnjpbSxhB58JT9oLMch00AvK8aKRj2Q6267kpJwKlQPQ+6Vj +kWyl+WzVzgXMTqG406ePM/bFUyVPtgOw1hGY+c/QoYfzj2NHKzEu2P/cX5a4zRYY4vC O9to0VFWmXpwoCHNvQibUYXSuzPHO7WiWrfMiri1xkiehvh/ZWc/B/jbdQZTzQU8gBaa hT5c+avcoBxow+T5IPSZOfHZOjSqzdveTY18md+RHMDUs+J1K5LM7AjkDfNP5+BkIL7G GO4szM360QbUNWzV41cwVSmOEximZHGbsIoAZfYngLVFxt9bdQU2sOEISi3mXeSTN1zp t14w== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 6/7] nptl: Add default pthread-offsets.h Date: Wed, 6 Nov 2019 14:50:00 -0300 Message-Id: <20191106175001.12182-6-adhemerval.zanella@linaro.org> In-Reply-To: <20191106175001.12182-1-adhemerval.zanella@linaro.org> References: <20191106175001.12182-1-adhemerval.zanella@linaro.org> This patch adds a default pthread-offsets.h based on default thread definitions from mutex-internal.h and rwlock-internal.h. The idea is to simpify new ports inclusion. Checked with a build on affected abis. --- sysdeps/aarch64/nptl/pthread-offsets.h | 13 -------- sysdeps/alpha/nptl/pthread-offsets.h | 13 -------- sysdeps/arm/nptl/pthread-offsets.h | 18 ----------- sysdeps/csky/nptl/pthread-offsets.h | 13 -------- sysdeps/ia64/nptl/pthread-offsets.h | 13 -------- sysdeps/m68k/nptl/pthread-offsets.h | 13 -------- sysdeps/microblaze/nptl/pthread-offsets.h | 18 ----------- sysdeps/nios2/nptl/pthread-offsets.h | 13 -------- sysdeps/nptl/pthread-offsets.h | 39 +++++++++++++++++++++++ sysdeps/riscv/nptl/pthread-offsets.h | 32 ------------------- sysdeps/sh/nptl/pthread-offsets.h | 18 ----------- sysdeps/sparc/nptl/pthread-offsets.h | 33 ------------------- 12 files changed, 39 insertions(+), 197 deletions(-) delete mode 100644 sysdeps/aarch64/nptl/pthread-offsets.h delete mode 100644 sysdeps/alpha/nptl/pthread-offsets.h delete mode 100644 sysdeps/arm/nptl/pthread-offsets.h delete mode 100644 sysdeps/csky/nptl/pthread-offsets.h delete mode 100644 sysdeps/ia64/nptl/pthread-offsets.h delete mode 100644 sysdeps/m68k/nptl/pthread-offsets.h delete mode 100644 sysdeps/microblaze/nptl/pthread-offsets.h delete mode 100644 sysdeps/nios2/nptl/pthread-offsets.h create mode 100644 sysdeps/nptl/pthread-offsets.h delete mode 100644 sysdeps/riscv/nptl/pthread-offsets.h delete mode 100644 sysdeps/sh/nptl/pthread-offsets.h delete mode 100644 sysdeps/sparc/nptl/pthread-offsets.h -- 2.17.1 diff --git a/sysdeps/aarch64/nptl/pthread-offsets.h b/sysdeps/aarch64/nptl/pthread-offsets.h deleted file mode 100644 index 679cec5de7..0000000000 --- a/sysdeps/aarch64/nptl/pthread-offsets.h +++ /dev/null @@ -1,13 +0,0 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 12 -#define __PTHREAD_MUTEX_KIND_OFFSET 16 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 24 - -#define __PTHREAD_RWLOCK_READERS_OFFSET 0 -#define __PTHREAD_RWLOCK_WRITERS_OFFSET 4 -#define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8 -#define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12 -#define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 24 -#define __PTHREAD_RWLOCK_SHARED_OFFSET 28 -#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48 diff --git a/sysdeps/alpha/nptl/pthread-offsets.h b/sysdeps/alpha/nptl/pthread-offsets.h deleted file mode 100644 index 679cec5de7..0000000000 --- a/sysdeps/alpha/nptl/pthread-offsets.h +++ /dev/null @@ -1,13 +0,0 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 12 -#define __PTHREAD_MUTEX_KIND_OFFSET 16 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 24 - -#define __PTHREAD_RWLOCK_READERS_OFFSET 0 -#define __PTHREAD_RWLOCK_WRITERS_OFFSET 4 -#define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8 -#define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12 -#define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 24 -#define __PTHREAD_RWLOCK_SHARED_OFFSET 28 -#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48 diff --git a/sysdeps/arm/nptl/pthread-offsets.h b/sysdeps/arm/nptl/pthread-offsets.h deleted file mode 100644 index cc2a939222..0000000000 --- a/sysdeps/arm/nptl/pthread-offsets.h +++ /dev/null @@ -1,18 +0,0 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 16 -#define __PTHREAD_MUTEX_KIND_OFFSET 12 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 20 - -#define __PTHREAD_RWLOCK_READERS_OFFSET 0 -#define __PTHREAD_RWLOCK_WRITERS_OFFSET 4 -#define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8 -#define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12 -#define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 28 -#if __BYTE_ORDER == __BIG_ENDIAN -# define __PTHREAD_RWLOCK_SHARED_OFFSET 26 -# define __PTHREAD_RWLOCK_FLAGS_OFFSET 27 -#else -# define __PTHREAD_RWLOCK_SHARED_OFFSET 25 -# define __PTHREAD_RWLOCK_FLAGS_OFFSET 24 -#endif diff --git a/sysdeps/csky/nptl/pthread-offsets.h b/sysdeps/csky/nptl/pthread-offsets.h deleted file mode 100644 index a0eea7a6d3..0000000000 --- a/sysdeps/csky/nptl/pthread-offsets.h +++ /dev/null @@ -1,13 +0,0 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 16 -#define __PTHREAD_MUTEX_KIND_OFFSET 12 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 20 - -#define __PTHREAD_RWLOCK_READERS_OFFSET 0 -#define __PTHREAD_RWLOCK_WRITERS_OFFSET 4 -#define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8 -#define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12 -#define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 28 -#define __PTHREAD_RWLOCK_SHARED_OFFSET 25 -#define __PTHREAD_RWLOCK_FLAGS_OFFSET 24 diff --git a/sysdeps/ia64/nptl/pthread-offsets.h b/sysdeps/ia64/nptl/pthread-offsets.h deleted file mode 100644 index 679cec5de7..0000000000 --- a/sysdeps/ia64/nptl/pthread-offsets.h +++ /dev/null @@ -1,13 +0,0 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 12 -#define __PTHREAD_MUTEX_KIND_OFFSET 16 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 24 - -#define __PTHREAD_RWLOCK_READERS_OFFSET 0 -#define __PTHREAD_RWLOCK_WRITERS_OFFSET 4 -#define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8 -#define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12 -#define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 24 -#define __PTHREAD_RWLOCK_SHARED_OFFSET 28 -#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48 diff --git a/sysdeps/m68k/nptl/pthread-offsets.h b/sysdeps/m68k/nptl/pthread-offsets.h deleted file mode 100644 index 14d66ace9b..0000000000 --- a/sysdeps/m68k/nptl/pthread-offsets.h +++ /dev/null @@ -1,13 +0,0 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 16 -#define __PTHREAD_MUTEX_KIND_OFFSET 12 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 20 - -#define __PTHREAD_RWLOCK_READERS_OFFSET 0 -#define __PTHREAD_RWLOCK_WRITERS_OFFSET 4 -#define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8 -#define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12 -#define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 28 -#define __PTHREAD_RWLOCK_SHARED_OFFSET 26 -#define __PTHREAD_RWLOCK_FLAGS_OFFSET 27 diff --git a/sysdeps/microblaze/nptl/pthread-offsets.h b/sysdeps/microblaze/nptl/pthread-offsets.h deleted file mode 100644 index cc2a939222..0000000000 --- a/sysdeps/microblaze/nptl/pthread-offsets.h +++ /dev/null @@ -1,18 +0,0 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 16 -#define __PTHREAD_MUTEX_KIND_OFFSET 12 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 20 - -#define __PTHREAD_RWLOCK_READERS_OFFSET 0 -#define __PTHREAD_RWLOCK_WRITERS_OFFSET 4 -#define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8 -#define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12 -#define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 28 -#if __BYTE_ORDER == __BIG_ENDIAN -# define __PTHREAD_RWLOCK_SHARED_OFFSET 26 -# define __PTHREAD_RWLOCK_FLAGS_OFFSET 27 -#else -# define __PTHREAD_RWLOCK_SHARED_OFFSET 25 -# define __PTHREAD_RWLOCK_FLAGS_OFFSET 24 -#endif diff --git a/sysdeps/nios2/nptl/pthread-offsets.h b/sysdeps/nios2/nptl/pthread-offsets.h deleted file mode 100644 index a0eea7a6d3..0000000000 --- a/sysdeps/nios2/nptl/pthread-offsets.h +++ /dev/null @@ -1,13 +0,0 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 16 -#define __PTHREAD_MUTEX_KIND_OFFSET 12 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 20 - -#define __PTHREAD_RWLOCK_READERS_OFFSET 0 -#define __PTHREAD_RWLOCK_WRITERS_OFFSET 4 -#define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8 -#define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12 -#define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 28 -#define __PTHREAD_RWLOCK_SHARED_OFFSET 25 -#define __PTHREAD_RWLOCK_FLAGS_OFFSET 24 diff --git a/sysdeps/nptl/pthread-offsets.h b/sysdeps/nptl/pthread-offsets.h new file mode 100644 index 0000000000..eb87d51351 --- /dev/null +++ b/sysdeps/nptl/pthread-offsets.h @@ -0,0 +1,39 @@ +#include + +/* These values are based on internal generic types from + mutex-internal.h and rwlock-internal.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 +#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 +#endif + +#if __WORDSIZE == 64 +# define __PTHREAD_RWLOCK_READERS_OFFSET 0 +# define __PTHREAD_RWLOCK_WRITERS_OFFSET 4 +# define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8 +# define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12 +# define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 24 +# define __PTHREAD_RWLOCK_SHARED_OFFSET 28 +# define __PTHREAD_RWLOCK_FLAGS_OFFSET 48 +#else +# define __PTHREAD_RWLOCK_READERS_OFFSET 0 +# define __PTHREAD_RWLOCK_WRITERS_OFFSET 4 +# define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8 +# define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12 +# define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 28 +# if __BYTE_ORDER == __BIG_ENDIAN +# define __PTHREAD_RWLOCK_SHARED_OFFSET 26 +# define __PTHREAD_RWLOCK_FLAGS_OFFSET 27 +# else +# define __PTHREAD_RWLOCK_SHARED_OFFSET 25 +# define __PTHREAD_RWLOCK_FLAGS_OFFSET 24 +# endif +#endif diff --git a/sysdeps/riscv/nptl/pthread-offsets.h b/sysdeps/riscv/nptl/pthread-offsets.h deleted file mode 100644 index f93af00cfc..0000000000 --- a/sysdeps/riscv/nptl/pthread-offsets.h +++ /dev/null @@ -1,32 +0,0 @@ -/* RISC-V pthread offsets - Copyright (C) 2017-2019 Free Software Foundation, Inc. - - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see - . */ - -#define __PTHREAD_MUTEX_NUSERS_OFFSET 12 -#define __PTHREAD_MUTEX_KIND_OFFSET 16 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 24 - -#define __PTHREAD_RWLOCK_READERS_OFFSET 0 -#define __PTHREAD_RWLOCK_WRITERS_OFFSET 4 -#define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8 -#define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12 -#define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 24 -#define __PTHREAD_RWLOCK_SHARED_OFFSET 28 -#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48 diff --git a/sysdeps/sh/nptl/pthread-offsets.h b/sysdeps/sh/nptl/pthread-offsets.h deleted file mode 100644 index cc2a939222..0000000000 --- a/sysdeps/sh/nptl/pthread-offsets.h +++ /dev/null @@ -1,18 +0,0 @@ -#define __PTHREAD_MUTEX_NUSERS_OFFSET 16 -#define __PTHREAD_MUTEX_KIND_OFFSET 12 -#define __PTHREAD_MUTEX_SPINS_OFFSET 20 -#define __PTHREAD_MUTEX_ELISION_OFFSET 22 -#define __PTHREAD_MUTEX_LIST_OFFSET 20 - -#define __PTHREAD_RWLOCK_READERS_OFFSET 0 -#define __PTHREAD_RWLOCK_WRITERS_OFFSET 4 -#define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8 -#define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12 -#define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 28 -#if __BYTE_ORDER == __BIG_ENDIAN -# define __PTHREAD_RWLOCK_SHARED_OFFSET 26 -# define __PTHREAD_RWLOCK_FLAGS_OFFSET 27 -#else -# define __PTHREAD_RWLOCK_SHARED_OFFSET 25 -# define __PTHREAD_RWLOCK_FLAGS_OFFSET 24 -#endif diff --git a/sysdeps/sparc/nptl/pthread-offsets.h b/sysdeps/sparc/nptl/pthread-offsets.h deleted file mode 100644 index a9ce40d97f..0000000000 --- a/sysdeps/sparc/nptl/pthread-offsets.h +++ /dev/null @@ -1,33 +0,0 @@ -#include - -#if __WORDSIZE == 64 -# define __PTHREAD_MUTEX_NUSERS_OFFSET 12 -# define __PTHREAD_MUTEX_KIND_OFFSET 16 -# define __PTHREAD_MUTEX_SPINS_OFFSET 20 -# define __PTHREAD_MUTEX_ELISION_OFFSET 22 -# define __PTHREAD_MUTEX_LIST_OFFSET 24 -#else -# define __PTHREAD_MUTEX_NUSERS_OFFSET 16 -# define __PTHREAD_MUTEX_KIND_OFFSET 12 -# define __PTHREAD_MUTEX_SPINS_OFFSET 20 -# define __PTHREAD_MUTEX_ELISION_OFFSET 22 -# define __PTHREAD_MUTEX_LIST_OFFSET 20 -#endif - -#if __WORDSIZE == 64 -# define __PTHREAD_RWLOCK_READERS_OFFSET 0 -# define __PTHREAD_RWLOCK_WRITERS_OFFSET 4 -# define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8 -# define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12 -# define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 24 -# define __PTHREAD_RWLOCK_SHARED_OFFSET 28 -# define __PTHREAD_RWLOCK_FLAGS_OFFSET 48 -#else -# define __PTHREAD_RWLOCK_READERS_OFFSET 0 -# define __PTHREAD_RWLOCK_WRITERS_OFFSET 4 -# define __PTHREAD_RWLOCK_WRPHASE_FUTEX_OFFSET 8 -# define __PTHREAD_RWLOCK_WRITERS_FUTEX_OFFSET 12 -# define __PTHREAD_RWLOCK_CUR_WRITER_OFFSET 28 -# define __PTHREAD_RWLOCK_SHARED_OFFSET 26 -# define __PTHREAD_RWLOCK_FLAGS_OFFSET 27 -#endif