diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2015-08-18 01:08:22 +0000 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gcc.gnu.org> | 2015-08-18 01:08:22 +0000 |
| commit | 991995c4e7ac772b3983a36134b613c23b482275 (patch) | |
| tree | 4a507f74f55497932cd063ebcfa96266dabf02e9 /libgcc | |
| parent | 0e19db59e25de52d76b465d9c5bf181c3ffe21c7 (diff) | |
| download | gcc-991995c4e7ac772b3983a36134b613c23b482275.zip gcc-991995c4e7ac772b3983a36134b613c23b482275.tar.gz gcc-991995c4e7ac772b3983a36134b613c23b482275.tar.bz2 | |
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
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 5 | ||||
| -rw-r--r-- | libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index c186881..0d1acf3 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,5 +1,10 @@ 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> + * config/xtensa/t-windowed (LIB2ADDEH): Replace unwind-dw2-fde with unwind-dw2-fde-dip. diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c index 82b0e63..8e579c7 100644 --- a/libgcc/config/xtensa/unwind-dw2-xtensa.c +++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c @@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index) _Unwind_Word _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. */ |