about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-06-03 18:51:43 -0700
committerDavid S. Miller <davem@davemloft.net>2012-06-03 18:51:43 -0700
commit2fd6ff133bc7df197ff3c00f50b3f9a485095b9c (patch)
tree67732fa140e26c953772eda7b2da42c6bb036768
parent173f7220451fc0028836b8c529a1143e4fc14e9c (diff)
downloadglibc-2fd6ff133bc7df197ff3c00f50b3f9a485095b9c.tar.gz
glibc-2fd6ff133bc7df197ff3c00f50b3f9a485095b9c.tar.xz
glibc-2fd6ff133bc7df197ff3c00f50b3f9a485095b9c.zip
Sync longlong.h with GCC to fix a sparc regression.
	* stdlib/longlong.h: Updated from GCC.
-rw-r--r--ChangeLog4
-rw-r--r--stdlib/longlong.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index adf6c88d80..e207e4e9e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-03  David S. Miller  <davem@davemloft.net>
+
+	* stdlib/longlong.h: Updated from GCC.
+
 2012-06-02  Andreas Schwab  <schwab@linux-m68k.org>
 
 	[BZ #14042]
diff --git a/stdlib/longlong.h b/stdlib/longlong.h
index ad42907f54..0427718396 100644
--- a/stdlib/longlong.h
+++ b/stdlib/longlong.h
@@ -1343,7 +1343,7 @@ UDItype __umulsidi3 (USItype, USItype);
     __asm__ ("subcc\t%r5,%6,%1\n\t"					\
 	     "sub\t%r3,%4,%0\n\t"					\
 	     "movcs\t%%xcc, 1, %2\n\t"					\
-	     "add\t%0, %2, %0"						\
+	     "sub\t%0, %2, %0"						\
 	     : "=r" ((UDItype)(sh)),				      	\
 	       "=&r" ((UDItype)(sl)),				      	\
 	       "+r" (__carry)				      		\