libc: use more tool chain types for arm_64 and riscv

Use the unsigned long tool chain types for types previously
derived from unsigned long '__uint64_t', which is now
unsigned long long.

Issue #5431
This commit is contained in:
Christian Prochaska 2025-02-07 08:14:43 +01:00 committed by Christian Helmuth
parent 696a6ec759
commit cec3a82401
2 changed files with 41 additions and 7 deletions

View File

@ -1 +1 @@
ec685e91ee80735b4a067fea4582aa7f5d06c192
fe481ecc33acac7263c5bf0ea4e3598f2231daa8

View File

@ -61,7 +61,7 @@ index 07893c6..abd2ea4 100644
/*
* Standard type definitions.
@@ -71,11 +71,11 @@
@@ -71,23 +71,23 @@
typedef __int16_t __int_least16_t;
typedef __int32_t __int_least32_t;
typedef __int64_t __int_least64_t;
@ -74,8 +74,25 @@ index 07893c6..abd2ea4 100644
+typedef __SIZE_TYPE__ __size_t; /* sizeof() */
+typedef __PTRDIFF_TYPE__ __ssize_t; /* byte count or error */
typedef __int64_t __time_t; /* time()... */
typedef __uint64_t __uintfptr_t;
typedef __uint64_t __uintmax_t;
-typedef __uint64_t __uintfptr_t;
-typedef __uint64_t __uintmax_t;
-typedef __uint64_t __uintptr_t;
+typedef __UINTPTR_TYPE__ __uintfptr_t;
+typedef __UINTMAX_TYPE__ __uintmax_t;
+typedef __UINTPTR_TYPE__ __uintptr_t;
typedef __uint32_t __uint_fast8_t;
typedef __uint32_t __uint_fast16_t;
typedef __uint32_t __uint_fast32_t;
-typedef __uint64_t __uint_fast64_t;
+typedef __UINT_FAST64_TYPE__ __uint_fast64_t;
typedef __uint8_t __uint_least8_t;
typedef __uint16_t __uint_least16_t;
typedef __uint32_t __uint_least32_t;
-typedef __uint64_t __uint_least64_t;
+typedef __UINT_LEAST64_TYPE__ __uint_least64_t;
typedef __uint64_t __u_register_t;
typedef __uint64_t __vm_offset_t;
typedef __uint64_t __vm_paddr_t;
--- src/lib/libc/sys/riscv/include/_types.h
+++ src/lib/libc/sys/riscv/include/_types.h
@@ -49,7 +49,7 @@
@ -87,7 +104,7 @@ index 07893c6..abd2ea4 100644
/*
* Standard type definitions.
@@ -71,11 +71,11 @@
@@ -71,23 +71,23 @@
typedef __int16_t __int_least16_t;
typedef __int32_t __int_least32_t;
typedef __int64_t __int_least64_t;
@ -100,5 +117,22 @@ index 07893c6..abd2ea4 100644
+typedef __SIZE_TYPE__ __size_t; /* sizeof() */
+typedef __PTRDIFF_TYPE__ __ssize_t; /* byte count or error */
typedef __int64_t __time_t; /* time()... */
typedef __uint64_t __uintfptr_t;
typedef __uint64_t __uintmax_t;
-typedef __uint64_t __uintfptr_t;
-typedef __uint64_t __uintmax_t;
-typedef __uint64_t __uintptr_t;
+typedef __UINTPTR_TYPE__ __uintfptr_t;
+typedef __UINTMAX_TYPE__ __uintmax_t;
+typedef __UINTPTR_TYPE__ __uintptr_t;
typedef __uint32_t __uint_fast8_t;
typedef __uint32_t __uint_fast16_t;
typedef __uint32_t __uint_fast32_t;
-typedef __uint64_t __uint_fast64_t;
+typedef __UINT_FAST64_TYPE__ __uint_fast64_t;
typedef __uint8_t __uint_least8_t;
typedef __uint16_t __uint_least16_t;
typedef __uint32_t __uint_least32_t;
-typedef __uint64_t __uint_least64_t;
+typedef __UINT_LEAST64_TYPE__ __uint_least64_t;
typedef __uint64_t __u_register_t;
typedef __uint64_t __vm_offset_t;
typedef __uint64_t __vm_paddr_t;