diff options
| author | Thomas Huth <thuth@redhat.com> | 2018-12-03 14:33:12 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2018-12-12 10:01:13 +0100 |
| commit | f773b423cc61f3ca18af5337101c158a52aaae2c (patch) | |
| tree | 44a8fa2b8df8537ad85f1c99bcb3c1815ced6c78 /include | |
| parent | 65557f5ed9026f288654bfcfb696b581c1ef49c5 (diff) | |
includes: Replace QEMU_GNUC_PREREQ with "__has_builtin || !defined(__clang__)"
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 <richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/qemu/compiler.h | 2 | ||||
| -rw-r--r-- | 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 6b92710487..1593bca41d 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 38da849be9..4cd170e6cd 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; |