From fdfe65e2642826951d8050c4071a9bd00bb8bd14 Mon Sep 17 00:00:00 2001 From: fxcoudert Date: Wed, 28 May 2014 15:17:29 +0000 Subject: [PATCH] PR bootstrap/PR61146 * wide-int.cc: Do not include longlong.h when compiling with clang. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@211023 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/wide-int.cc | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 42aade9555c..76f2f9c61a1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2014-05-28 Francois-Xavier Coudert + + PR bootstrap/PR61146 + * wide-int.cc: Do not include longlong.h when compiling with clang. + 2014-05-28 Richard Biener * tree-ssa-propagate.c (add_control_edge): Print less vertical space. diff --git a/gcc/wide-int.cc b/gcc/wide-int.cc index 0d26edb245f..ed7f01bd19e 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))); -- 2.11.4.GIT