On 10/20/2011 06:58 PM, Alan Coopersmith wrote:
Without this fix, builds with gcc 3.4.x end up depending on undefined
_mesa_bitcount instead of gcc's __builtin_popcount.

NOTE: This is a candidate for the stable branches.

Signed-off-by: Alan Coopersmith<alan.coopersm...@oracle.com>
---
  src/mesa/main/imports.c |    2 +-
  src/mesa/main/imports.h |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 345a1c5..1c44727 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -514,7 +514,7 @@ _mesa_ffsll(int64_t val)
  #endif

  #if !defined(__GNUC__) ||\
-   ((_GNUC__ == 3&&  __GNUC_MINOR__<  4)&&  __GNUC__<  4)
+   ((__GNUC__ == 3&&  __GNUC_MINOR__<  4)&&  __GNUC__<  4)

I realize this patch is a typo fix, but isn't this logically equivalent to:

(__GNUC__ == 3&&  __GNUC_MINOR__<  4)


maybe what you are really after is:

(__GNUC__ == 3&&  __GNUC_MINOR__<  4) || __GNUC__<  3


  /**
   * Return number of bits set in given GLuint.
   */
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 20fa148..ade5441 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -576,7 +576,7 @@ _mesa_init_sqrt_table(void);
  #define _mesa_ffs(i)  ffs(i)
  #define _mesa_ffsll(i)  ffsll(i)

-#if ((_GNUC__ == 3&&  __GNUC_MINOR__>= 4) || __GNUC__>= 4)
+#if ((__GNUC__ == 3&&  __GNUC_MINOR__>= 4) || __GNUC__>= 4)
  #define _mesa_bitcount(i) __builtin_popcount(i)
  #define _mesa_bitcount_64(i) __builtin_popcountll(i)
  #else

-Jason
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to