ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Thomas Huth 2018-12-03 14:33:12 +01:00
parent 65557f5ed9
commit f773b423cc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/qemu/compiler.h
View File

@ -127,7 +127,7 @@
#define __has_builtin(x) 0 /* compatibility with non-clang compilers */ #define __has_builtin(x) 0 /* compatibility with non-clang compilers */
#endif #endif
#if __has_builtin(__builtin_assume_aligned) || QEMU_GNUC_PREREQ(4, 7) #if __has_builtin(__builtin_assume_aligned) || !defined(__clang__)
#define HAS_ASSUME_ALIGNED #define HAS_ASSUME_ALIGNED
#endif #endif

4
include/qemu/host-utils.h
View File

@ -207,7 +207,7 @@ static inline int cto64(uint64_t val)
*/ */
static inline int clrsb32(uint32_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); return __builtin_clrsb(val);
#else #else
return clz32(val ^ ((int32_t)val >> 1)) - 1; 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) static inline int clrsb64(uint64_t val)
{ {
#if QEMU_GNUC_PREREQ(4, 7) #if __has_builtin(__builtin_clrsbll) || !defined(__clang__)
return __builtin_clrsbll(val); return __builtin_clrsbll(val);
#else #else
return clz64(val ^ ((int64_t)val >> 1)) - 1; return clz64(val ^ ((int64_t)val >> 1)) - 1;