S/390: Fix longlong.h inline asms for zarch

diff --git a/ChangeLog b/ChangeLog
index aa973c2d06441367d0922389406c236598253e37..428847701d87c5721f497b0b321fc5c43105843f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-04  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+       * stdlib/longlong.h: Update from GCC.  Fix zarch smul_ppmm and
+       sdiv_qrnnd.
+
 2011-10-07  Ulrich Drepper  <drepper@gmail.com>
 
        * string/test-memcmp.c: Avoid unncessary #defines.

diff --git a/stdlib/longlong.h b/stdlib/longlong.h
index 1bab76db33a109f0558e7fd97b5fd305008ffbae..60b35a3ac35366fa26099474943e63f02e2a0969 100644 (file)
--- a/stdlib/longlong.h
+++ b/stdlib/longlong.h
@@ -1,6 +1,6 @@
 /* longlong.h -- definitions for mixed size 32/64 bit arithmetic.
    Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of the GNU C Library.
@@ -343,23 +343,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;                              \
-                                                                        \
-    __asm__ ("dr\t%%r0,%3"                                             \
-            : "=r" (r0), "=r" (r1)                                     \
-            : "r" (r0), "r" (r1), "r" (d));                            \
-    (q) = r0; (r) = r1;                                                \
+    register SItype __r0 __asm__ ("0") = (n1);                         \
+    register SItype __r1 __asm__ ("1") = (n0);                         \
+                                                                       \
+    __asm__ ("dr\t%%r0,%4"                                              \
+            : "=r" (__r0), "=r" (__r1)                                 \
+            : "r" (__r0), "r" (__r1), "r" (d));                        \
+    (q) = __r1; (r) = __r0;                                            \
   } while (0)
 #endif /* __zarch__ */
 #endif
@@ -801,9 +802,9 @@ UDItype __umulsidi3 (USItype, USItype);
 #define count_trailing_zeros(count,x) \
   do {                                                                 \
     __asm__ ("ffsd     %2,%0"                                          \
-            : "=r" ((USItype) (count))                                 \
-            : "0" ((USItype) 0),                                       \
-              "r" ((USItype) (x)));                                    \
+           : "=r" ((USItype) (count))                                  \
+           : "0" ((USItype) 0),                                        \
+             "r" ((USItype) (x)));                                     \
   } while (0)
 #endif /* __ns32000__ */
 
@@ -819,7 +820,7 @@ UDItype __umulsidi3 (USItype, USItype);
      || defined (__ppc__)      /* Darwin */                            \
      || (defined (PPC) && ! defined (CPU_FAMILY)) /* gcc 2.7.x GNU&SysV */    \
      || (defined (PPC) && defined (CPU_FAMILY)    /* VxWorks */               \
-         && CPU_FAMILY == PPC)                                                \
+        && CPU_FAMILY == PPC)                                                \
      ) && W_TYPE_SIZE == 32
 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
   do {                                                                 \
@@ -860,7 +861,7 @@ UDItype __umulsidi3 (USItype, USItype);
   || defined (__ppc__)                                                    \
   || (defined (PPC) && ! defined (CPU_FAMILY)) /* gcc 2.7.x GNU&SysV */       \
   || (defined (PPC) && defined (CPU_FAMILY)    /* VxWorks */                  \
-         && CPU_FAMILY == PPC)
+        && CPU_FAMILY == PPC)
 #define umul_ppmm(ph, pl, m0, m1) \
   do {                                                                 \
     USItype __m0 = (m0), __m1 = (m1);                                  \
@@ -1028,7 +1029,7 @@ UDItype __umulsidi3 (USItype, USItype);
 #define udiv_qrnnd(q, r, n1, n0, d) \
   do {                                                                 \
     extern UWtype __udiv_qrnnd_16 (UWtype, UWtype)                     \
-                        __attribute__ ((visibility ("hidden")));       \
+                       __attribute__ ((visibility ("hidden")));        \
     /* r0: rn r1: qn */ /* r0: n1 r4: n0 r5: d r6: d1 */ /* r2: __m */ \
     __asm__ (                                                          \
        "mov%M4 %4,r5\n"                                                \
@@ -1163,8 +1164,8 @@ UDItype __umulsidi3 (USItype, USItype);
 #define count_leading_zeros(count, x) \
   do {                                                                  \
   __asm__ ("scan %1,1,%0"                                               \
-           : "=r" ((USItype) (count))                                   \
-           : "r" ((USItype) (x)));                                     \
+          : "=r" ((USItype) (count))                                   \
+          : "r" ((USItype) (x)));                                      \
   } while (0)
 /* Early sparclites return 63 for an argument of 0, but they warn that future
    implementations might change this.  Therefore, leave COUNT_LEADING_ZEROS_0