From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Feb 2015 19:45:00 +0000 (-0800)
Subject: Merge branch 'jk/pack-bitmap'
X-Git-Tag: v2.4.0-rc0~109
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2c1f554d0ca2c35c213d68d94baf30f11180f4ce?hp=db30b8333b24ef54d877ddbd5ac929779b45331e

Merge branch 'jk/pack-bitmap'

The pack bitmap support did not build with older versions of GCC.

* jk/pack-bitmap:
ewah: fix building with gcc < 3.4.0
---

diff --git a/ewah/ewok.h b/ewah/ewok.h
index f6ad190a03..13c6e20412 100644
--- a/ewah/ewok.h
+++ b/ewah/ewok.h
@@ -47,7 +47,8 @@ static inline uint32_t ewah_bit_popcount64(uint64_t x)
 	return (x * 0x0101010101010101ULL) >> 56;
 }
 
-#ifdef __GNUC__
+/* __builtin_ctzll was not available until 3.4.0 */
+#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3  && __GNUC_MINOR > 3))
 #define ewah_bit_ctz64(x) __builtin_ctzll(x)
 #else
 static inline int ewah_bit_ctz64(uint64_t x)