From: Alexey Merzlyakov Date: Tue, 20 May 2014 17:25:26 +0000 (+0000) Subject: re PR target/61223 (libstdc++ build fail due to pop lr register) X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a852a67c020e0c07e12f1bb09d68553103eee387;p=gcc.git re PR target/61223 (libstdc++ build fail due to pop lr register) 2014-05-20 Alexey Merzlyakov PR libstdc++/61223 Revert: 2014-05-16 Alexey Merzlyakov PR libstdc++/60758 * libsupc++/eh_arm.cc (__cxa_end_cleanup): Change r4 to lr in save/restore and add unwind directives. From-SVN: r210650 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b2f8f00d38f..72bf941656c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2014-05-20 Alexey Merzlyakov + + PR libstdc++/61223 + Revert: + 2014-05-16 Alexey Merzlyakov + + PR libstdc++/60758 + * libsupc++/eh_arm.cc (__cxa_end_cleanup): Change r4 to lr in save/restore + and add unwind directives. + 2014-05-20 Sebastian Huber * testsuite/lib/libstdc++.exp (load_gcc_lib): Register loaded libs. 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