From a2b664e7740b20f533f9760e24780b6e1e479f04 Mon Sep 17 00:00:00 2001 From: Sharad Singhai Date: Tue, 9 Jun 2015 00:42:18 +0000 Subject: Revert this patch in favor of the proper fix from the trunk (r224118). git-svn-id: https://gcc.gnu.org/svn/gcc/branches/google/gcc-4_9@224260 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/libsupc++/guard.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc index 61305f308e5..37dcd2267d6 100644 --- a/libstdc++-v3/libsupc++/guard.cc +++ b/libstdc++-v3/libsupc++/guard.cc @@ -255,6 +255,7 @@ namespace __cxxabiv1 extern "C" int __cxa_guard_acquire (__guard *g) { + google_potentially_blocking_region gpbr; // RAII #ifdef __GTHREADS // If the target can reorder loads, we need to insert a read memory @@ -263,8 +264,6 @@ namespace __cxxabiv1 if (_GLIBCXX_GUARD_TEST_AND_ACQUIRE (g)) return 0; - google_potentially_blocking_region gpbr; // RAII - # ifdef _GLIBCXX_USE_FUTEX // If __atomic_* and futex syscall are supported, don't use any global // mutex. @@ -356,8 +355,6 @@ namespace __cxxabiv1 } } # endif -# else - google_potentially_blocking_region gpbr; // RAII #endif return acquire (g); -- cgit v1.2.3