aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/wide-int.cc3
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 42aade9..76f2f9c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-28 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
+
+ PR bootstrap/PR61146
+ * wide-int.cc: Do not include longlong.h when compiling with clang.
+
2014-05-28 Richard Biener <rguenther@suse.de>
* tree-ssa-propagate.c (add_control_edge): Print less vertical space.
diff --git a/gcc/wide-int.cc b/gcc/wide-int.cc
index 0d26edb..ed7f01b 100644
--- a/gcc/wide-int.cc
+++ b/gcc/wide-int.cc
@@ -38,7 +38,8 @@ along with GCC; see the file COPYING3. If not see
#endif
#define W_TYPE_SIZE HOST_BITS_PER_WIDE_INT
-#if GCC_VERSION >= 3000 && (W_TYPE_SIZE == 32 || defined (__SIZEOF_INT128__))
+/* Do not include longlong.h when compiler is clang-based. See PR61146. */
+#if GCC_VERSION >= 3000 && (W_TYPE_SIZE == 32 || defined (__SIZEOF_INT128__)) && !defined(__clang__)
typedef unsigned HOST_HALF_WIDE_INT UHWtype;
typedef unsigned HOST_WIDE_INT UWtype;
typedef unsigned int UQItype __attribute__ ((mode (QI)));