diff options
| author | ygribov <ygribov@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-05-20 17:25:26 +0000 |
|---|---|---|
| committer | ygribov <ygribov@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-05-20 17:25:26 +0000 |
| commit | fb503b772a0f777c5b7cf9ffc7c8c11cb8b61fb4 (patch) | |
| tree | d90eac49dd527e7ca9f8adf6787557333b8c35de /libstdc++-v3/libsupc++ | |
| parent | 27b0e9e44d941b136fc57d5e4f0ed85283c67b65 (diff) | |
| download | gcc-fb503b772a0f777c5b7cf9ffc7c8c11cb8b61fb4.tar.gz | |
2014-05-20 Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
PR libstdc++/61223
Revert:
2014-05-16 Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
PR libstdc++/60758
* libsupc++/eh_arm.cc (__cxa_end_cleanup): Change r4 to lr in save/restore
and add unwind directives.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210650 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/libsupc++')
| -rw-r--r-- | libstdc++-v3/libsupc++/eh_arm.cc | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/libstdc++-v3/libsupc++/eh_arm.cc b/libstdc++-v3/libsupc++/eh_arm.cc index 6a45af5afb1..aa453dddde9 100644 --- a/libstdc++-v3/libsupc++/eh_arm.cc +++ b/libstdc++-v3/libsupc++/eh_arm.cc @@ -199,33 +199,27 @@ asm (".global __cxa_end_cleanup\n" " nop 5\n"); #else // Assembly wrapper to call __gnu_end_cleanup without clobbering r1-r3. -// Also push lr to preserve stack alignment and to allow backtracing. +// Also push r4 to preserve stack alignment. #ifdef __thumb__ asm (" .pushsection .text.__cxa_end_cleanup\n" " .global __cxa_end_cleanup\n" " .type __cxa_end_cleanup, \"function\"\n" " .thumb_func\n" "__cxa_end_cleanup:\n" -" .fnstart\n" -" push\t{r1, r2, r3, lr}\n" -" .save\t{r1, r2, r3, lr}\n" +" push\t{r1, r2, r3, r4}\n" " bl\t__gnu_end_cleanup\n" -" pop\t{r1, r2, r3, lr}\n" +" pop\t{r1, r2, r3, r4}\n" " bl\t_Unwind_Resume @ Never returns\n" -" .fnend\n" " .popsection\n"); #else asm (" .pushsection .text.__cxa_end_cleanup\n" " .global __cxa_end_cleanup\n" " .type __cxa_end_cleanup, \"function\"\n" "__cxa_end_cleanup:\n" -" .fnstart\n" -" stmfd\tsp!, {r1, r2, r3, lr}\n" -" .save\t{r1, r2, r3, lr}\n" +" stmfd\tsp!, {r1, r2, r3, r4}\n" " bl\t__gnu_end_cleanup\n" -" ldmfd\tsp!, {r1, r2, r3, lr}\n" +" ldmfd\tsp!, {r1, r2, r3, r4}\n" " bl\t_Unwind_Resume @ Never returns\n" -" .fnend\n" " .popsection\n"); #endif #endif |