re PR objc/56870 (@catch handler broken with SEH)

2014-02-18  Kai Tietz  <ktietz@redhat.com>
	Jonathan Schleifer  <js@webkeks.org>

	PR objc/56870
	* unwind-seh.c (_GCC_specific_handler): Pass proper
	value to unwind-handler.

Co-Authored-By: Jonathan Schleifer <js@webkeks.org>
From-SVN: r207849

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index c60d2fa7efd8f508a776534136b88d4767b8df64..4c3ff9181f6abd07e045809ad3d1bd717a2f7744 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-18  Kai Tietz  <ktietz@redhat.com>
+       Jonathan Schleifer  <js@webkeks.org>
+
+       PR objc/56870
+       * unwind-seh.c (_GCC_specific_handler): Pass proper
+       value to unwind-handler.
+
 2014-02-12  Joseph Myers  <joseph@codesourcery.com>
 
        * soft-fp/adddf3.c: Update from glibc.

diff --git a/libgcc/unwind-seh.c b/libgcc/unwind-seh.c
index 125af979cf8dc45df079290532e47f6a8ff19acc..b4a3ca1e34b5fc2438400ed6c713599876c8db4e 100644 (file)
--- a/libgcc/unwind-seh.c
+++ b/libgcc/unwind-seh.c
@@ -313,8 +313,9 @@ _GCC_specific_handler (PEXCEPTION_RECORD ms_exc, void *this_frame,
          ms_exc->ExceptionInformation[3] = gcc_context.reg[1];
 
          /* Begin phase 2.  Perform the unwinding.  */
-         RtlUnwindEx (this_frame, gcc_context.ra, ms_exc, gcc_exc,
-                      ms_orig_context, ms_disp->HistoryTable);
+         RtlUnwindEx (this_frame, gcc_context.ra, ms_exc,
+                      (PVOID)gcc_context.reg[0], ms_orig_context,
+                      ms_disp->HistoryTable);
        }
 
       /* In _Unwind_RaiseException we return _URC_FATAL_PHASE1_ERROR.  */