lll: avoid shadow warnings

use __ret uniformly to avoid shadow warnings as seen on x86_64.

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
index ab1a939..db951a1 100644 (file)
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
@@ -336,7 +336,7 @@ LLL_STUB_UNWIND_INFO_END
     })
 
 #define lll_robust_lock(futex, id, private) \
-  ({ int __result, ignore1, ignore2;                                         \
+  ({ int __ret, ignore1, ignore2;                                            \
      __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %1, %2\n\t"                          \
                       "jnz _L_robust_lock_%=\n\t"                            \
                       ".subsection 1\n\t"                                    \
@@ -350,11 +350,11 @@ LLL_STUB_UNWIND_INFO_END
                       ".previous\n"                                          \
                       LLL_STUB_UNWIND_INFO_4                                 \
                       "18:"                                                  \
-                      : "=a" (__result), "=c" (ignore1), "=m" (futex),       \
+                      : "=a" (__ret), "=c" (ignore1), "=m" (futex),          \
                         "=&d" (ignore2)                                      \
                       : "0" (0), "1" (id), "m" (futex), "g" ((int) (private))\
                       : "memory");                                           \
-     __result; })
+     __ret; })
 
 
 /* Special version of lll_lock which causes the unlock function to
@@ -383,7 +383,7 @@ LLL_STUB_UNWIND_INFO_END
 
 
 #define lll_robust_cond_lock(futex, id, private) \
-  ({ int __result, ignore1, ignore2;                                         \
+  ({ int __ret, ignore1, ignore2;                                            \
      __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %1, %2\n\t"                          \
                       "jnz _L_robust_cond_lock_%=\n\t"                       \
                       ".subsection 1\n\t"                                    \
@@ -397,16 +397,16 @@ LLL_STUB_UNWIND_INFO_END
                       ".previous\n"                                          \
                       LLL_STUB_UNWIND_INFO_4                                 \
                       "18:"                                                  \
-                      : "=a" (__result), "=c" (ignore1), "=m" (futex),       \
+                      : "=a" (__ret), "=c" (ignore1), "=m" (futex),          \
                         "=&d" (ignore2)                                      \
                       : "0" (0), "1" (id | FUTEX_WAITERS), "m" (futex),      \
                         "g" ((int) (private))                                \
                       : "memory");                                           \
-     __result; })
+     __ret; })
 
 
 #define lll_timedlock(futex, timeout, private) \
-  ({ int __result, ignore1, ignore2, ignore3;                                \
+  ({ int __ret, ignore1, ignore2, ignore3;                                   \
      __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %1, %3\n\t"                          \
                       "jnz _L_timedlock_%=\n\t"                              \
                       ".subsection 1\n\t"                                    \
@@ -420,16 +420,16 @@ LLL_STUB_UNWIND_INFO_END
                       ".previous\n"                                          \
                       LLL_STUB_UNWIND_INFO_4                                 \
                       "18:"                                                  \
-                      : "=a" (__result), "=c" (ignore1), "=&d" (ignore2),      \
+                      : "=a" (__ret), "=c" (ignore1), "=&d" (ignore2),      \
                         "=m" (futex), "=S" (ignore3)                         \
                       : "0" (0), "1" (1), "m" (futex), "m" (timeout),        \
                         "4" ((int) (private))                                \
                       : "memory");                                           \
-     __result; })
+     __ret; })
 
 
 #define lll_robust_timedlock(futex, timeout, id, private) \
-  ({ int __result, ignore1, ignore2, ignore3;                                \
+  ({ int __ret, ignore1, ignore2, ignore3;                                   \
      __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %1, %3\n\t"                          \
                       "jnz _L_robust_timedlock_%=\n\t"                       \
                       ".subsection 1\n\t"                                    \
@@ -443,12 +443,12 @@ LLL_STUB_UNWIND_INFO_END
                       ".previous\n"                                          \
                       LLL_STUB_UNWIND_INFO_4                                 \
                       "18:"                                                  \
-                      : "=a" (__result), "=c" (ignore1), "=&d" (ignore2),      \
+                      : "=a" (__ret), "=c" (ignore1), "=&d" (ignore2),      \
                         "=m" (futex), "=S" (ignore3)                         \
                       : "0" (0), "1" (id), "m" (futex), "m" (timeout),       \
                         "4" ((int) (private))                                \
                       : "memory");                                           \
-     __result; })
+     __ret; })
 
 #if defined NOT_IN_libc || defined UP
 # define __lll_unlock_asm LOCK_INSTR "subl $1, %0\n\t"
@@ -570,15 +570,15 @@ extern int __lll_timedwait_tid (int *tid, const struct timespec *abstime)
      __attribute__ ((regparm (2))) attribute_hidden;
 #define lll_timedwait_tid(tid, abstime) \
   ({                                                                         \
-    int __result = 0;                                                        \
+    int __ret = 0;                                                           \
     if (tid != 0)                                                            \
       {                                                                              \
        if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)           \
-         __result = EINVAL;                                                  \
+         __ret = EINVAL;                                                     \
        else                                                                  \
-         __result = __lll_timedwait_tid (&tid, abstime);                     \
+         __ret = __lll_timedwait_tid (&tid, abstime);                \
       }                                                                              \
-    __result; })
+    __ret; })
 
 #endif  /* !__ASSEMBLER__ */
 

diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
index 0ea67e0..d10cd61 100644 (file)
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
@@ -98,7 +98,7 @@ extern int __lll_unlock_wake_private (int *__futex) attribute_hidden;
 extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden;
 
 #define lll_trylock(futex) \
-  ({ unsigned char __result; \
+  ({ unsigned char __ret; \
      __asm__ __volatile__ ("\
        .align 2\n\
        mova 1f,r0\n\
@@ -112,15 +112,15 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden;
      1: mov r1,r15\n\
        mov #-1,%0\n\
        negc %0,%0"\
-       : "=r" (__result) \
+       : "=r" (__ret) \
        : "r" (&(futex)), \
          "r" (LLL_LOCK_INITIALIZER_LOCKED), \
          "r" (LLL_LOCK_INITIALIZER) \
        : "r0", "r1", "r2", "t", "memory"); \
-     __result; })
+     __ret; })
 
 #define lll_robust_trylock(futex, id)  \
-  ({ unsigned char __result; \
+  ({ unsigned char __ret; \
      __asm__ __volatile__ ("\
        .align 2\n\
        mova 1f,r0\n\
@@ -134,15 +134,15 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden;
      1: mov r1,r15\n\
        mov #-1,%0\n\
        negc %0,%0"\
-       : "=r" (__result) \
+       : "=r" (__ret) \
        : "r" (&(futex)), \
          "r" (id), \
          "r" (LLL_LOCK_INITIALIZER) \
        : "r0", "r1", "r2", "t", "memory"); \
-     __result; })
+     __ret; })
 
 #define lll_cond_trylock(futex) \
-  ({ unsigned char __result; \
+  ({ unsigned char __ret; \
      __asm__ __volatile__ ("\
        .align 2\n\
        mova 1f,r0\n\
@@ -156,15 +156,15 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden;
      1: mov r1,r15\n\
        mov #-1,%0\n\
        negc %0,%0"\
-       : "=r" (__result) \
+       : "=r" (__ret) \
        : "r" (&(futex)), \
          "r" (LLL_LOCK_INITIALIZER_WAITERS), \
          "r" (LLL_LOCK_INITIALIZER) \
        : "r0", "r1", "r2", "t", "memory"); \
-     __result; })
+     __ret; })
 
 #define lll_lock(futex, private) \
-  (void) ({ int __result, *__futex = &(futex); \
+  (void) ({ int __ret, *__futex = &(futex); \
            __asm__ __volatile__ ("\
                .align 2\n\
                mova 1f,r0\n\
@@ -176,20 +176,20 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden;
                bf 1f\n\
                mov.l %1,@%2\n\
             1: mov r1,r15"\
-               : "=&r" (__result) : "r" (1), "r" (__futex) \
+               : "=&r" (__ret) : "r" (1), "r" (__futex) \
                : "r0", "r1", "t", "memory"); \
-           if (__result) \
+           if (__ret) \
              { \
                if (__builtin_constant_p (private) \
                    && (private) == LLL_PRIVATE) \
-                 __lll_lock_wait_private (__result, __futex); \
+                 __lll_lock_wait_private (__ret, __futex); \
                else \
-                 __lll_lock_wait (__result, __futex, (private));       \
+                 __lll_lock_wait (__ret, __futex, (private));  \
              } \
     })
 
 #define lll_robust_lock(futex, id, private) \
-  ({ int __result, *__futex = &(futex); \
+  ({ int __ret, *__futex = &(futex); \
      __asm__ __volatile__ ("\
        .align 2\n\
        mova 1f,r0\n\
@@ -201,16 +201,16 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden;
        bf 1f\n\
        mov.l %1,@%2\n\
       1: mov r1,r15"\
-       : "=&r" (__result) : "r" (id), "r" (__futex) \
+       : "=&r" (__ret) : "r" (id), "r" (__futex) \
        : "r0", "r1", "t", "memory"); \
-     if (__result) \
-       __result = __lll_robust_lock_wait (__result, __futex, private); \
-     __result; })
+     if (__ret) \
+       __ret = __lll_robust_lock_wait (__ret, __futex, private); \
+     __ret; })
 
 /* Special version of lll_mutex_lock which causes the unlock function to
    always wakeup waiters.  */
 #define lll_cond_lock(futex, private) \
-  (void) ({ int __result, *__futex = &(futex); \
+  (void) ({ int __ret, *__futex = &(futex); \
            __asm__ __volatile__ ("\
                .align 2\n\
                mova 1f,r0\n\
@@ -222,13 +222,13 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden;
                bf 1f\n\
                mov.l %1,@%2\n\
             1: mov r1,r15"\
-               : "=&r" (__result) : "r" (2), "r" (__futex) \
+               : "=&r" (__ret) : "r" (2), "r" (__futex) \
                : "r0", "r1", "t", "memory"); \
-           if (__result) \
-             __lll_lock_wait (__result, __futex, private); })
+           if (__ret) \
+             __lll_lock_wait (__ret, __futex, private); })
 
 #define lll_robust_cond_lock(futex, id, private) \
-  ({ int __result, *__futex = &(futex); \
+  ({ int __ret, *__futex = &(futex); \
      __asm__ __volatile__ ("\
        .align 2\n\
        mova 1f,r0\n\
@@ -240,14 +240,14 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden;
        bf 1f\n\
        mov.l %1,@%2\n\
      1: mov r1,r15"\
-       : "=&r" (__result) : "r" (id | FUTEX_WAITERS), "r" (__futex) \
+       : "=&r" (__ret) : "r" (id | FUTEX_WAITERS), "r" (__futex) \
        : "r0", "r1", "t", "memory"); \
-      if (__result) \
-       __result = __lll_robust_lock_wait (__result, __futex, private); \
-      __result; })
+      if (__ret) \
+       __ret = __lll_robust_lock_wait (__ret, __futex, private); \
+      __ret; })
 
 #define lll_timedlock(futex, timeout, private) \
-  ({ int __result, *__futex = &(futex); \
+  ({ int __ret, *__futex = &(futex); \
      __asm__ __volatile__ ("\
        .align 2\n\
        mova 1f,r0\n\
@@ -259,14 +259,14 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden;
        bf 1f\n\
        mov.l %1,@%2\n\
      1: mov r1,r15"\
-       : "=&r" (__result) : "r" (1), "r" (__futex) \
+       : "=&r" (__ret) : "r" (1), "r" (__futex) \
        : "r0", "r1", "t", "memory"); \
-    if (__result) \
-      __result = __lll_timedlock_wait (__result, __futex, timeout, private); \
-    __result; })
+    if (__ret) \
+      __ret = __lll_timedlock_wait (__ret, __futex, timeout, private); \
+    __ret; })
 
 #define lll_robust_timedlock(futex, timeout, id, private) \
-  ({ int __result, *__futex = &(futex); \
+  ({ int __ret, *__futex = &(futex); \
      __asm__ __volatile__ ("\
        .align 2\n\
        mova 1f,r0\n\
@@ -278,15 +278,15 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden;
        bf 1f\n\
        mov.l %1,@%2\n\
      1: mov r1,r15"\
-       : "=&r" (__result) : "r" (id), "r" (__futex) \
+       : "=&r" (__ret) : "r" (id), "r" (__futex) \
        : "r0", "r1", "t", "memory"); \
-    if (__result) \
-      __result = __lll_robust_timedlock_wait (__result, __futex, \
+    if (__ret) \
+      __ret = __lll_robust_timedlock_wait (__ret, __futex, \
                                              timeout, private); \
-    __result; })
+    __ret; })
 
 #define lll_unlock(futex, private) \
-  (void) ({ int __result, *__futex = &(futex); \
+  (void) ({ int __ret, *__futex = &(futex); \
            __asm__ __volatile__ ("\
                .align 2\n\
                mova 1f,r0\n\
@@ -296,9 +296,9 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden;
                add #-1,%0\n\
                mov.l %0,@%1\n\
             1: mov r1,r15"\
-               : "=&r" (__result) : "r" (__futex) \
+               : "=&r" (__ret) : "r" (__futex) \
                : "r0", "r1", "memory"); \
-           if (__result) \
+           if (__ret) \
              { \
                if (__builtin_constant_p (private) \
                    && (private) == LLL_PRIVATE) \
@@ -309,7 +309,7 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden;
     })
 
 #define lll_robust_unlock(futex, private) \
-  (void) ({ int __result, *__futex = &(futex); \
+  (void) ({ int __ret, *__futex = &(futex); \
            __asm__ __volatile__ ("\
                .align 2\n\
                mova 1f,r0\n\
@@ -319,9 +319,9 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden;
                and %2,%0\n\
                mov.l %0,@%1\n\
             1: mov r1,r15"\
-               : "=&r" (__result) : "r" (__futex), "r" (FUTEX_WAITERS) \
+               : "=&r" (__ret) : "r" (__futex), "r" (FUTEX_WAITERS) \
                : "r0", "r1", "memory");        \
-           if (__result) \
+           if (__ret) \
              __lll_unlock_wake (__futex, private); })
 
 #define lll_robust_dead(futex, private)                       \
@@ -405,15 +405,15 @@ extern int __lll_timedwait_tid (int *tid, const struct timespec *abstime)
      attribute_hidden;
 #define lll_timedwait_tid(tid, abstime) \
   ({                                                                         \
-    int __result = 0;                                                        \
+    int __ret = 0;                                                           \
     if (tid != 0)                                                            \
       {                                                                              \
        if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)           \
-         __result = EINVAL;                                                  \
+         __ret = EINVAL;                                                     \
        else                                                                  \
-         __result = __lll_timedwait_tid (&tid, abstime);                     \
+         __ret = __lll_timedwait_tid (&tid, abstime);                \
       }                                                                              \
-    __result; })
+    __ret; })
 
 #endif  /* !__ASSEMBLER__ */
 

diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
index ffab81e..afc4013 100644 (file)
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
@@ -332,7 +332,7 @@ LLL_STUB_UNWIND_INFO_END
     })                                                                       \
 
 #define lll_robust_lock(futex, id, private) \
-  ({ int result, ignore1, ignore2;                                           \
+  ({ int __ret, ignore1, ignore2;                                            \
     __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %4, %2\n\t"                           \
                      "jnz 1f\n\t"                                            \
                      ".subsection 1\n\t"                                     \
@@ -348,10 +348,10 @@ LLL_STUB_UNWIND_INFO_END
                      LLL_STUB_UNWIND_INFO_5                                  \
                      "24:"                                                   \
                      : "=S" (ignore1), "=D" (ignore2), "=m" (futex),         \
-                       "=a" (result)                                         \
+                       "=a" (__ret)                                          \
                      : "1" (id), "m" (futex), "3" (0), "0" (private)         \
                      : "cx", "r11", "cc", "memory");                         \
-    result; })
+    __ret; })
 
 #define lll_cond_lock(futex, private) \
   (void)                                                                     \
@@ -377,7 +377,7 @@ LLL_STUB_UNWIND_INFO_END
     })
 
 #define lll_robust_cond_lock(futex, id, private) \
-  ({ int result, ignore1, ignore2;                                           \
+  ({ int __ret, ignore1, ignore2;                                            \
     __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %4, %2\n\t"                           \
                      "jnz 1f\n\t"                                            \
                      ".subsection 1\n\t"                                     \
@@ -393,14 +393,14 @@ LLL_STUB_UNWIND_INFO_END
                      LLL_STUB_UNWIND_INFO_5                                  \
                      "24:"                                                   \
                      : "=S" (ignore1), "=D" (ignore2), "=m" (futex),         \
-                       "=a" (result)                                         \
+                       "=a" (__ret)                                          \
                      : "1" (id | FUTEX_WAITERS), "m" (futex), "3" (0),       \
                        "0" (private)                                         \
                      : "cx", "r11", "cc", "memory");                         \
-    result; })
+    __ret; })
 
 #define lll_timedlock(futex, timeout, private) \
-  ({ int result, ignore1, ignore2, ignore3;                                  \
+  ({ int __ret, ignore1, ignore2, ignore3;                                   \
      __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %1, %4\n\t"                          \
                       "jnz 1f\n\t"                                           \
                       ".subsection 1\n\t"                                    \
@@ -416,15 +416,15 @@ LLL_STUB_UNWIND_INFO_END
                       ".previous\n"                                          \
                       LLL_STUB_UNWIND_INFO_6                                 \
                       "24:"                                                  \
-                      : "=a" (result), "=D" (ignore1), "=S" (ignore2),       \
+                      : "=a" (__ret), "=D" (ignore1), "=S" (ignore2),        \
                         "=&d" (ignore3), "=m" (futex)                        \
                       : "0" (0), "1" (1), "m" (futex), "m" (timeout),        \
                         "2" (private)                                        \
                       : "memory", "cx", "cc", "r10", "r11");                 \
-     result; })
+     __ret; })
 
 #define lll_robust_timedlock(futex, timeout, id, private) \
-  ({ int result, ignore1, ignore2, ignore3;                                  \
+  ({ int __ret, ignore1, ignore2, ignore3;                                   \
      __asm__ __volatile__ (LOCK_INSTR "cmpxchgl %1, %4\n\t"                          \
                       "jnz 1f\n\t"                                           \
                       ".subsection 1\n\t"                                    \
@@ -440,12 +440,12 @@ LLL_STUB_UNWIND_INFO_END
                       ".previous\n"                                          \
                       LLL_STUB_UNWIND_INFO_6                                 \
                       "24:"                                                  \
-                      : "=a" (result), "=D" (ignore1), "=S" (ignore2),       \
+                      : "=a" (__ret), "=D" (ignore1), "=S" (ignore2),       \
                         "=&d" (ignore3), "=m" (futex)                        \
                       : "0" (0), "1" (id), "m" (futex), "m" (timeout),       \
                         "2" (private)                                        \
                       : "memory", "cx", "cc", "r10", "r11");                 \
-     result; })
+     __ret; })
 
 #if defined NOT_IN_libc || defined UP
 # define __lll_unlock_asm_start LOCK_INSTR "decl %0\n\t"                     \
@@ -583,15 +583,15 @@ extern int __lll_timedwait_tid (int *tid, const struct timespec *abstime)
      attribute_hidden;
 #define lll_timedwait_tid(tid, abstime) \
   ({                                                                         \
-    int __result = 0;                                                        \
+    int __ret = 0;                                                           \
     if (tid != 0)                                                            \
       {                                                                              \
        if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)           \
-         __result = EINVAL;                                                  \
+         __ret = EINVAL;                                                     \
        else                                                                  \
-         __result = __lll_timedwait_tid (&tid, abstime);                     \
+         __ret = __lll_timedwait_tid (&tid, abstime);                \
       }                                                                              \
-    __result; })
+    __ret; })
 
 #endif  /* !__ASSEMBLER__ */