git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xtensa: fix _Unwind_GetCFA 

Returning context->cfa in _Unwind_GetCFA makes CFA point one stack frame
higher than what was actually used by code at context->ra. This results
in invalid CFA value in signal frames and premature unwinding completion
in forced unwinding used by uClibc NPTL thread cancellation.
Returning context->sp from _Unwind_GetCFA makes all CFA values valid and
matching code that used them.

2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
libgcc/
	* config/xtensa/unwind-dw2-xtensa.c (_Unwind_GetCFA): Return
	context->sp instead of context->cfa.

From-SVN: r226964
This commit is contained in:
Max Filippov 2015-08-18 01:08:22 +00:00 committed by Max Filippov
parent 0e19db59e2
commit 991995c4e7
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libgcc/ChangeLog
View File

@ -1,3 +1,8 @@
2015-08-18 Max Filippov <jcmvbkbc@gmail.com>
* config/xtensa/unwind-dw2-xtensa.c (_Unwind_GetCFA): Return
context->sp instead of context->cfa.
2015-08-18 Max Filippov <jcmvbkbc@gmail.com> 2015-08-18 Max Filippov <jcmvbkbc@gmail.com>
* config/xtensa/t-windowed (LIB2ADDEH): Replace unwind-dw2-fde * config/xtensa/t-windowed (LIB2ADDEH): Replace unwind-dw2-fde

2
libgcc/config/xtensa/unwind-dw2-xtensa.c
View File

@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
_Unwind_Word _Unwind_Word
_Unwind_GetCFA (struct _Unwind_Context *context) _Unwind_GetCFA (struct _Unwind_Context *context)
{ {
return (_Unwind_Ptr) context->cfa; return (_Unwind_Ptr) context->sp;
} }
/* Overwrite the saved value for register INDEX in CONTEXT with VAL. */ /* Overwrite the saved value for register INDEX in CONTEXT with VAL. */