xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-24 03:59:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only use __builtin_* with GCC >= 3.4

Browse Source 
Fix gcc 3.3 builds, broken in revision 5465.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5466 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aurel32 2008-10-12 11:44:36 +00:00
parent e95f5491bc
commit 5b7ada46e5
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
host-utils.h
View File

@ -51,7 +51,7 @@ void mulu64(uint64_t *phigh, uint64_t *plow, uint64_t a, uint64_t b);
static always_inline int clz32(uint32_t val) static always_inline int clz32(uint32_t val)
{ {
#if defined(__GNUC__) #if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
if (val) if (val)
return __builtin_clz(val); return __builtin_clz(val);
else else
@ -93,7 +93,7 @@ static always_inline int clo32(uint32_t val)
static always_inline int clz64(uint64_t val) static always_inline int clz64(uint64_t val)
{ {
#if defined(__GNUC__) #if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
if (val) if (val)
return __builtin_clzll(val); return __builtin_clzll(val);
else else
@ -118,7 +118,7 @@ static always_inline int clo64(uint64_t val)
static always_inline int ctz32 (uint32_t val) static always_inline int ctz32 (uint32_t val)
{ {
#if defined(__GNUC__) #if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
if (val) if (val)
return __builtin_ctz(val); return __builtin_ctz(val);
else else
@ -162,7 +162,7 @@ static always_inline int cto32 (uint32_t val)
static always_inline int ctz64 (uint64_t val) static always_inline int ctz64 (uint64_t val)
{ {
#if defined(__GNUC__) #if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
if (val) if (val)
return __builtin_ctz(val); return __builtin_ctz(val);
else else
@ -206,7 +206,7 @@ static always_inline int ctpop16 (uint16_t val)
static always_inline int ctpop32 (uint32_t val) 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); return __builtin_popcount(val);
#else #else
val = (val & 0x55555555) + ((val >> 1) & 0x55555555); val = (val & 0x55555555) + ((val >> 1) & 0x55555555);
@ -221,7 +221,7 @@ static always_inline int ctpop32 (uint32_t val)
static always_inline int ctpop64 (uint64_t val) 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); return __builtin_popcountll(val);
#else #else
val = (val & 0x5555555555555555ULL) + ((val >> 1) & 0x5555555555555555ULL); val = (val & 0x5555555555555555ULL) + ((val >> 1) & 0x5555555555555555ULL);

4
hw/apic.c
View File

@ -107,7 +107,7 @@ static void apic_update_irq(APICState *s);
/* Find first bit starting from msb */ /* Find first bit starting from msb */
static int fls_bit(uint32_t value) 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); return 31 - __builtin_clz(value);
#else #else
unsigned int ret = 0; unsigned int ret = 0;
@ -127,7 +127,7 @@ static int fls_bit(uint32_t value)
/* Find first bit starting from lsb */ /* Find first bit starting from lsb */
static int ffs_bit(uint32_t value) 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; return __builtin_ffs(value) - 1;
#else #else
unsigned int ret = 0; unsigned int ret = 0;