From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 25 May 2017 07:13:14 +0000 (-0700)
Subject: Merge from gnulib
X-Git-Tag: emacs-26.0.90~521^2~276
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9ebc2bbe3c1efea79810261533791bdf48a63760;p=emacs.git

Merge from gnulib

This incorporates:
2017-05-25 port to recent icc
* lib/intprops.h: Copy from gnulib.
---

diff --git a/lib/intprops.h b/lib/intprops.h
index 8f5ad545154..28f43613fe2 100644
--- a/lib/intprops.h
+++ b/lib/intprops.h
@@ -219,7 +219,11 @@
    : (max) >> (b) < (a))
 
 /* True if __builtin_add_overflow (A, B, P) works when P is non-null.  */
-#define _GL_HAS_BUILTIN_OVERFLOW (5 <= __GNUC__)
+#if 5 <= __GNUC__ && !defined __ICC
+# define _GL_HAS_BUILTIN_OVERFLOW 1
+#else
+# define _GL_HAS_BUILTIN_OVERFLOW 0
+#endif
 
 /* True if __builtin_add_overflow_p (A, B, C) works.  */
 #define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__)