diff mbox

[COMMITTED] longlong.h: Disable alpha umul_ppmm for old g++

Message ID 1414527984-22889-1-git-send-email-rth@redhat.com
State New
Headers show

Commit Message

Richard Henderson Oct. 28, 2014, 8:26 p.m. UTC 
I can't tell if this is fixed on mainline, because __builtin expansion
happens at a different time, or if it's still broken but hidden somehow.

But using gcc 4.8 as a bootstrap compiler for alphaev67-linux, we get a
"sorry: unexpected AST of kind MULT_HIGHPART".  It seems easiest to simply
disable this for pre-g++-5 to allow bootstrap to succeed.


r~


        * longlong.h [__alpha] (umul_ppmm): Disable for c++.
---
 include/ChangeLog  | 4 ++++
 include/longlong.h | 4 ++++
 2 files changed, 8 insertions(+)
diff mbox

Patch

diff --git a/include/ChangeLog b/include/ChangeLog
index d2d1472..e482682 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@ 
+2014-10-28  Richard Henderson  <rth@redhat.com>
+
+	* longlong.h [__alpha] (umul_ppmm): Disable for c++.
+
 2014-10-28  Yury Gribov  <y.gribov@samsung.com>
 
 	* libiberty.h (strtol, strtoul, strtoll, strtoull): New prototypes.
diff --git a/include/longlong.h b/include/longlong.h
index 42c68dd..8cd2c79 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;							\