This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] Sync longlong.h with GCC
- From: H.J.Lu <hjl at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 14 Jul 2015 16:21:55 -0000
- Subject: [binutils-gdb] Sync longlong.h with GCC
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=dc2edb520a534fd0c2af169d46b4d892208e8f42
commit dc2edb520a534fd0c2af169d46b4d892208e8f42
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Tue Jul 14 09:17:41 2015 -0700
Sync longlong.h with GCC
Sync with GCC
2014-10-28 Richard Henderson <rth@redhat.com>
* longlong.h [__alpha] (umul_ppmm): Disable for c++.
Diff:
---
include/ChangeLog | 7 +++++++
include/longlong.h | 4 ++++
2 files changed, 11 insertions(+)
diff --git a/include/ChangeLog b/include/ChangeLog
index 8cacfa8..9fc5469 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,6 +1,13 @@
2015-07-14 H.J. Lu <hongjiu.lu@intel.com>
Sync with GCC
+ 2014-10-28 Richard Henderson <rth@redhat.com>
+
+ * longlong.h [__alpha] (umul_ppmm): Disable for c++.
+
+2015-07-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ Sync with GCC
2014-12-09 Trevor Saunders <tsaunders@mozilla.com>
* hashtab.h, splay-tree.h: Remove GTY markers.
diff --git a/include/longlong.h b/include/longlong.h
index 4f2c4f5..a0b2ce1 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; \