aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/libsupc++
diff options
context:
space:
mode:
authorTony Wang <tony.wang@arm.com>2014-09-10 04:45:32 +0000
committerThomas Preud'homme <thopre01@gcc.gnu.org>2014-09-10 04:45:32 +0000
commit0876bdf57b6d7a6920723e41952ea1ab7f2503dc (patch)
tree9499351ac6029003e5cb9116215ce9801b5f39b9 /libstdc++-v3/libsupc++
parent27be0c3223f143869834f6fc3ca55db940c3d1f4 (diff)
downloadgcc-0876bdf57b6d7a6920723e41952ea1ab7f2503dc.zip
gcc-0876bdf57b6d7a6920723e41952ea1ab7f2503dc.tar.gz
gcc-0876bdf57b6d7a6920723e41952ea1ab7f2503dc.tar.bz2
re PR libgcc/56846 (_Unwind_Backtrace on ARM and noexcept)
2014-09-10 Tony Wang <tony.wang@arm.com> libstdc++-v3/ PR target/56846 * libsupc++/eh_personality.cc (PERSONALITY_FUNCTION): Return with CONTINUE_UNWINDING when the state pattern contains: _US_VIRTUAL_UNWIND_FRAME | _US_FORCE_UNWIND From-SVN: r215101
Diffstat (limited to 'libstdc++-v3/libsupc++')
-rw-r--r--libstdc++-v3/libsupc++/eh_personality.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/libstdc++-v3/libsupc++/eh_personality.cc b/libstdc++-v3/libsupc++/eh_personality.cc
index f315a83..cb4467a 100644
--- a/libstdc++-v3/libsupc++/eh_personality.cc
+++ b/libstdc++-v3/libsupc++/eh_personality.cc
@@ -378,6 +378,12 @@ PERSONALITY_FUNCTION (int version,
switch (state & _US_ACTION_MASK)
{
case _US_VIRTUAL_UNWIND_FRAME:
+ // If the unwind state pattern is
+ // _US_VIRTUAL_UNWIND_FRAME | _US_FORCE_UNWIND
+ // then we don't need to search for any handler as it is not a real
+ // exception. Just unwind the stack.
+ if (state & _US_FORCE_UNWIND)
+ CONTINUE_UNWINDING;
actions = _UA_SEARCH_PHASE;
break;