about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlavio Cruz <flaviocruz@gmail.com>2023-11-05 23:13:32 -0500
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2023-11-06 23:24:48 +0100
commit5dd3bda59c2d9da138f0d98808d087cdb95cdc17 (patch)
tree8b3a545eb6276e22153496ca8e878e98f401a1f9
parentf957f47df75b9fab995754011491edebc6feb147 (diff)
downloadglibc-5dd3bda59c2d9da138f0d98808d087cdb95cdc17.tar.gz
glibc-5dd3bda59c2d9da138f0d98808d087cdb95cdc17.tar.xz
glibc-5dd3bda59c2d9da138f0d98808d087cdb95cdc17.zip
Update BAD_TYPECHECK to work on x86_64
Message-ID: <ZUhn7LOcgLOJjKZr@jupiter.tail36e24.ts.net>
-rw-r--r--sysdeps/mach/mach_rpc.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/sysdeps/mach/mach_rpc.h b/sysdeps/mach/mach_rpc.h
index 152f057ca7..ed81403be6 100644
--- a/sysdeps/mach/mach_rpc.h
+++ b/sysdeps/mach/mach_rpc.h
@@ -20,11 +20,8 @@
 
 /* Macro used by MIG to cleanly check the type.  */
 #define BAD_TYPECHECK(type, check) __glibc_unlikely (({	\
-  union { mach_msg_type_t t; uint32_t w; } _t, _c;	\
+  union { mach_msg_type_t t; uintptr_t w; } _t, _c;	\
   _t.t = *(type); _c.t = *(check);_t.w != _c.w; }))
 
-/* TODO: add this assertion for x86_64.  */
-#ifndef __x86_64__
-_Static_assert (sizeof (uint32_t) == sizeof (mach_msg_type_t),
-                "mach_msg_type_t needs to be the same size as uint32_t");
-#endif
+_Static_assert (sizeof (uintptr_t) == sizeof (mach_msg_type_t),
+                "mach_msg_type_t needs to be the same size as uintptr_t");