From patchwork Thu Apr 2 16:29:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 38714 Return-Path: X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa4.hgst.iphmx.com (esa4.hgst.iphmx.com [216.71.154.42]) by sourceware.org (Postfix) with ESMTPS id D416D388B800 for ; Thu, 2 Apr 2020 16:37:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D416D388B800 IronPort-SDR: 2oOqmpGifeIQijBgjyRjxJrbFD/EiWJrzX60COHvMcfIFukUd7jB2fDhaqN5esjTaY1Vjsfm1j I1p1eivb38yNfqRXHQ4mCul/RSnhDmmmFofemaKlERA01MREJy0bJlhKQTzpF49f3saf716BNv lqk52E1Dx0CURETDNyt2uxrJYNd9rAnab2BdCF7sSSyRqFB+buVWz1B38p1jMPtSLY9Poh0mc6 gMVDlK6JMA5Pd532Q/sv7pubsr9H+Y640eOu6J9iN2oeURBZUodSYwiXGNeZubNP6jxkrDaGKB qQM= X-IronPort-AV: E=Sophos;i="5.72,336,1580745600"; d="scan'208";a="134426333" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 03 Apr 2020 00:37:27 +0800 IronPort-SDR: 14KuLqxjrkceAmnmmFUGnaY5LWk+HHak5Ho73mKyQDV2lZaId48SAwZ3PSXjO0WgjosP/7N0N1 yc+gJPQf8h1iCvuCio4aYYvskqKjS/wmmAS6mR++0/jiVTQEwK1WAsZguV3XY2fxcy9S+q41+q qgkhKy0uLWkxzVROHUrhj8TefSq12jw1DcVleBNzpWTOuTCfF9jygSKvF6hJUTRiPT+QxqFz1M laD0E1sYbjFZ15Erd3vEhMnMIdTwWucyV0rg36GBZuJCuU5m3tRrAk5G/E+bYp9o3Boj592nrd otiWXiLq5CIeeBtydqJNe85+ Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2020 09:28:18 -0700 IronPort-SDR: mL7R6u6uB1EKORpD3n2mYDYir0yP62ho1Qq+P2F0fhenABExeuKQa/f2J+oblOb8gAjnZFHO6I CeTFaXYeJ6HvzTXiamkUUkZSzu6fq5Uq6irmZ/3OrZBKIxMwoGDH/ZKQWdjcSX9rh20PqXTYxB ctAi2S0LFK+ycDMwDnrov8TZGBWTHZfpZN3K2zuydjiYw77y8ki9NrwbCGZAzlks557EzeQ5xK 7Vdmtei/Td471g3eWvO3iC+EPyZAWG4ZJdmqGqvhidKqLjpzyec+X/EPyX5QeHOoFpjPdcIyun ZJY= WDCIronportException: Internal Received: from phd004806.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.55.43]) by uls-op-cesaip02.wdc.com with ESMTP; 02 Apr 2020 09:37:26 -0700 From: Alistair Francis To: libc-alpha@sourceware.org Cc: alistair23@gmail.com, Alistair Francis Subject: [PATCH 08/18] RISC-V: nptl: update default pthread-offsets.h Date: Thu, 2 Apr 2020 09:29:38 -0700 Message-Id: <20200402162939.358617-9-alistair.francis@wdc.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200402162939.358617-1-alistair.francis@wdc.com> References: <20200402162939.358617-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-26.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_NONE, 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-List-Received-Date: Thu, 02 Apr 2020 16:37:35 -0000 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