From e97c99f15937e5762a973b25192aab824126a6d3 Mon Sep 17 00:00:00 2001
From: Rong Xu <xur@google.com>
Date: Tue, 2 Sep 2014 15:29:57 -0700
Subject: [gcc-4.9] Merge svn r214745 from google/gcc-4_9 branch. Merge gcc-4_9
 source r214745 from google/gcc-4_9 branch.

Change-Id: Ie6fa0fd72f4b4eec3adc4db4bb922e652d1c2605
---
 gcc-4.9/libstdc++-v3/include/std/mutex | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'gcc-4.9/libstdc++-v3/include/std/mutex')

diff --git a/gcc-4.9/libstdc++-v3/include/std/mutex b/gcc-4.9/libstdc++-v3/include/std/mutex
index 0b481d609..8e9dd27e2 100644
--- a/gcc-4.9/libstdc++-v3/include/std/mutex
+++ b/gcc-4.9/libstdc++-v3/include/std/mutex
@@ -44,6 +44,7 @@
 #include <bits/functexcept.h>
 #include <bits/gthr.h>
 #include <bits/move.h> // for std::swap
+#include <bits/cxxabi_forced.h>
 
 #ifdef _GLIBCXX_USE_C99_STDINT_TR1
 
@@ -649,6 +650,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       auto __locks = std::tie(__l1, __l2, __l3...);
       __try
       { __try_lock_impl<0>::__do_try_lock(__locks, __idx); }
+      __catch(const __cxxabiv1::__forced_unwind&)
+      { __throw_exception_again; }
       __catch(...)
       { }
       return __idx;
-- 
cgit v1.2.3