diff options
| author | Andreas Schwab <schwab@suse.de> | 2016-08-08 09:29:18 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2016-08-15 17:10:21 +0200 |
| commit | 9e2ff6c9cc54c0b4402b8d49e4abe7000fde7617 (patch) | |
| tree | 836351fddf2c2f3ab7a690e25df3b3d8e44943e3 | |
| parent | 89b7dd27eab6c265e97f028fab6e3977c54a5fa6 (diff) | |
| download | glibc-9e2ff6c9cc54c0b4402b8d49e4abe7000fde7617.tar glibc-9e2ff6c9cc54c0b4402b8d49e4abe7000fde7617.tar.gz glibc-9e2ff6c9cc54c0b4402b8d49e4abe7000fde7617.tar.bz2 glibc-9e2ff6c9cc54c0b4402b8d49e4abe7000fde7617.zip | |
arm: mark __startcontext as .cantunwind (bug 20435)
__startcontext marks the bottom of the call stack of the contexts created
by makecontext.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/setcontext.S | 7 |
2 files changed, 13 insertions, 0 deletions
@@ -1,3 +1,9 @@ +2016-08-15 Andreas Schwab <schwab@suse.de> + + [BZ #20435] + * sysdeps/unix/sysv/linux/arm/setcontext.S (__startcontext): Mark + as .cantunwind. + 2016-08-12 Joseph Myers <joseph@codesourcery.com> * sysdeps/powerpc/fpu/fsetexcptflg.c (__fesetexceptflag): Add diff --git a/sysdeps/unix/sysv/linux/arm/setcontext.S b/sysdeps/unix/sysv/linux/arm/setcontext.S index 603e508858..d1f168fece 100644 --- a/sysdeps/unix/sysv/linux/arm/setcontext.S +++ b/sysdeps/unix/sysv/linux/arm/setcontext.S @@ -86,12 +86,19 @@ weak_alias(__setcontext, setcontext) /* Called when a makecontext() context returns. Start the context in R4 or fall through to exit(). */ + /* Unwind descriptors are looked up based on PC - 2, so we have to + make sure to mark the instruction preceding the __startcontext + label as .cantunwind. */ + .fnstart + .cantunwind + nop ENTRY(__startcontext) movs r0, r4 bne PLTJMP(__setcontext) @ New context was 0 - exit b PLTJMP(HIDDEN_JUMPTARGET(exit)) + .fnend END(__startcontext) #ifdef PIC |