diff options
| author | Timothy Arceri <[email protected]> | 2014-12-12 20:36:25 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2014-12-17 08:37:23 +1100 |
| commit | 13675a49074e395a68a5d05dacedf209bc2b69c6 (patch) | |
| tree | 68aa1494b69822110b4f7235c7eb7512dca3d997 | |
| parent | 8d0c641603e4115c99b21faf9ad24333fb626bea (diff) | |
gallium: remove support for GCC older than 4.1.0
Signed-off-by: Timothy Arceri <[email protected]>
Reviewed-By: Jose Fonseca <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/util/u_math.h | 8 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xa/xa_priv.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h index 0113fb1a0c6..19c7343b171 100644 --- a/src/gallium/auxiliary/util/u_math.h +++ b/src/gallium/auxiliary/util/u_math.h @@ -541,7 +541,7 @@ unsigned ffs( unsigned u ) static INLINE unsigned util_last_bit(unsigned u) { -#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 304) +#if defined(__GNUC__) return u == 0 ? 0 : 32 - __builtin_clz(u); #else unsigned r = 0; @@ -658,7 +658,7 @@ float_to_byte_tex(float f) static INLINE unsigned util_logbase2(unsigned n) { -#if defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION >= 304) +#if defined(PIPE_CC_GCC) return ((sizeof(unsigned) * 8 - 1) - __builtin_clz(n | 1)); #else unsigned pos = 0; @@ -678,7 +678,7 @@ util_logbase2(unsigned n) static INLINE unsigned util_next_power_of_two(unsigned x) { -#if defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION >= 304) +#if defined(PIPE_CC_GCC) if (x <= 1) return 1; @@ -710,7 +710,7 @@ util_next_power_of_two(unsigned x) static INLINE unsigned util_bitcount(unsigned n) { -#if defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION >= 304) +#if defined(PIPE_CC_GCC) return __builtin_popcount(n); #else /* K&R classic bitcount. diff --git a/src/gallium/state_trackers/xa/xa_priv.h b/src/gallium/state_trackers/xa/xa_priv.h index b67337995a8..f71c06c6c19 100644 --- a/src/gallium/state_trackers/xa/xa_priv.h +++ b/src/gallium/state_trackers/xa/xa_priv.h @@ -40,7 +40,7 @@ #include "util/u_math.h" -#if defined(__GNUC__) && __GNUC__ >= 4 +#if defined(__GNUC__) #define XA_EXPORT __attribute__ ((visibility("default"))) #else #define XA_EXPORT |