From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Thu, 24 Feb 2022 14:48:11 +0000 (+0400)
Subject: Simplify HOST_LONG_BITS
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=77a19c6aa405e0d734faf60d77a5d293fa4716ca;p=qmiga%2Fqemu.git

Simplify HOST_LONG_BITS

Simplify the macro, not depending on headers defines, but compiler
predefined __SIZEOF__POINTER__ only.

Available since gcc 4.3 and clang 2.8.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index f2274b24cb..8b070dee21 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -245,13 +245,7 @@ extern "C" {
 #endif
 
 /* HOST_LONG_BITS is the size of a native pointer in bits. */
-#if UINTPTR_MAX == UINT32_MAX
-# define HOST_LONG_BITS 32
-#elif UINTPTR_MAX == UINT64_MAX
-# define HOST_LONG_BITS 64
-#else
-# error Unknown pointer size
-#endif
+#define HOST_LONG_BITS (__SIZEOF_POINTER__ * 8)
 
 /* Mac OSX has a <stdint.h> bug that incorrectly defines SIZE_MAX with
  * the wrong type. Our replacement isn't usable in preprocessor