From: Steve Ellcey <sellcey@mips.com>
Date: Thu, 1 May 2014 17:09:04 +0000 (-0700)
Subject: 2014-05-01  Steve Ellcey  <sellcey@mips.com>
X-Git-Tag: glibc-2.20~563
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6426d77e47f011086dea324801e5c0a612455831;p=platform%2Fupstream%2Fglibc.git

2014-05-01  Steve Ellcey  <sellcey@mips.com>

	* stdlib/longlong.h: Updated from GCC.
---

diff --git a/ChangeLog b/ChangeLog
index 8e8582c..4a13b22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-01  Steve Ellcey  <sellcey@mips.com>
+
+	* stdlib/longlong.h: Updated from GCC.
+
 2014-05-01  Will Newton  <will.newton@linaro.org>
 	    Bernard Ogden  <bernie.ogden@linaro.org>
 
diff --git a/stdlib/longlong.h b/stdlib/longlong.h
index d45dbe2..31f88cb 100644
--- a/stdlib/longlong.h
+++ b/stdlib/longlong.h
@@ -483,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)),					\
@@ -848,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