From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 11 Sep 2012 15:22:54 +0000 (+0200)
Subject: re PR libstdc++/54172 (__cxa_guard_acquire thread-safety issue)
X-Git-Tag: misc/gccgo-go1_1_2~933
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=635442bfd859e2629711596be1471f6d70006de6;p=thirdparty%2Fgcc.git

re PR libstdc++/54172 (__cxa_guard_acquire thread-safety issue)

	PR libstdc++/54172
	* libsupc++/guard.cc (__cxa_guard_acquire): Fix up the last
	argument of the first __atomic_compare_exchange_n.

From-SVN: r191190
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4ecedf818bd1..3c53345173d3 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-11  Jakub Jelinek  <jakub@redhat.com>
+
+	PR libstdc++/54172
+	* libsupc++/guard.cc (__cxa_guard_acquire): Fix up the last
+	argument of the first __atomic_compare_exchange_n.
+
 2012-09-10  Sebastian Huber  <sebastian.huber@embedded-brains.de>
 	    Jonathan Wakely  <jwakely.gcc@gmail.com>
 
diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc
index 60165cdecb45..f8550c03fae1 100644
--- a/libstdc++-v3/libsupc++/guard.cc
+++ b/libstdc++-v3/libsupc++/guard.cc
@@ -253,7 +253,7 @@ namespace __cxxabiv1
 	    int expected(0);
 	    if (__atomic_compare_exchange_n(gi, &expected, pending_bit, false,
 					    __ATOMIC_ACQ_REL,
-					    __ATOMIC_RELAXED))
+					    __ATOMIC_ACQUIRE))
 	      {
 		// This thread should do the initialization.
 		return 1;