From: Stefan Weil <sw@weilnetz.de>
Date: Wed, 3 Oct 2012 21:11:02 +0000 (+0200)
Subject: qemu-barrier: Fix compiler version check for future gcc versions
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=610b823ef66b993660f1ab1447a769f190e4f3b3;p=qemu.git

qemu-barrier: Fix compiler version check for future gcc versions

The current check will give a wrong result for gcc-5.x with x < 4.
Using QEMU_GNUC_PREREQ is simpler and fixes that issue.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/qemu-barrier.h b/qemu-barrier.h
index 7e11197814..16f09429c3 100644
--- a/qemu-barrier.h
+++ b/qemu-barrier.h
@@ -19,7 +19,7 @@
  * mfence on 32 bit as well, e.g. if built with -march=pentium-m.
  * However, on i386, there seem to be known bugs as recently as 4.3.
  * */
-#if defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 4
+#if QEMU_GNUC_PREREQ(4, 4)
 #define smp_mb() __sync_synchronize()
 #else
 #define smp_mb() asm volatile("lock; addl $0,0(%%esp) " ::: "memory")