From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53174) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4ed3-0002z3-1m for qemu-devel@nongnu.org; Fri, 16 Sep 2011 16:03:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R4ed1-00015w-Ex for qemu-devel@nongnu.org; Fri, 16 Sep 2011 16:03:17 -0400 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:39192) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4ed1-00015m-5A for qemu-devel@nongnu.org; Fri, 16 Sep 2011 16:03:15 -0400 From: Stefan Weil Date: Fri, 16 Sep 2011 22:03:07 +0200 Message-Id: <1316203388-24910-2-git-send-email-weil@mail.berlios.de> In-Reply-To: <1316203388-24910-1-git-send-email-weil@mail.berlios.de> References: <1316203388-24910-1-git-send-email-weil@mail.berlios.de> Subject: [Qemu-devel] [PATCH 1/2] Move macro QEMU_GNUC_PREREQ to compiler.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org The macro is compiler specific and does not depend on the operating system. Move macro QEMU_GNUC_PREREQ from osdep.h to compiler.h and use it to simplify existing code. host-utils.h uses this macro, so it now needs compiler.h instead of osdep.h. Signed-off-by: Stefan Weil --- compiler.h | 15 +++++++++++++-- host-utils.h | 2 +- osdep.h | 7 ------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/compiler.h b/compiler.h index a2d5959..3a9b8a1 100644 --- a/compiler.h +++ b/compiler.h @@ -5,7 +5,19 @@ #include "config-host.h" +/*---------------------------------------------------------------------------- +| The macro QEMU_GNUC_PREREQ tests for minimum version of the GNU C compiler. +| The code is a copy of SOFTFLOAT_GNUC_PREREQ, see softfloat-macros.h. +*----------------------------------------------------------------------------*/ +#if defined(__GNUC__) && defined(__GNUC_MINOR__) +# define QEMU_GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +#else +# define QEMU_GNUC_PREREQ(maj, min) 0 +#endif + #define QEMU_NORETURN __attribute__ ((__noreturn__)) + #ifdef CONFIG_GCC_ATTRIBUTE_WARN_UNUSED_RESULT #define QEMU_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) #else @@ -22,8 +34,7 @@ typedef char qemu_build_bug_on__##__LINE__[(x)?-1:1]; #if defined __GNUC__ -# if (__GNUC__ < 4) || \ - defined(__GNUC_MINOR__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 4) +# if !QEMU_GNUC_PREREQ(4, 4) /* gcc versions before 4.4.x don't support gnu_printf, so use printf. */ # define GCC_ATTR __attribute__((__unused__, format(printf, 1, 2))) # define GCC_FMT_ATTR(n, m) __attribute__((format(printf, n, m))) diff --git a/host-utils.h b/host-utils.h index 0ddc176..821db93 100644 --- a/host-utils.h +++ b/host-utils.h @@ -23,7 +23,7 @@ * THE SOFTWARE. */ -#include "osdep.h" +#include "compiler.h" /* QEMU_GNUC_PREREQ */ #if defined(__x86_64__) #define __HAVE_FAST_MULU64__ diff --git a/osdep.h b/osdep.h index 252d050..432b91e 100644 --- a/osdep.h +++ b/osdep.h @@ -81,13 +81,6 @@ #define qemu_printf printf -#if defined (__GNUC__) && defined (__GNUC_MINOR__) -# define QEMU_GNUC_PREREQ(maj, min) \ - ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) -#else -# define QEMU_GNUC_PREREQ(maj, min) 0 -#endif - int qemu_daemon(int nochdir, int noclose); void *qemu_memalign(size_t alignment, size_t size); void *qemu_vmalloc(size_t size); -- 1.7.2.5