aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Ellcey <sellcey@mips.com>2014-05-01 09:09:33 -0700
committerSteve Ellcey <sellcey@mips.com>2014-05-01 09:09:33 -0700
commit65bab56b9b708e0af46d3beeff6276dafd78c993 (patch)
treeee959cec6be9a4fde73a0aaf3e3f54abfa8049cd
parenta4526a9a95f4885aa52d5fdc4b3e21490cc6a8f7 (diff)
downloadgdb-65bab56b9b708e0af46d3beeff6276dafd78c993.zip
gdb-65bab56b9b708e0af46d3beeff6276dafd78c993.tar.gz
gdb-65bab56b9b708e0af46d3beeff6276dafd78c993.tar.bz2
2014-05-01 Steve Ellcey <sellcey@mips.com>
* include/longlong.h: Import latest version from GCC tree.
-rw-r--r--include/ChangeLog4
-rw-r--r--include/longlong.h22
2 files changed, 23 insertions, 3 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 42a6399..cbfec7d 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-01 Steve Ellcey <sellcey@mips.com>
+
+ * include/longlong.h: Import latest version from GCC tree.
+
2014-04-23 Andrew Bennett <andrew.bennett@imgtec.com>
* opcode/mips.h (ASE_XPA): New define.
diff --git a/include/longlong.h b/include/longlong.h
index 5f00e54..31f88cb 100644
--- a/include/longlong.h
+++ b/include/longlong.h
@@ -1,5 +1,5 @@
/* longlong.h -- definitions for mixed size 32/64 bit arithmetic.
- Copyright (C) 1991-2013 Free Software Foundation, Inc.
+ Copyright (C) 1991-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -122,6 +122,22 @@ extern const UQItype __clz_tab[256] attribute_hidden;
#define __AND_CLOBBER_CC , "cc"
#endif /* __GNUC__ < 2 */
+#if defined (__aarch64__)
+
+#if W_TYPE_SIZE == 32
+#define count_leading_zeros(COUNT, X) ((COUNT) = __builtin_clz (X))
+#define count_trailing_zeros(COUNT, X) ((COUNT) = __builtin_ctz (X))
+#define COUNT_LEADING_ZEROS_0 32
+#endif /* W_TYPE_SIZE == 32 */
+
+#if W_TYPE_SIZE == 64
+#define count_leading_zeros(COUNT, X) ((COUNT) = __builtin_clzll (X))
+#define count_trailing_zeros(COUNT, X) ((COUNT) = __builtin_ctzll (X))
+#define COUNT_LEADING_ZEROS_0 64
+#endif /* W_TYPE_SIZE == 64 */
+
+#endif /* __aarch64__ */
+
#if defined (__alpha) && W_TYPE_SIZE == 64
#define umul_ppmm(ph, pl, m0, m1) \
do { \
@@ -467,7 +483,7 @@ extern UDItype __umulsidi3 (USItype, USItype);
#define UDIV_TIME 40
#endif /* 80x86 */
-#if (defined (__x86_64__) || defined (__i386__)) && W_TYPE_SIZE == 64
+#if defined (__x86_64__) && W_TYPE_SIZE == 64
#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
__asm__ ("add{q} {%5,%1|%1,%5}\n\tadc{q} {%3,%0|%0,%3}" \
: "=r" ((UDItype) (sh)), \
@@ -832,7 +848,7 @@ extern UDItype __umulsidi3 (USItype, USItype);
#define UMUL_TIME 10
#define UDIV_TIME 100
-#if (__mips == 32 || __mips == 64) && ! __mips16
+#if (__mips == 32 || __mips == 64) && ! defined (__mips16)
#define count_leading_zeros(COUNT,X) ((COUNT) = __builtin_clz (X))
#define COUNT_LEADING_ZEROS_0 32
#endif