[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-4.0 v2 6/7] includes: Replace QEMU_GNUC_PREREQ w
From: |
Thomas Huth |
Subject: |
[Qemu-devel] [PATCH for-4.0 v2 6/7] includes: Replace QEMU_GNUC_PREREQ with "__has_builtin || !defined(__clang__)" |
Date: |
Tue, 4 Dec 2018 16:32:56 +0100 |
Since we require GCC version 4.8 or newer now, we can be sure that
the builtin functions are always available on GCC. And for Clang,
we can check the availablility with __has_builtin instead.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
---
include/qemu/compiler.h | 2 +-
include/qemu/host-utils.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h
index 6b92710..1593bca 100644
--- a/include/qemu/compiler.h
+++ b/include/qemu/compiler.h
@@ -127,7 +127,7 @@
#define __has_builtin(x) 0 /* compatibility with non-clang compilers */
#endif
-#if __has_builtin(__builtin_assume_aligned) || QEMU_GNUC_PREREQ(4, 7)
+#if __has_builtin(__builtin_assume_aligned) || !defined(__clang__)
#define HAS_ASSUME_ALIGNED
#endif
diff --git a/include/qemu/host-utils.h b/include/qemu/host-utils.h
index 38da849..4cd170e 100644
--- a/include/qemu/host-utils.h
+++ b/include/qemu/host-utils.h
@@ -207,7 +207,7 @@ static inline int cto64(uint64_t val)
*/
static inline int clrsb32(uint32_t val)
{
-#if QEMU_GNUC_PREREQ(4, 7)
+#if __has_builtin(__builtin_clrsb) || !defined(__clang__)
return __builtin_clrsb(val);
#else
return clz32(val ^ ((int32_t)val >> 1)) - 1;
@@ -223,7 +223,7 @@ static inline int clrsb32(uint32_t val)
*/
static inline int clrsb64(uint64_t val)
{
-#if QEMU_GNUC_PREREQ(4, 7)
+#if __has_builtin(__builtin_clrsbll) || !defined(__clang__)
return __builtin_clrsbll(val);
#else
return clz64(val ^ ((int64_t)val >> 1)) - 1;
--
1.8.3.1
- [Qemu-devel] [PATCH for-4.0 v2 0/7] Assume GCC v4.8 and Clang v3.4 as minimum compiler, Thomas Huth, 2018/12/04
- [Qemu-devel] [PATCH for-4.0 v2 2/7] configure: Remove obsolete check for Clang < 3.2, Thomas Huth, 2018/12/04
- [Qemu-devel] [PATCH for-4.0 v2 1/7] configure: Add a test for the minimum compiler version, Thomas Huth, 2018/12/04
- [Qemu-devel] [PATCH for-4.0 v2 3/7] configure: Remove old -fno-gcse workaround for GCC 4.6.x and 4.7.[012], Thomas Huth, 2018/12/04
- [Qemu-devel] [PATCH for-4.0 v2 4/7] tcg/tcg.h: Remove GCC check for tcg_debug_assert() macro, Thomas Huth, 2018/12/04
- [Qemu-devel] [PATCH for-4.0 v2 5/7] audio/alsaaudio: Remove compiler check around pragma, Thomas Huth, 2018/12/04
- [Qemu-devel] [PATCH for-4.0 v2 6/7] includes: Replace QEMU_GNUC_PREREQ with "__has_builtin || !defined(__clang__)",
Thomas Huth <=
- [Qemu-devel] [PATCH for-4.0 v2 7/7] Remove QEMU_ARTIFICIAL macro, Thomas Huth, 2018/12/04