[gentoo-commits] gentoo commit in src/patchsets/glibc/2.18: 00_all_0013-alpha-Fix-signal-thunk-unwind-info.patch README.history

[Mike Frysinger (vapier)]

vapier      13/11/24 17:45:00

  Modified:             README.history
  Added:               
                        00_all_0013-alpha-Fix-signal-thunk-unwind-info.patch
  Log:
  add fix from upstream for signal handling #480740 by Tobias Klausmann

Revision  Changes    Path
1.2                  src/patchsets/glibc/2.18/README.history

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.18/README.history?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.18/README.history?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.18/README.history?r1=1.1&r2=1.2

Index: README.history
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/2.18/README.history,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.history	16 Aug 2013 21:35:16 -0000	1.1
+++ README.history	24 Nov 2013 17:45:00 -0000	1.2
@@ -1,3 +1,9 @@
+2		24 Nov 2013
+	+ 00_all_0013-alpha-Fix-signal-thunk-unwind-info.patch
+	+ 00_all_0014-hppa-add-fanotify_mark.patch
+	+ 00_all_0015-Accept-make-versions-4.0-and-greater.patch
+	+ 00_all_0016-Don-t-use-broken-DL_AUTO_FUNCTION_ADDRESS.patch
+
 1		16 Aug 2013
 	+ 00_all_0001-disable-ldconfig-during-install.patch
 	+ 00_all_0002-workaround-crash-when-handling-signals-in-static-PIE.patch



1.1                  src/patchsets/glibc/2.18/00_all_0013-alpha-Fix-signal-thunk-unwind-info.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.18/00_all_0013-alpha-Fix-signal-thunk-unwind-info.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.18/00_all_0013-alpha-Fix-signal-thunk-unwind-info.patch?rev=1.1&content-type=text/plain

Index: 00_all_0013-alpha-Fix-signal-thunk-unwind-info.patch
===================================================================
From f73b1129ae3e1f1f2a36b58442c5b35a6ce40827 Mon Sep 17 00:00:00 2001
From: Richard Henderson <rth@×××××××.net>
Date: Sat, 16 Nov 2013 06:34:39 +1000
Subject: [PATCH 13/16] alpha: Fix signal thunk unwind info

2013-11-16  Richard Henderson  <rth@××××××.com>

	* sysdeps/unix/sysv/linux/alpha/rt_sigaction.S: Include a nop
	before each signal thunk.

URL: https://bugs.gentoo.org/480740
URL: https://sourceware.org/ml/libc-ports/2013-11/msg00000.html

(cherry picked from commit 027e32bd42314e17095ba39df82ef293f4a72c09)
---
 ports/sysdeps/unix/sysv/linux/alpha/rt_sigaction.S | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/ports/sysdeps/unix/sysv/linux/alpha/rt_sigaction.S b/ports/sysdeps/unix/sysv/linux/alpha/rt_sigaction.S
index 3d291fd..6efa738 100644
--- a/ports/sysdeps/unix/sysv/linux/alpha/rt_sigaction.S
+++ b/ports/sysdeps/unix/sysv/linux/alpha/rt_sigaction.S
@@ -83,14 +83,21 @@ PSEUDO_END(__syscall_rt_sigaction)
 	cfi_offset (64, \base + 2 * 8)
 	.endm
 
-	.align	4
-
 	cfi_startproc
 	cfi_return_column (64)
 	.cfi_signal_frame
 	SIGCONTEXT_REGS -648
-
 	cfi_def_cfa_offset (648)
+
+	/* While this frame is marked as a signal frame, that only applies
+	   to how this return address is handled for the outer frame.
+	   The return address that arrived here, from the inner frame, is
+	   not marked as a signal frame and so the unwinder still tries to
+	   subtract 1 to examine the presumed call insn.  Thus we must
+	   extend the unwind info to a nop before the start.  */
+	nop
+	.align 4
+
 __syscall_sigreturn:
 	mov	sp, a0
 	ldi	v0, __NR_sigreturn
@@ -98,8 +105,11 @@ __syscall_sigreturn:
 	.size	__syscall_sigreturn, .-__syscall_sigreturn
 	.type	__syscall_sigreturn, @function
 
-	.align 4
+	/* See above wrt including the nop.  */
 	cfi_def_cfa_offset (176 + 648)
+	nop
+	.align 4
+
 __syscall_rt_sigreturn:
 	mov	sp,a0
 	ldi	v0,__NR_rt_sigreturn
-- 
1.8.4.3