From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45949) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUChO-00063K-2B for qemu-devel@nongnu.org; Tue, 04 Dec 2018 10:33:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gUChM-0000UZ-EG for qemu-devel@nongnu.org; Tue, 04 Dec 2018 10:33:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52082) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gUChM-0000U7-89 for qemu-devel@nongnu.org; Tue, 04 Dec 2018 10:33:20 -0500 From: Thomas Huth Date: Tue, 4 Dec 2018 16:32:56 +0100 Message-Id: <1543937577-28256-7-git-send-email-thuth@redhat.com> In-Reply-To: <1543937577-28256-1-git-send-email-thuth@redhat.com> References: <1543937577-28256-1-git-send-email-thuth@redhat.com> Subject: [Qemu-devel] [PATCH for-4.0 v2 6/7] includes: Replace QEMU_GNUC_PREREQ with "__has_builtin || !defined(__clang__)" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , pbonzini@redhat.com, peter.maydell@linaro.org 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 Signed-off-by: Thomas Huth --- 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