summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Support/ManagedStatic.cpp
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2014-03-03 18:02:34 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2014-03-03 18:02:34 +0000
commit17388a61b270a21ee711cd51e003c17d2b3bdf29 (patch)
tree8266a71177053c8198869a5316c079498cea679b /llvm/lib/Support/ManagedStatic.cpp
parent0b6eb591a4d6a7ce35d1a06ecf37637920715fce (diff)
downloadbcm5719-llvm-17388a61b270a21ee711cd51e003c17d2b3bdf29.tar.gz
bcm5719-llvm-17388a61b270a21ee711cd51e003c17d2b3bdf29.zip
Revert "[C++11] Replace LLVM atomics with std::atomic."
Breaks the MSVC build. DataStream.cpp(44): error C2552: 'llvm::Statistic::Value' : non-aggregates cannot be initialized with initializer list llvm-svn: 202731
Diffstat (limited to 'llvm/lib/Support/ManagedStatic.cpp')
-rw-r--r--llvm/lib/Support/ManagedStatic.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/Support/ManagedStatic.cpp b/llvm/lib/Support/ManagedStatic.cpp
index c19f8cb4859..098cccb68df 100644
--- a/llvm/lib/Support/ManagedStatic.cpp
+++ b/llvm/lib/Support/ManagedStatic.cpp
@@ -13,6 +13,7 @@
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Config/config.h"
+#include "llvm/Support/Atomic.h"
#include <cassert>
using namespace llvm;
@@ -27,7 +28,7 @@ void ManagedStaticBase::RegisterManagedStatic(void *(*Creator)(),
void* tmp = Creator ? Creator() : 0;
TsanHappensBefore(this);
- std::atomic_thread_fence(std::memory_order_seq_cst);
+ sys::MemoryFence();
// This write is racy against the first read in the ManagedStatic
// accessors. The race is benign because it does a second read after a
OpenPOWER on IntegriCloud