diff mbox

Terminate FDE before return trampoline in makecontext for powerpc (bug 18635)

Message ID mvmio8a9jnl.fsf@hawking.suse.de
State Committed
Delegated to: Tulio Magno Quites Machado Filho
Headers

Commit Message

Andreas Schwab Aug. 20, 2015, 1:25 p.m. UTC 
  This fixes tst-makecontext for PowerPC.

Andreas.

	[BZ #18635]
	* sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S
	(__makecontext): Terminate FDE before return label.
	(__novec_makecontext): Likewise.
---
 sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Tulio Magno Quites Machado Filho Sept. 4, 2015, 7:03 p.m. UTC | #1 
Andreas Schwab <schwab@suse.de> writes:

> This fixes tst-makecontext for PowerPC.

LGTM.  I'll push it.

Thanks!
diff mbox

Patch

diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S
index 1d6915b..472f5a5 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S
@@ -94,6 +94,8 @@  ENTRY(__makecontext)
 
 	blr
 
+	cfi_endproc
+	nop
 /*
  * If the function returns, it comes here.  We put ucp->uc_link in
  * r31, which is a callee-saved register.  We have to continue with
@@ -106,6 +108,7 @@  L(exitcode):
 4:	bl	HIDDEN_JUMPTARGET(exit)
 	b	4b
 
+	cfi_startproc
 END(__makecontext)
 
 versioned_symbol (libc, __makecontext, makecontext, GLIBC_2_3_4)
@@ -185,6 +188,8 @@  ENTRY(__novec_makecontext)
 
 	blr
 
+	cfi_endproc
+	nop
 /*
  * If the function returns, it comes here.  We put ucp->uc_link in
  * r31, which is a callee-saved register.  We have to continue with
@@ -197,6 +202,7 @@  L(novec_exitcode):
 4:	bl	HIDDEN_JUMPTARGET(exit)
 	b	4b
 
+	cfi_startproc
 END(__novec_makecontext)
 	.previous