Fix __mips16 undef macro warnings.

Message ID 1398961857.5201.29.camel@ubuntu-sellcey
State Committed
Headers

Commit Message

Steve Ellcey May 1, 2014, 4:30 p.m. UTC
  I have checked in the __mips16 change to longlong.h into the GCC and
binutils trees.  Is it OK to check in this patch to bring the glibc
header file into line with these two files.  In addition to my change
there is also a change Richard Sandiford made for x86.

Steve Ellcey
sellcey@mips.com



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

	* stdlib/longlong.h: Updated from GCC.
  

Comments

Roland McGrath May 1, 2014, 4:57 p.m. UTC | #1
That's fine.
  

Patch

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