This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [Patch] Fix __mips16 undef macro warnings.
- From: Steve Ellcey <sellcey at mips dot com>
- To: Carlos O'Donell <carlos at redhat dot com>
- Cc: "Joseph S. Myers" <joseph at codesourcery dot com>, <libc-alpha at sourceware dot org>, <yufeng dot zhang at arm dot com>
- Date: Thu, 1 May 2014 09:30:57 -0700
- Subject: Re: [Patch] Fix __mips16 undef macro warnings.
- Authentication-results: sourceware.org; auth=none
- References: <e6d220e3-a7a2-44ba-841f-d0345c15b290 at BAMAIL02 dot ba dot imgtec dot org> <535FF3AE dot 1070301 at redhat dot com> <535FF4E4 dot 3030803 at redhat dot com> <Pine dot LNX dot 4 dot 64 dot 1404292100250 dot 14769 at digraph dot polyomino dot org dot uk> <5360169F dot 30106 at redhat dot com>
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.
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