This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.10-242-g66ae9e5
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 31 Jul 2009 19:58:00 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.10-242-g66ae9e5
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 66ae9e50a336d87f943cc6314a0d405820fcdf8b (commit)
from 6f6f1215f68e5ae15ad18373234815fe7b2acc9e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=66ae9e50a336d87f943cc6314a0d405820fcdf8b
commit 66ae9e50a336d87f943cc6314a0d405820fcdf8b
Author: Ulrich Drepper <drepper@redhat.com>
Date: Fri Jul 31 12:57:45 2009 -0700
Fix ____longjmp_chk on x86-64.
After a recent change to fix CFI in ____longjmp_chk the test of the
ss_flags used the wrong memory location.
diff --git a/ChangeLog b/ChangeLog
index 8759b2c..fb046fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-31 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S (longjmp_msg): Get
+ ss_flags from the correct location.
+
2009-07-31 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/i386/i686/Makefile (sysdep_routines): Add cacheinfo.
diff --git a/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
index 80e4aff..4e53ea6 100644
--- a/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
+++ b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
@@ -77,7 +77,7 @@ ENTRY(____longjmp_chk)
leaq 24(%rsp), %rsp
cfi_adjust_cfa_offset(-24)
jne .Lok
- movl 8(%rsp), %eax
+ movl -16(%rsp), %eax
andl $1, %eax
.Lok:
@@ -122,7 +122,7 @@ ENTRY(____longjmp_chk)
syscall
addq $24, %rsp
cfi_adjust_cfa_offset(-24)
- testl $1, 8(%rsp)
+ testl $1, -16(%rsp)
je .Lout
.Lfail: xchgq %r8, %rsp
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources