Do not assume __has_builtin is available

Compilation with GCC breaks as there is a build check using it. To avoid the problem, we declare the macro HAS_BUILTIN that maps to __has_builtin if it is defined, or 0 otherwise. Bug: chromium:819294 Change-Id: I105d566f08baa495fccd553d7b06eb8ce36621ef Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1713604 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Do not assume __has_builtin is available
dd3de6f0 · Jose Dapena Paz · Commit Bot · cd369bb8 · dd3de6f0
Commit dd3de6f0 authored Jul 22, 2019 by Jose Dapena Paz Committed by Commit Bot Jul 23, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

mathutil.h src/common/mathutil.h +8 -2

No files found.
--- a/src/common/mathutil.h
+++ b/src/common/mathutil.h
@@ -1254,14 +1254,20 @@ inline constexpr unsigned int UnsignedCeilDivide(unsigned int value, unsigned in
    return (divided + ((value % divisor == 0) ? 0 : 1));
 }
+#if defined(__has_builtin)
+#    define ANGLE_HAS_BUILTIN(x) __has_builtin(x)
+#else
+#    define ANGLE_HAS_BUILTIN(x) 0
+#endif
 #if defined(_MSC_VER)
 #    define ANGLE_ROTL(x, y) _rotl(x, y)
 #    define ANGLE_ROTL64(x, y) _rotl64(x, y)
 #    define ANGLE_ROTR16(x, y) _rotr16(x, y)
-#elif defined(__clang__) && __has_builtin(__builtin_rotateleft32) && \
+#elif defined(__clang__) && ANGLE_HAS_BUILTIN(__builtin_rotateleft32) && \
-    __has_builtin(__builtin_rotateleft64) && __has_builtin(__builtin_rotateright16)
+    ANGLE_HAS_BUILTIN(__builtin_rotateleft64) && ANGLE_HAS_BUILTIN(__builtin_rotateright16)
 #    define ANGLE_ROTL(x, y) __builtin_rotateleft32(x, y)
 #    define ANGLE_ROTL64(x, y) __builtin_rotateleft64(x, y)