From 44af976a44bc194b985fdb880f99a7feff133b5a Mon Sep 17 00:00:00 2001
From: Bruce Mitchener <bruce.mitchener@gmail.com>
Date: Thu, 7 Nov 2013 15:49:37 +0700
Subject: Update libcxx to 194185, 2013-11-07.

This brings C++14 support.
---
 system/lib/libcxx/ios.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'system/lib/libcxx/ios.cpp')

diff --git a/system/lib/libcxx/ios.cpp b/system/lib/libcxx/ios.cpp
index 732a61bb..bbe3c072 100644
--- a/system/lib/libcxx/ios.cpp
+++ b/system/lib/libcxx/ios.cpp
@@ -7,6 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+#define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__;
+
 #include "ios"
 #include "streambuf"
 #include "istream"
@@ -61,7 +63,7 @@ __iostream_category::message(int ev) const
 }
 
 const error_category&
-iostream_category()
+iostream_category() _NOEXCEPT
 {
     static __iostream_category s;
     return s;
@@ -147,8 +149,11 @@ ios_base::getloc() const
 }
 
 // xalloc
-
+#if __has_feature(cxx_atomic)
+atomic<int> ios_base::__xindex_ = ATOMIC_VAR_INIT(0);
+#else
 int ios_base::__xindex_ = 0;
+#endif
 
 int
 ios_base::xalloc()
-- 
cgit v1.2.3-18-g5258


From 8a8f0348a15b274ab2fc1f98a434fe8c7e02ff82 Mon Sep 17 00:00:00 2001
From: Bruce Mitchener <bruce.mitchener@gmail.com>
Date: Thu, 7 Nov 2013 16:08:02 +0700
Subject: Don't use atomic as that breaks our version of clang.

---
 system/lib/libcxx/ios.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/lib/libcxx/ios.cpp')

diff --git a/system/lib/libcxx/ios.cpp b/system/lib/libcxx/ios.cpp
index bbe3c072..004d3183 100644
--- a/system/lib/libcxx/ios.cpp
+++ b/system/lib/libcxx/ios.cpp
@@ -149,7 +149,7 @@ ios_base::getloc() const
 }
 
 // xalloc
-#if __has_feature(cxx_atomic)
+#if __has_feature(cxx_atomic) && !defined(__EMSCRIPTEN__)
 atomic<int> ios_base::__xindex_ = ATOMIC_VAR_INIT(0);
 #else
 int ios_base::__xindex_ = 0;
-- 
cgit v1.2.3-18-g5258