From patchwork Sun Jul 12 15:47:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 40053 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 268953851C36; Sun, 12 Jul 2020 15:57:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 268953851C36 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1594569439; bh=rdR3i1uvc+HTWMbFqvmfVqChEbOjI6alSKJbaF3Lg1Y=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=yEMN8CPRKuXRDUUAPKQlYEcXiTIRFuWY9Nn9Jz5TmyTMluJHpaRAKrjDA8L840/Ro FB2WSZwX7ZLQqzrLSw8ZjYL9zkoqEW6fC1sbbQ6xkRnPUGWiPhy1NS5xFaoZszuRTF rAhc1azAFo9CBeOfAh6MekwE+K0aaqFB2o1GLENM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa5.hgst.iphmx.com (esa5.hgst.iphmx.com [216.71.153.144]) by sourceware.org (Postfix) with ESMTPS id E85C83857027 for ; Sun, 12 Jul 2020 15:57:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E85C83857027 IronPort-SDR: aohTiy4PDc95qwSuyQXAb1gna4lkXhD1T8kqmn51zqozJtM+rvVhxKE3PjG0U5f5VujOh5Bwbu UWFPhKoQaCYNKGIBFLKiMctNer0tmWqyoZHDMdk1I/aL9GpFBpU5SCgJSCIluYyrWfdwAk37ip 7Q3WepS3uwqA3jufqWVI4x6m3mNm2TFyG9VhFtsCJOIKZgPJ5SfM6mO10Wq7vm2FYA4AFINT2Z TW4zEKUw+/MZCoUQ2kfveMSdoh2tlDPxw090Zj8AjNrPHEFf3+cllpeMsHQnrijDHigc82Pi03 jJU= X-IronPort-AV: E=Sophos;i="5.75,344,1589212800"; d="scan'208";a="142401271" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 12 Jul 2020 23:57:15 +0800 IronPort-SDR: SFOVWeO11tPeAqVzo1v/9SRNSdytNKk9vd4rRFOqB6+cCitel7Xnv0GG6DuCnjGL4lHJWxbFee W8y+HNpbyC6GXi/dZn4NGlFtlivrTLAdM= Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2020 08:45:46 -0700 IronPort-SDR: r2cnfE9/dvmwHtq4TJ9xe1s3rT8n6dQTOYyTF6R8zoYSXNkRrdiAs6mM6JuIu0YBk6qqupYgRm RSFRtjyRZDUg== WDCIronportException: Internal Received: from usa002626.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.57.178]) by uls-op-cesaip02.wdc.com with ESMTP; 12 Jul 2020 08:57:15 -0700 To: libc-alpha@sourceware.org Subject: [PATCH v3 09/19] RISC-V: nptl: update default pthread-offsets.h Date: Sun, 12 Jul 2020 08:47:44 -0700 Message-Id: <6721223c2ff1b6facd61cb415507f29c6c8d7357.1594568655.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-14.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alistair Francis via Libc-alpha From: Alistair Francis Reply-To: Alistair Francis Cc: alistair.francis@wdc.com Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Update the RISC-V pthread-offsets.h values to support RV32. --- sysdeps/riscv/nptl/pthread-offsets.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sysdeps/riscv/nptl/pthread-offsets.h b/sysdeps/riscv/nptl/pthread-offsets.h index 31f0587bec..a85c752a1f 100644 --- a/sysdeps/riscv/nptl/pthread-offsets.h +++ b/sysdeps/riscv/nptl/pthread-offsets.h @@ -1,3 +1,12 @@ -#define __PTHREAD_MUTEX_KIND_OFFSET 16 +#if __WORDSIZE == 64 +# define __PTHREAD_MUTEX_KIND_OFFSET 16 +#else +# define __PTHREAD_MUTEX_KIND_OFFSET 12 +#endif -#define __PTHREAD_RWLOCK_FLAGS_OFFSET 48 + +#if __WORDSIZE == 64 +# define __PTHREAD_RWLOCK_FLAGS_OFFSET 48 +#else +# define __PTHREAD_RWLOCK_FLAGS_OFFSET 24 +#endif