Mesa (master): gallium: remove support for GCC older than 4.1.0
Timothy Arceri
tarceri at kemper.freedesktop.org
Tue Dec 16 21:38:11 UTC 2014
Module: Mesa
Branch: master
Commit: 13675a49074e395a68a5d05dacedf209bc2b69c6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=13675a49074e395a68a5d05dacedf209bc2b69c6
Author: Timothy Arceri <t_arceri at yahoo.com.au>
Date: Fri Dec 12 20:36:25 2014 +1100
gallium: remove support for GCC older than 4.1.0
Signed-off-by: Timothy Arceri <t_arceri at yahoo.com.au>
Reviewed-By: Jose Fonseca <jfonseca at vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
---
src/gallium/auxiliary/util/u_math.h | 8 ++++----
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 0113fb1..19c7343 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 b673379..f71c06c 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
More information about the mesa-commit
mailing list