From: Aurelien Jarno <aurelien@aurel32.net>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [5466] Only use __builtin_* with GCC >= 3.4
Date: Sun, 12 Oct 2008 11:44:37 +0000 [thread overview]
Message-ID: <E1KozNF-0000r1-S2@cvs.savannah.gnu.org> (raw)
Revision: 5466
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5466
Author: aurel32
Date: 2008-10-12 11:44:36 +0000 (Sun, 12 Oct 2008)
Log Message:
-----------
Only use __builtin_* with GCC >= 3.4
Fix gcc 3.3 builds, broken in revision 5465.
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Revision Links:
--------------
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5465
Modified Paths:
--------------
trunk/host-utils.h
trunk/hw/apic.c
Modified: trunk/host-utils.h
===================================================================
--- trunk/host-utils.h 2008-10-12 00:53:17 UTC (rev 5465)
+++ trunk/host-utils.h 2008-10-12 11:44:36 UTC (rev 5466)
@@ -51,7 +51,7 @@
static always_inline int clz32(uint32_t val)
{
-#if defined(__GNUC__)
+#if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
if (val)
return __builtin_clz(val);
else
@@ -93,7 +93,7 @@
static always_inline int clz64(uint64_t val)
{
-#if defined(__GNUC__)
+#if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
if (val)
return __builtin_clzll(val);
else
@@ -118,7 +118,7 @@
static always_inline int ctz32 (uint32_t val)
{
-#if defined(__GNUC__)
+#if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
if (val)
return __builtin_ctz(val);
else
@@ -162,7 +162,7 @@
static always_inline int ctz64 (uint64_t val)
{
-#if defined(__GNUC__)
+#if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
if (val)
return __builtin_ctz(val);
else
@@ -206,7 +206,7 @@
static always_inline int ctpop32 (uint32_t val)
{
-#if defined(__GNUC__)
+#if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
return __builtin_popcount(val);
#else
val = (val & 0x55555555) + ((val >> 1) & 0x55555555);
@@ -221,7 +221,7 @@
static always_inline int ctpop64 (uint64_t val)
{
-#if defined(__GNUC__)
+#if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
return __builtin_popcountll(val);
#else
val = (val & 0x5555555555555555ULL) + ((val >> 1) & 0x5555555555555555ULL);
Modified: trunk/hw/apic.c
===================================================================
--- trunk/hw/apic.c 2008-10-12 00:53:17 UTC (rev 5465)
+++ trunk/hw/apic.c 2008-10-12 11:44:36 UTC (rev 5466)
@@ -107,7 +107,7 @@
/* Find first bit starting from msb */
static int fls_bit(uint32_t value)
{
-#if defined(__GNUC__)
+#if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
return 31 - __builtin_clz(value);
#else
unsigned int ret = 0;
@@ -127,7 +127,7 @@
/* Find first bit starting from lsb */
static int ffs_bit(uint32_t value)
{
-#if defined(__GNUC__)
+#if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
return __builtin_ffs(value) - 1;
#else
unsigned int ret = 0;
next reply other threads:[~2008-10-12 11:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-12 11:44 Aurelien Jarno [this message]
2008-10-12 12:33 ` [Qemu-devel] [5466] Only use __builtin_* with GCC >= 3.4 Avi Kivity
2008-10-12 14:23 ` Jamie Lokier
2008-10-12 15:02 ` Avi Kivity
2008-10-12 15:33 ` Jamie Lokier
2008-10-12 19:10 ` M. Warner Losh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1KozNF-0000r1-S2@cvs.savannah.gnu.org \
--to=aurelien@aurel32.net \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).