Index: llvm/trunk/include/llvm/Support/Threading.h
===================================================================
--- llvm/trunk/include/llvm/Support/Threading.h
+++ llvm/trunk/include/llvm/Support/Threading.h
@@ -15,6 +15,14 @@
 #ifndef LLVM_SUPPORT_THREADING_H
 #define LLVM_SUPPORT_THREADING_H
 
+#include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
+
+#if defined(LLVM_ON_UNIX)
+#include <mutex>
+#else
+#include "llvm/Support/Atomic.h"
+#endif
+
 namespace llvm {
   /// Returns true if LLVM is compiled with support for multi-threading, and
   /// false otherwise.
@@ -33,6 +41,35 @@
   /// the thread stack.
   void llvm_execute_on_thread(void (*UserFn)(void*), void *UserData,
                               unsigned RequestedStackSize = 0);
+
+#if defined(LLVM_ON_UNIX)
+typedef std::once_flag once_flag;
+#define LLVM_DEFINE_ONCE_FLAG(flag) static once_flag flag
+#else
+enum InitStatus {
+  Done = -1,
+  Uninitialized = 0,
+  Wait = 1
+};
+typedef volatile sys::cas_flag once_flag;
+
+#define LLVM_DEFINE_ONCE_FLAG(flag) static once_flag flag = Uninitialized
+#endif
+
+/// \brief Execute the function specified as a parameter once.
+///
+/// Typical usage:
+/// \code
+///   void foo() {...};
+///   ...
+///   LLVM_DEFINE_ONCE_FLAG(flag);
+///   call_once(flag, foo);
+/// \endcode
+///
+/// \param flag Flag used for tracking whether or not this has run.
+/// \param UserFn Function to call once.
+void call_once(once_flag&, void (*)(void));
+
 }
 
 #endif
Index: llvm/trunk/lib/Support/CMakeLists.txt
===================================================================
--- llvm/trunk/lib/Support/CMakeLists.txt
+++ llvm/trunk/lib/Support/CMakeLists.txt
@@ -102,6 +102,7 @@
   Unix/Program.inc
   Unix/RWMutex.inc
   Unix/Signals.inc
+  Unix/Threading.inc
   Unix/ThreadLocal.inc
   Unix/TimeValue.inc
   Unix/Watchdog.inc
@@ -114,6 +115,7 @@
   Windows/Program.inc
   Windows/RWMutex.inc
   Windows/Signals.inc
+  Windows/Threading.inc
   Windows/ThreadLocal.inc
   Windows/TimeValue.inc
   Windows/Watchdog.inc
Index: llvm/trunk/lib/Support/ManagedStatic.cpp
===================================================================
--- llvm/trunk/lib/Support/ManagedStatic.cpp
+++ llvm/trunk/lib/Support/ManagedStatic.cpp
@@ -16,16 +16,23 @@
 #include "llvm/Support/Atomic.h"
 #include "llvm/Support/Mutex.h"
 #include "llvm/Support/MutexGuard.h"
+#include "llvm/Support/Threading.h"
 #include <cassert>
 using namespace llvm;
 
 static const ManagedStaticBase *StaticList = nullptr;
+static sys::Mutex *ManagedStaticMutex = nullptr;
+LLVM_DEFINE_ONCE_FLAG(mutex_init_flag);
 
-static sys::Mutex& getManagedStaticMutex() {
+static void initializeMutex() {
+  ManagedStaticMutex = new sys::Mutex();
+}
+
+static sys::Mutex* getManagedStaticMutex() {
   // We need to use a function local static here, since this can get called
   // during a static constructor and we need to guarantee that it's initialized
   // correctly.
-  static sys::Mutex ManagedStaticMutex;
+  call_once(mutex_init_flag, initializeMutex);
   return ManagedStaticMutex;
 }
 
@@ -33,7 +40,7 @@
                                               void (*Deleter)(void*)) const {
   assert(Creator);
   if (llvm_is_multithreaded()) {
-    MutexGuard Lock(getManagedStaticMutex());
+    MutexGuard Lock(*getManagedStaticMutex());
 
     if (!Ptr) {
       void* tmp = Creator();
@@ -83,7 +90,7 @@
 
 /// llvm_shutdown - Deallocate and destroy all ManagedStatic variables.
 void llvm::llvm_shutdown() {
-  MutexGuard Lock(getManagedStaticMutex());
+  MutexGuard Lock(*getManagedStaticMutex());
 
   while (StaticList)
     StaticList->destroy();
Index: llvm/trunk/lib/Support/Threading.cpp
===================================================================
--- llvm/trunk/lib/Support/Threading.cpp
+++ llvm/trunk/lib/Support/Threading.cpp
@@ -110,3 +110,10 @@
 }
 
 #endif
+
+#if defined(LLVM_ON_UNIX)
+#include "Unix/Threading.inc"
+#else
+#include "Windows/Threading.inc"
+#endif
+
Index: llvm/trunk/lib/Support/Unix/Threading.inc
===================================================================
--- llvm/trunk/lib/Support/Unix/Threading.inc
+++ llvm/trunk/lib/Support/Unix/Threading.inc
@@ -0,0 +1,5 @@
+#include <thread>
+
+void llvm::call_once(once_flag& flag, void (*fptr)(void)) {
+  std::call_once(flag, fptr);
+}
Index: llvm/trunk/lib/Support/Windows/Threading.inc
===================================================================
--- llvm/trunk/lib/Support/Windows/Threading.inc
+++ llvm/trunk/lib/Support/Windows/Threading.inc
@@ -0,0 +1,19 @@
+#include <winbase.h>
+
+void llvm::call_once(once_flag &flag, void (*fptr)(void)) {
+  while (flag != Done) {
+    if (flag == Wait) {
+      ::Sleep(1);
+      continue;
+    }
+
+    sys::cas_flag old_val = sys::CompareAndSwap(&flag, Wait, Uninitialized);
+    if (old_val == Uninitialized) {
+      fptr();
+      sys::MemoryFence();
+      flag = Done;
+      return;
+    }
+  }
+  sys::MemoryFence();
+}