Module Name:    src
Committed By:   thorpej
Date:           Wed Nov  3 04:52:51 UTC 2021

Modified Files:
        src/lib/libc/arch/alpha/sys: __sigtramp2.S

Log Message:
CFI: Saved RA needs to point to the PC slot in the ucontext_t.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/alpha/sys/__sigtramp2.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/arch/alpha/sys/__sigtramp2.S
diff -u src/lib/libc/arch/alpha/sys/__sigtramp2.S:1.6 src/lib/libc/arch/alpha/sys/__sigtramp2.S:1.7
--- src/lib/libc/arch/alpha/sys/__sigtramp2.S:1.6	Wed Nov  3 03:58:31 2021
+++ src/lib/libc/arch/alpha/sys/__sigtramp2.S	Wed Nov  3 04:52:51 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigtramp2.S,v 1.6 2021/11/03 03:58:31 thorpej Exp $	*/
+/*	$NetBSD: __sigtramp2.S,v 1.7 2021/11/03 04:52:51 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -40,7 +40,8 @@
  *	sp->	siginfo structure	[0]
  */
 
-#define	CFI_OFFSET(r)	.cfi_offset r, r*8
+#define	CFI_OFFSET_REG(n, r)	.cfi_offset n, r*8
+#define	CFI_OFFSET(r)		CFI_OFFSET_REG(r, r)
 
 	.cfi_startproc simple
 	.cfi_signal_frame
@@ -71,7 +72,7 @@
 	CFI_OFFSET(_REG_T9)
 	CFI_OFFSET(_REG_T10)
 	CFI_OFFSET(_REG_T11)
-	CFI_OFFSET(_REG_RA)
+	CFI_OFFSET_REG(_REG_RA, _REG_PC)
 	CFI_OFFSET(_REG_T12)	/* a.k.a. _REG_PV */
 	CFI_OFFSET(_REG_AT)
 	CFI_OFFSET(_REG_GP)

Reply via email to