Author: aurel32
Date: 2010-01-31 00:02:24 +0000 (Sun, 31 Jan 2010)
New Revision: 4122

Added:
   glibc-package/branches/eglibc-2.11/debian/patches/s390/cvs-longjmp.diff
Modified:
   glibc-package/branches/eglibc-2.11/debian/changelog
   glibc-package/branches/eglibc-2.11/debian/patches/series
Log:
  * Add debian/patches/s390/cvs-longjmp.diff from upstream to fix 
____longjmp_chk
    on s390 and s390x.



Modified: glibc-package/branches/eglibc-2.11/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/changelog 2010-01-30 23:56:49 UTC 
(rev 4121)
+++ glibc-package/branches/eglibc-2.11/debian/changelog 2010-01-31 00:02:24 UTC 
(rev 4122)
@@ -32,6 +32,8 @@
 
   [ Aurelien Jarno ]
   * Enable multi-arch.
+  * Add debian/patches/s390/cvs-longjmp.diff from upstream to fix 
____longjmp_chk
+    on s390 and s390x.
 
   [ Samuel Thibault ]
   * debian/patches/hurd-i386/submitted-rtld_lock_recursive.diff: New patch to

Added: glibc-package/branches/eglibc-2.11/debian/patches/s390/cvs-longjmp.diff
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/s390/cvs-longjmp.diff     
                        (rev 0)
+++ glibc-package/branches/eglibc-2.11/debian/patches/s390/cvs-longjmp.diff     
2010-01-31 00:02:24 UTC (rev 4122)
@@ -0,0 +1,33 @@
+2010-01-20  Andreas Schwab  <sch...@redhat.com>
+
+       * sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c
+       (CHECK_SP): Fix check for alternate stack.
+       * sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c
+       (CHECK_SP): Likewise.
+
+diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c 
b/sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c
+index b28e587..f2c1518 100644
+--- a/sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c
++++ b/sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c
+@@ -46,7 +46,7 @@
+           {                                                           \
+             if ((oss.ss_flags & SS_ONSTACK) == 0                      \
+                 || ((uintptr_t) (oss.ss_sp + oss.ss_size) - new_sp    \
+-                    >= oss.ss_size))                                  \
++                    < oss.ss_size))                                   \
+               __fortify_fail ("longjmp causes uninitialized stack frame");\
+           }                                                           \
+       }                                                               \
+diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c 
b/sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c
+index dcf58fb..261be25 100644
+--- a/sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c
++++ b/sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c
+@@ -46,7 +46,7 @@
+           {                                                           \
+             if ((oss.ss_flags & SS_ONSTACK) == 0                      \
+                 || ((uintptr_t) (oss.ss_sp + oss.ss_size) - new_sp    \
+-                    >= oss.ss_size))                                  \
++                    < oss.ss_size))                                   \
+               __fortify_fail ("longjmp causes uninitialized stack frame");\
+           }                                                           \
+       }                                                               \

Modified: glibc-package/branches/eglibc-2.11/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/series    2010-01-30 
23:56:49 UTC (rev 4121)
+++ glibc-package/branches/eglibc-2.11/debian/patches/series    2010-01-31 
00:02:24 UTC (rev 4122)
@@ -129,6 +129,7 @@
 mips/local-r10k.diff
 
 s390/submitted-nexttowardf.diff
+s390/cvs-longjmp.diff
 
 sh4/local-fpscr_values.diff
 sh4/submitted-set_fpscr.diff


-- 
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to