From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 8F0913857C50; Fri, 5 Aug 2022 19:31:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8F0913857C50 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] TODO(spec): cheri: __LP64__ is not defined for purecap ABI X-Act-Checkin: glibc X-Git-Author: Carlos Eduardo Seo X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 93c554530045f8a27ee2b9645d7913115deee6f4 X-Git-Newrev: 434271f1321cc78ecf422af73af741b8a59b17f0 Message-Id: <20220805193101.8F0913857C50@sourceware.org> Date: Fri, 5 Aug 2022 19:31:01 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2022 19:31:01 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=434271f1321cc78ecf422af73af741b8a59b17f0 commit 434271f1321cc78ecf422af73af741b8a59b17f0 Author: Carlos Eduardo Seo Date: Wed Jan 26 16:19:33 2022 -0300 TODO(spec): cheri: __LP64__ is not defined for purecap ABI TODO: there is no good ABI macro to check, for now we assume __CHERI_PURE_CAPABILITY__ implies 64 bit long, 64 bit address and 128 bit pointer. Diff: --- bits/typesizes.h | 2 +- sysdeps/aarch64/bits/wordsize.h | 2 +- sysdeps/unix/sysv/linux/generic/bits/typesizes.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bits/typesizes.h b/bits/typesizes.h index fffb6bfb64..186853968d 100644 --- a/bits/typesizes.h +++ b/bits/typesizes.h @@ -62,7 +62,7 @@ #define __SYSCALL_ULONG_TYPE __ULONGWORD_TYPE #define __CPU_MASK_TYPE __ULONGWORD_TYPE -#ifdef __LP64__ +#if defined __LP64__ || defined __CHERI_PURE_CAPABILITY__ /* Tell the libc code that off_t and off64_t are actually the same type for all ABI purposes, even if possibly expressed as different base types for C type-checking purposes. */ diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h index 4635431f0e..8fbf6503d8 100644 --- a/sysdeps/aarch64/bits/wordsize.h +++ b/sysdeps/aarch64/bits/wordsize.h @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see . */ -#ifdef __LP64__ +#if defined __LP64__ || defined __CHERI_PURE_CAPABILITY__ # define __WORDSIZE 64 #else # define __WORDSIZE 32 diff --git a/sysdeps/unix/sysv/linux/generic/bits/typesizes.h b/sysdeps/unix/sysv/linux/generic/bits/typesizes.h index 6b13ff315c..c70dcbccd8 100644 --- a/sysdeps/unix/sysv/linux/generic/bits/typesizes.h +++ b/sysdeps/unix/sysv/linux/generic/bits/typesizes.h @@ -75,7 +75,7 @@ #define __SYSCALL_ULONG_TYPE __ULONGWORD_TYPE #define __CPU_MASK_TYPE __ULONGWORD_TYPE -#if defined __LP64__ || (__TIMESIZE == 64 && __WORDSIZE == 32) +#if defined __LP64__ || (__TIMESIZE == 64 && __WORDSIZE == 32) || defined __CHERI_PURE_CAPABILITY__ /* Tell the libc code that off_t and off64_t are actually the same type for all ABI purposes, even if possibly expressed as different base types for C type-checking purposes. */