[patch] patch

0001-mesa-Check-for-__builtin_clrsb.patch (text/plain), 1.74 KB, created by Matt Turner on 2015-01-23 22:52:53 UTC

From 46a81de05e936d09c239abb6a603df92c362d6b5 Mon Sep 17 00:00:00 2001
From: Matt Turner <[e-mail]>
Date: Tue, 20 Jan 2015 16:22:23 -0800
Subject: [PATCH] mesa: Check for __builtin_clrsb().

---
 configure.ac                        | 1 +
 scons/gallium.py                    | 2 ++
 src/gallium/auxiliary/util/u_math.h | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index a4c5c74..70d4c48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,6 +171,7 @@ fi
 dnl Check for compiler builtins
 AX_GCC_BUILTIN([__builtin_bswap32])
 AX_GCC_BUILTIN([__builtin_bswap64])
+AX_GCC_BUILTIN([__builtin_clrsb])
 AX_GCC_BUILTIN([__builtin_clz])
 AX_GCC_BUILTIN([__builtin_clzll])
 AX_GCC_BUILTIN([__builtin_ctz])
diff --git a/scons/gallium.py b/scons/gallium.py
index 8e2090b..d18fc47 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -607,6 +607,8 @@ def generate(env):
             ]
         if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('4.5'):
             cppdefines += ['HAVE___BUILTIN_UNREACHABLE']
+        if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('4.7'):
+            cppdefines += ['HAVE___BUILTIN_CLRSB']
 
     # Load tools
     env.Tool('lex')
diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
index 19c7343..1185483 100644
--- a/src/gallium/auxiliary/util/u_math.h
+++ b/src/gallium/auxiliary/util/u_math.h
@@ -561,7 +561,7 @@ util_last_bit(unsigned u)
 static INLINE unsigned
 util_last_bit_signed(int i)
 {
-#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 407) && !defined(__INTEL_COMPILER)
+#ifdef HAVE___BUILTIN_CLRSB
    return 31 - __builtin_clrsb(i);
 #else
    if (i >= 0)
-- 
2.0.4