aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/gcc/gcc-4.5/libstdc++-emit-__cxa_end_cleanup-in-text.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/gcc/gcc-4.5/libstdc++-emit-__cxa_end_cleanup-in-text.patch')
-rw-r--r--recipes/gcc/gcc-4.5/libstdc++-emit-__cxa_end_cleanup-in-text.patch31
1 files changed, 21 insertions, 10 deletions
diff --git a/recipes/gcc/gcc-4.5/libstdc++-emit-__cxa_end_cleanup-in-text.patch b/recipes/gcc/gcc-4.5/libstdc++-emit-__cxa_end_cleanup-in-text.patch
index 307327c314..ada36a5914 100644
--- a/recipes/gcc/gcc-4.5/libstdc++-emit-__cxa_end_cleanup-in-text.patch
+++ b/recipes/gcc/gcc-4.5/libstdc++-emit-__cxa_end_cleanup-in-text.patch
@@ -1,29 +1,40 @@
2010-06-07 Khem Raj <raj.khem@gmail.com>
- * libsupc++/eh_arm.cc (__cxa_end_cleanup): Switch to
- .text section before emitting inline assembly.
+ * libsupc++/eh_arm.cc (__cxa_end_cleanup): Use .pushsection/.popsection
+ to emit inline assembly into .text section.
-Index: gcc/libstdc++-v3/libsupc++/eh_arm.cc
+Index: gcc-4.5/libstdc++-v3/libsupc++/eh_arm.cc
===================================================================
---- gcc/libstdc++-v3/libsupc++/eh_arm.cc (revision 160410)
-+++ gcc/libstdc++v3/libsupc++/eh_arm.cc (working copy)
-@@ -157,7 +157,8 @@
+--- gcc-4.5.orig/libstdc++-v3/libsupc++/eh_arm.cc 2010-06-04 23:20:18.000000000 -0700
++++ gcc-4.5/libstdc++-v3/libsupc++/eh_arm.cc 2010-06-08 11:27:34.247541722 -0700
+@@ -157,22 +157,26 @@ __gnu_end_cleanup(void)
// Assembly wrapper to call __gnu_end_cleanup without clobbering r1-r3.
// Also push r4 to preserve stack alignment.
#ifdef __thumb__
-asm (".global __cxa_end_cleanup\n"
-+asm (" .section .text.__cxa_end_cleanup\n"
++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"
-@@ -166,7 +167,8 @@
+ " push\t{r1, r2, r3, r4}\n"
+ " bl\t__gnu_end_cleanup\n"
" pop\t{r1, r2, r3, r4}\n"
- " bl\t_Unwind_Resume @ Never returns\n");
+-" bl\t_Unwind_Resume @ Never returns\n");
++" bl\t_Unwind_Resume @ Never returns\n"
++" .popsection\n");
#else
-asm (".global __cxa_end_cleanup\n"
-+asm (" .section .text.__cxa_end_cleanup\n"
++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"
+ " bl\t__gnu_end_cleanup\n"
+ " ldmfd\tsp!, {r1, r2, r3, r4}\n"
+-" bl\t_Unwind_Resume @ Never returns\n");
++" bl\t_Unwind_Resume @ Never returns\n"
++" .popsection\n");
+ #endif
+
+ #endif