From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2138) id 2F56B3857C42; Wed, 5 Aug 2020 19:55:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2F56B3857C42 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Andreas Schwab To: glibc-cvs@sourceware.org Subject: [glibc/schwab/ilp32-2.32] aarch64: adjust bits/typesizes.h X-Act-Checkin: glibc X-Git-Author: Andreas Schwab X-Git-Refname: refs/heads/schwab/ilp32-2.32 X-Git-Oldrev: f42a179f4d0f7abd151bd82b7ef0ee13429c5331 X-Git-Newrev: ed70203173657923e9056462355ce903867ff2c1 Message-Id: <20200805195522.2F56B3857C42@sourceware.org> Date: Wed, 5 Aug 2020 19:55:22 +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: Wed, 05 Aug 2020 19:55:22 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ed70203173657923e9056462355ce903867ff2c1 commit ed70203173657923e9056462355ce903867ff2c1 Author: Andreas Schwab Date: Wed Aug 5 16:47:28 2020 +0200 aarch64: adjust bits/typesizes.h Diff: --- sysdeps/unix/sysv/linux/aarch64/bits/typesizes.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/aarch64/bits/typesizes.h b/sysdeps/unix/sysv/linux/aarch64/bits/typesizes.h index e3975c762c..a38054aae4 100644 --- a/sysdeps/unix/sysv/linux/aarch64/bits/typesizes.h +++ b/sysdeps/unix/sysv/linux/aarch64/bits/typesizes.h @@ -47,9 +47,18 @@ #define __FSWORD_T_TYPE __SWORD_TYPE #define __ID_T_TYPE __U32_TYPE #define __CLOCK_T_TYPE __SLONGWORD_TYPE -#define __TIME_T_TYPE __SLONGWORD_TYPE +#if __TIMESIZE == 64 && __WORDSIZE == 32 +# define __TIME_T_TYPE __SQUAD_TYPE +#else +# define __TIME_T_TYPE __SLONGWORD_TYPE +#endif #define __USECONDS_T_TYPE __U32_TYPE -#define __SUSECONDS_T_TYPE __SLONGWORD_TYPE +#if __TIMESIZE == 64 && __WORDSIZE == 32 +# define __SUSECONDS_T_TYPE __SQUAD_TYPE +#else +# define __SUSECONDS_T_TYPE __SLONGWORD_TYPE +#endif +#define __SUSECONDS64_T_TYPE __SQUAD_TYPE #define __DADDR_T_TYPE __S32_TYPE #define __KEY_T_TYPE __S32_TYPE #define __CLOCKID_T_TYPE __S32_TYPE @@ -82,6 +91,9 @@ /* And for __fsbilcnt_t and __fsbilcnt64_t. */ #define __FSFILCNT_T_TYPE_MATCHES_FSFILCNT64_T_TYPE 1 +/* And for getitimer, setitimer and rusage */ +#define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 (__WORDSIZE == 64) + /* Number of descriptors that can fit in an `fd_set'. */ #define __FD_SETSIZE 1024