From: Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
Date: Tue, 4 Oct 2011 07:27:01 +0000 (+0000)
Subject: longlong.h (smul_ppmm, sdiv_qrnnd): Add underscores to the local variables.
X-Git-Tag: upstream/12.2.0~80984
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aecb6197237d88797df2334cd20c89697a54c438;p=platform%2Fupstream%2Fgcc.git

longlong.h (smul_ppmm, sdiv_qrnnd): Add underscores to the local variables.

2011-10-04  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	* longlong.h (smul_ppmm, sdiv_qrnnd): Add underscores to the local
	variables.  Fix second operand of DR.  Swap inputs for sdiv_qrnnd.

From-SVN: r179491
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bdbe2a3..f332285 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-04  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* longlong.h (smul_ppmm, sdiv_qrnnd): Add underscores to the local
+	variables.  Fix second operand of DR.  Swap inputs for sdiv_qrnnd.
+
 2011-10-03  David S. Miller  <davem@davemloft.net>
 
 	* config/sparc/sparc.md (fpack16_vis, fpackfix_vis, fpack32_vis): Make
diff --git a/gcc/longlong.h b/gcc/longlong.h
index 82ced17..30cc2e3 100644
--- a/gcc/longlong.h
+++ b/gcc/longlong.h
@@ -365,23 +365,24 @@ UDItype __umulsidi3 (USItype, USItype);
 #else
 #define smul_ppmm(xh, xl, m0, m1) \
   do {                                                                  \
-    register SItype r0 __asm__ ("0");                                   \
-    register SItype r1 __asm__ ("1") = m0;                              \
+    register SItype __r0 __asm__ ("0");					\
+    register SItype __r1 __asm__ ("1") = (m0);				\
                                                                         \
     __asm__ ("mr\t%%r0,%3"                                              \
-             : "=r" (r0), "=r" (r1)                                     \
-             : "r"  (r1),  "r" (m1));                                   \
-    (xh) = r0; (xl) = r1;                                               \
+             : "=r" (__r0), "=r" (__r1)					\
+             : "r"  (__r1),  "r" (m1));					\
+    (xh) = __r0; (xl) = __r1;						\
   } while (0)
+
 #define sdiv_qrnnd(q, r, n1, n0, d) \
-  do {									\
-    register SItype r0 __asm__ ("0") = n0;                              \
-    register SItype r1 __asm__ ("1") = n1;                              \
+  do {                                                                  \
+    register SItype __r0 __asm__ ("0") = (n1);				\
+    register SItype __r1 __asm__ ("1") = (n0);				\
                                                                         \
-    __asm__ ("dr\t%%r0,%3"						\
-	     : "=r" (r0), "=r" (r1)		         		\
-	     : "r" (r0), "r" (r1), "r" (d));				\
-    (q) = r0; (r) = r1;                  				\
+    __asm__ ("dr\t%%r0,%4"                                              \
+             : "=r" (__r0), "=r" (__r1)					\
+             : "r" (__r0), "r" (__r1), "r" (d));			\
+    (q) = __r1; (r) = __r0;						\
   } while (0)
 #endif /* __zarch__ */
 #endif