Blame SOURCES/glibc-rh1505492-s390-backtrace.patch

00db10
commit 618cebeff82ae775308eb29d7891e22861411e21
00db10
Author: Stefan Liebler <stli@linux.vnet.ibm.com>
00db10
Date:   Thu Nov 13 10:42:31 2014 +0100
00db10
00db10
    S/390: Get rid of warning: the comparision will always evaluate as false.
00db10
00db10
diff --git a/sysdeps/s390/s390-32/backtrace.c b/sysdeps/s390/s390-32/backtrace.c
00db10
index 1dbe37eeb6f6db08..0db076804895e200 100644
00db10
--- a/sysdeps/s390/s390-32/backtrace.c
00db10
+++ b/sysdeps/s390/s390-32/backtrace.c
00db10
@@ -77,10 +77,6 @@ init (void)
00db10
   if (unwind_getip == NULL)
00db10
     unwind_backtrace = NULL;
00db10
 }
00db10
-#else
00db10
-# define unwind_backtrace _Unwind_Backtrace
00db10
-# define unwind_getip _Unwind_GetIP
00db10
-#endif
00db10
 
00db10
 static int
00db10
 __backchain_backtrace (void **array, int size)
00db10
@@ -107,6 +103,10 @@ __backchain_backtrace (void **array, int size)
00db10
 
00db10
   return cnt;
00db10
 }
00db10
+#else
00db10
+# define unwind_backtrace _Unwind_Backtrace
00db10
+# define unwind_getip _Unwind_GetIP
00db10
+#endif
00db10
 
00db10
 static _Unwind_Reason_Code
00db10
 backtrace_helper (struct _Unwind_Context *ctx, void *a)
00db10
@@ -130,9 +130,10 @@ __backtrace (void **array, int size)
00db10
   __libc_once_define (static, once);
00db10
 
00db10
   __libc_once (once, init);
00db10
-#endif
00db10
+
00db10
   if (unwind_backtrace == NULL)
00db10
     return __backchain_backtrace (array, size);
00db10
+#endif
00db10
 
00db10
   if (size >= 1)
00db10
     unwind_backtrace (backtrace_helper, &arg;;
00db10
diff --git a/sysdeps/s390/s390-64/backtrace.c b/sysdeps/s390/s390-64/backtrace.c
00db10
index 562d461f97ad5bca..548d312f3cc05151 100644
00db10
--- a/sysdeps/s390/s390-64/backtrace.c
00db10
+++ b/sysdeps/s390/s390-64/backtrace.c
00db10
@@ -76,12 +76,8 @@ init (void)
00db10
   if (unwind_getip == NULL)
00db10
     unwind_backtrace = NULL;
00db10
 }
00db10
-#else
00db10
-# define unwind_backtrace _Unwind_Backtrace
00db10
-# define unwind_getip _Unwind_GetIP
00db10
-#endif
00db10
 
00db10
-int
00db10
+static int
00db10
 __backchain_backtrace (void **array, int size)
00db10
 {
00db10
   /* We assume that all the code is generated with frame pointers set.  */
00db10
@@ -106,6 +102,10 @@ __backchain_backtrace (void **array, int size)
00db10
 
00db10
   return cnt;
00db10
 }
00db10
+#else
00db10
+# define unwind_backtrace _Unwind_Backtrace
00db10
+# define unwind_getip _Unwind_GetIP
00db10
+#endif
00db10
 
00db10
 static _Unwind_Reason_Code
00db10
 backtrace_helper (struct _Unwind_Context *ctx, void *a)
00db10
@@ -129,9 +129,10 @@ __backtrace (void **array, int size)
00db10
   __libc_once_define (static, once);
00db10
 
00db10
   __libc_once (once, init);
00db10
-#endif
00db10
+
00db10
   if (unwind_backtrace == NULL)
00db10
     return __backchain_backtrace (array, size);
00db10
+#endif
00db10
 
00db10
   if (size >= 1)
00db10
     unwind_backtrace (backtrace_helper, &arg;;