summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorVinson Lee <vlee@freedesktop.org>2014-05-30 19:40:26 -0700
committerVinson Lee <vlee@freedesktop.org>2014-05-30 19:47:35 -0700
commit83bba8f14603022c6c80bef95020e079d7cb73c0 (patch)
tree6290c660cdb607519460e560cece333707e7fa05 /src/gallium
parent90b5747856dd116e1a7e0fd4a93781400f276c3e (diff)
util: Do not use __builtin_clrsb with Intel C++ Compiler.
This patch fixes this build error with icc 14.0.2. In file included from state_tracker/st_glsl_to_tgsi.cpp(63): ../../src/gallium/auxiliary/util/u_math.h(583): error: identifier "__builtin_clrsb" is undefined return 31 - __builtin_clrsb(i); ^ Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/auxiliary/util/u_math.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
index 2ade64af4fe..b9ed197d72d 100644
--- a/src/gallium/auxiliary/util/u_math.h
+++ b/src/gallium/auxiliary/util/u_math.h
@@ -579,7 +579,7 @@ static INLINE unsigned util_last_bit(unsigned u)
*/
static INLINE unsigned util_last_bit_signed(int i)
{
-#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 407)
+#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 407) && !defined(__INTEL_COMPILER)
return 31 - __builtin_clrsb(i);
#else
if (i >= 0)