Index: libsupc++/eh_personality.cc
===================================================================
--- libsupc++/eh_personality.cc	(revision 125530)
+++ libsupc++/eh_personality.cc	(working copy)
@@ -556,10 +556,11 @@
 	  thrown_ptr = 0;
 	}
       else
+	throw_type = xh->exceptionType;
+
 #ifdef __ARM_EABI_UNWINDER__
-	throw_type = ue_header;
-#else
-	throw_type = xh->exceptionType;
+      // This is wrong for forced unwind.
+      throw_type = ue_header;
 #endif
 
       while (1)