From 0a49eb31b299b8ce3f1c4e96f4f5274866b12fb0 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Fri, 4 Apr 2003 16:45:06 -0800 Subject: [PATCH] forced1.C: Use _Unwind_SjLj_ForcedUnwind as appropriate. * g++.dg/eh/forced1.C: Use _Unwind_SjLj_ForcedUnwind as appropriate. * g++.dg/eh/forced2.C: Likewise. From-SVN: r65263 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/eh/forced1.C | 4 ++++ gcc/testsuite/g++.dg/eh/forced2.C | 8 ++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c77675ec3323..1d5fdd799602 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2003-04-04 Richard Henderson + + * g++.dg/eh/forced1.C: Use _Unwind_SjLj_ForcedUnwind as appropriate. + * g++.dg/eh/forced2.C: Likewise. + 2003-04-03 Mike Stump * lib/scanasm.exp (scan-assembler): Add xfail processing for diff --git a/gcc/testsuite/g++.dg/eh/forced1.C b/gcc/testsuite/g++.dg/eh/forced1.C index 512d7204ad63..dc0d8b0084d9 100644 --- a/gcc/testsuite/g++.dg/eh/forced1.C +++ b/gcc/testsuite/g++.dg/eh/forced1.C @@ -31,7 +31,11 @@ static void force_unwind () exc->exception_class = 0; exc->exception_cleanup = 0; +#ifndef __USING_SJLJ_EXCEPTIONS__ _Unwind_ForcedUnwind (exc, force_unwind_stop, 0); +#else + _Unwind_SjLj_ForcedUnwind (exc, force_unwind_stop, 0); +#endif abort (); } diff --git a/gcc/testsuite/g++.dg/eh/forced2.C b/gcc/testsuite/g++.dg/eh/forced2.C index f68120952465..4feb4fed9858 100644 --- a/gcc/testsuite/g++.dg/eh/forced2.C +++ b/gcc/testsuite/g++.dg/eh/forced2.C @@ -34,9 +34,13 @@ force_unwind () throw() _Unwind_Exception *exc = new _Unwind_Exception; exc->exception_class = 0; exc->exception_cleanup = 0; - + +#ifndef __USING_SJLJ_EXCEPTIONS__ _Unwind_ForcedUnwind (exc, force_unwind_stop, 0); - +#else + _Unwind_SjLj_ForcedUnwind (exc, force_unwind_stop, 0); +#endif + abort (); } -- 2.47.3