aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Bugaev <bugaevc@gmail.com>2023-03-19 18:09:55 +0300
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2023-04-03 01:03:06 +0200
commit0001a23f7a3701ef0ef7b25901c5e9990beea8f4 (patch)
treeaab5cb2a2919dfffb3e212af588433838ddfc5b9
parentaf2942cc622809650b3158fe61d73a0de952a10a (diff)
downloadglibc-0001a23f7a3701ef0ef7b25901c5e9990beea8f4.tar
glibc-0001a23f7a3701ef0ef7b25901c5e9990beea8f4.tar.gz
glibc-0001a23f7a3701ef0ef7b25901c5e9990beea8f4.tar.bz2
glibc-0001a23f7a3701ef0ef7b25901c5e9990beea8f4.zip
hurd: More 64-bit integer casting fixes
Signed-off-by: Sergey Bugaev <bugaevc@gmail.com> Message-Id: <20230319151017.531737-13-bugaevc@gmail.com>
-rw-r--r--sysdeps/mach/hurd/ioctl.c4
-rw-r--r--sysdeps/mach/hurd/x86/init-first.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sysdeps/mach/hurd/ioctl.c b/sysdeps/mach/hurd/ioctl.c
index 0f5de5d3fb..ab913a5943 100644
--- a/sysdeps/mach/hurd/ioctl.c
+++ b/sysdeps/mach/hurd/ioctl.c
@@ -149,10 +149,10 @@ __ioctl (int fd, unsigned long int request, ...)
Rather than pointing to the value, ARG is the value itself. */
#ifdef MACH_MSG_TYPE_BIT
*t++ = io2mach_type (1, _IOTS (integer_t));
- *(integer_t *) t = (integer_t) arg;
+ *(integer_t *) t = (integer_t) (intptr_t) arg;
t = (void *) t + sizeof (integer_t);
#else
- *(integer_t *) p = (integer_t) arg;
+ *(integer_t *) p = (integer_t) (intptr_t) arg;
p = (void *) p + sizeof (integer_t);
#endif
}
diff --git a/sysdeps/mach/hurd/x86/init-first.c b/sysdeps/mach/hurd/x86/init-first.c
index 6ca27155a4..48c330ec06 100644
--- a/sysdeps/mach/hurd/x86/init-first.c
+++ b/sysdeps/mach/hurd/x86/init-first.c
@@ -1,4 +1,4 @@
-/* Initialization code run first thing by the ELF startup code. For i386/Hurd.
+/* Initialization code run first thing by the ELF startup code. For x86/Hurd.
Copyright (C) 1995-2023 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -92,7 +92,7 @@ posixland_init (int argc, char **argv, char **envp)
static void
init (void **data)
{
- int argc = (int) *data;
+ int argc = (int) (uintptr_t) *data;
char **argv = (void *) (data + 1);
char **envp = &argv[argc + 1];
struct hurd_startup_data *d;