From 99630555c2224e544a11928dcbc89e4a3f5ff1e7 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 28 Oct 2014 13:22:40 -0700 Subject: [PATCH] longlong.h: Disable alpha umul_ppmm for old g++ Causes "unexpected AST of kind MULT_HIGHPART" error with bootstrap from gcc 4.8. * longlong.h [__alpha] (umul_ppmm): Disable for c++. From-SVN: r216811 --- include/ChangeLog | 4 ++++ include/longlong.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/include/ChangeLog b/include/ChangeLog index d2d14721f09..e48268296bf 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2014-10-28 Richard Henderson + + * longlong.h [__alpha] (umul_ppmm): Disable for c++. + 2014-10-28 Yury Gribov * libiberty.h (strtol, strtoul, strtoll, strtoull): New prototypes. diff --git a/include/longlong.h b/include/longlong.h index 42c68ddd62d..8cd2c79898c 100644 --- a/include/longlong.h +++ b/include/longlong.h @@ -139,6 +139,9 @@ extern const UQItype __clz_tab[256] attribute_hidden; #endif /* __aarch64__ */ #if defined (__alpha) && W_TYPE_SIZE == 64 +/* There is a bug in g++ before version 5 that + errors on __builtin_alpha_umulh. */ +#if !defined(__cplusplus) || __GNUC__ >= 5 #define umul_ppmm(ph, pl, m0, m1) \ do { \ UDItype __m0 = (m0), __m1 = (m1); \ @@ -146,6 +149,7 @@ extern const UQItype __clz_tab[256] attribute_hidden; (pl) = __m0 * __m1; \ } while (0) #define UMUL_TIME 46 +#endif /* !c++ */ #ifndef LONGLONG_STANDALONE #define udiv_qrnnd(q, r, n1, n0, d) \ do { UDItype __r; \