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

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