[gentoo-commits] gentoo-x86 commit in media-libs/mesa/files: mesa-10.3.7-dont-use-clrsb.patch

[Matt Turner (mattst88)]

mattst88    15/02/03 21:43:26

  Added:                mesa-10.3.7-dont-use-clrsb.patch
  Log:
  Version bump to 10.4.3. Fix bugs 536916 and 538086.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 974CA72A)

Revision  Changes    Path
1.1                  media-libs/mesa/files/mesa-10.3.7-dont-use-clrsb.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/files/mesa-10.3.7-dont-use-clrsb.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/files/mesa-10.3.7-dont-use-clrsb.patch?rev=1.1&content-type=text/plain

Index: mesa-10.3.7-dont-use-clrsb.patch
===================================================================
From 32e98e8ef06f0bb6ad55f9fb5858be77c03367b0 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@×××××.com>
Date: Mon, 2 Feb 2015 17:26:49 -0800
Subject: [PATCH] gallium/util: Don't use __builtin_clrsb in util_last_bit().

Unclear circumstances lead to undefined symbols on x86.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=536916
Cc: mesa-stable@×××××××××××××××××.org
Reviewed-by: Ilia Mirkin <imirkin@××××××××.edu>
---
 src/gallium/auxiliary/util/u_math.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
index 19c7343..ca6d0f1 100644
--- a/src/gallium/auxiliary/util/u_math.h
+++ b/src/gallium/auxiliary/util/u_math.h
@@ -561,14 +561,10 @@ 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)
-   return 31 - __builtin_clrsb(i);
-#else
    if (i >= 0)
       return util_last_bit(i);
    else
       return util_last_bit(~(unsigned)i);
-#endif
 }
 
 /* Destructively loop over all of the bits in a mask as in:
-- 
2.0.4