This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH] [PING^2] Fix for PR libstdc++/60758
- From: Yury Gribov <y dot gribov at samsung dot com>
- To: GCC Patches <gcc-patches at gcc dot gnu dot org>
- Cc: Ramana Radhakrishnan <ramrad01 at arm dot com>, Viacheslav Garbuzov <v dot garbuzov at samsung dot com>, Alexey Merzlyakov <alexey dot merzlyakov at samsung dot com>
- Date: Wed, 07 May 2014 12:19:37 +0400
- Subject: [PATCH] [PING^2] Fix for PR libstdc++/60758
- Authentication-results: sourceware.org; auth=none
- References: <534FDB9C dot 9050102 at samsung dot com>
-------- Original Message --------
Subject: [PING] [PATCH] Fix for PR libstdc++/60758
Date: Thu, 17 Apr 2014 17:48:12 +0400
From: Alexey Merzlyakov <alexey.merzlyakov@samsung.com>
To: Ramana Radhakrishnan <ramrad01@arm.com>
CC: gcc-patches@gcc.gnu.org <gcc-patches@gcc.gnu.org>, Viacheslav
Garbuzov <v.garbuzov@samsung.com>, Yury Gribov <y.gribov@samsung.com>
Hi,
This fixes infinite backtrace in __cxa_end_cleanup().
Regtest was finished with no regressions on arm-linux-gnueabi(sf).
The patch posted at:
http://gcc.gnu.org/ml/gcc-patches/2014-04/msg00496.html
Thanks in advance.
Best regards,
Merzlyakov Alexey
2014-05-07 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.
diff --git a/libstdc++-v3/libsupc++/eh_arm.cc b/libstdc++-v3/libsupc++/eh_arm.cc
index aa453dd..6a45af5 100644
--- a/libstdc++-v3/libsupc++/eh_arm.cc
+++ b/libstdc++-v3/libsupc++/eh_arm.cc
@@ -199,27 +199,33 @@ asm (".global __cxa_end_cleanup\n"
" nop 5\n");
#else
// Assembly wrapper to call __gnu_end_cleanup without clobbering r1-r3.
-// Also push r4 to preserve stack alignment.
+// Also push lr to preserve stack alignment and to allow backtracing.
#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"
-" push\t{r1, r2, r3, r4}\n"
+" .fnstart\n"
+" push\t{r1, r2, r3, lr}\n"
+" .save\t{r1, r2, r3, lr}\n"
" bl\t__gnu_end_cleanup\n"
-" pop\t{r1, r2, r3, r4}\n"
+" pop\t{r1, r2, r3, lr}\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"
-" stmfd\tsp!, {r1, r2, r3, r4}\n"
+" .fnstart\n"
+" stmfd\tsp!, {r1, r2, r3, lr}\n"
+" .save\t{r1, r2, r3, lr}\n"
" bl\t__gnu_end_cleanup\n"
-" ldmfd\tsp!, {r1, r2, r3, r4}\n"
+" ldmfd\tsp!, {r1, r2, r3, lr}\n"
" bl\t_Unwind_Resume @ Never returns\n"
+" .fnend\n"
" .popsection\n");
#endif
#endif