about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-12-01 00:44:22 +0000
committerUlrich Drepper <drepper@redhat.com>2006-12-01 00:44:22 +0000
commit610fa4a324a6311fe345dc9b50bec3ac327293b2 (patch)
tree75923c0b73ab963458b70cc15e80216df354a6d8
parent5df4fe083318e752210652353b9750c6d8ca6714 (diff)
downloadglibc-610fa4a324a6311fe345dc9b50bec3ac327293b2.tar.gz
glibc-610fa4a324a6311fe345dc9b50bec3ac327293b2.tar.xz
glibc-610fa4a324a6311fe345dc9b50bec3ac327293b2.zip
* sysdeps/unix/sysv/linux/x86_64/sigaction.c: Fix compatibility with cvs/fedora-glibc-20061201T0821
	libgcc not supporting `rflags' unwinding (register # >= 17).
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/sigaction.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ffffeb2481..e164a1614b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* sysdeps/unix/sysv/linux/x86_64/sigaction.c: Fix compatibility with
+	libgcc not supporting `rflags' unwinding (register # >= 17).
+
 2006-11-30  Jakub Jelinek  <jakub@redhat.com>
 
 	* sunrpc/svc_run.c (svc_run): Set my_pollfd to new_pollfd if realloc
diff --git a/sysdeps/unix/sysv/linux/x86_64/sigaction.c b/sysdeps/unix/sysv/linux/x86_64/sigaction.c
index 0d56364ab7..ab10123858 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sigaction.c
+++ b/sysdeps/unix/sysv/linux/x86_64/sigaction.c
@@ -174,7 +174,8 @@ asm									\
    do_expr (2 /* rcx */, oRCX)						\
    do_expr (7 /* rsp */, oRSP)						\
    do_expr (16 /* rip */, oRIP)						\
-   do_expr (49 /* rflags */, oEFL)					\
+   /* libgcc-4.1.1 has only `DWARF_FRAME_REGISTERS == 17'.  */		\
+   /* do_expr (49 |* rflags *|, oEFL) */				\
    /* `cs'/`ds'/`fs' are unaligned and a different size.  */		\
    /* gas: Error: register save offset not a multiple of 8  */		\
    "	.align 8\n"							\