Mesa (9.1): mesa: remove platform checks around __builtin_ffs, __builtin_ffsll

Ian Romanick idr at kemper.freedesktop.org
Fri May 10 20:43:46 UTC 2013


Module: Mesa
Branch: 9.1
Commit: 44d35d70e3aa1446c0363be3a257834a9379c878
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=44d35d70e3aa1446c0363be3a257834a9379c878

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Mar 28 17:06:35 2013 -0600

mesa: remove platform checks around __builtin_ffs, __builtin_ffsll

Use the __builtin_ffs, __builtin_ffsll functions whenever we have GCC,
not just for specific platforms.  Fixes Solaris build.

Note: This is a candidate for the stable branches.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=62868
Signed-off-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
(cherry picked from commit 95df2b28831147b3e7ce2a3b6257bf60c46b4ab4)

---

 src/mesa/main/imports.h |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 4b78381..c4110ef 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -500,17 +500,11 @@ _mesa_realloc( void *oldBuffer, size_t oldSize, size_t newSize );
 #ifndef FFS_DEFINED
 #define FFS_DEFINED 1
 #ifdef __GNUC__
-
-#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(ANDROID) || defined(__APPLE__)
 #define ffs __builtin_ffs
 #define ffsll __builtin_ffsll
-#endif
-
 #else
-
 extern int ffs(int i);
 extern int ffsll(long long int i);
-
 #endif /*__ GNUC__ */
 #endif /* FFS_DEFINED */
 




More information about the mesa-commit mailing list