From 011d8001e295ab428f3d73602d2e4fa0b248efc4 Mon Sep 17 00:00:00 2001
From: theraven <theraven@FreeBSD.org>
Date: Thu, 3 May 2012 17:44:07 +0000
Subject: Import new version of libc++.  Among other improvements, this comes
 with an <atomic> header that works with clang 3.1 (and, importantly, the
 pre-3.1 snapshot currently in head)

---
 contrib/libc++/src/iostream.cpp  | 63 ++++++++++++++++++++++++----------------
 contrib/libc++/src/stdexcept.cpp |  4 +++
 contrib/libc++/src/utility.cpp   |  1 +
 3 files changed, 43 insertions(+), 25 deletions(-)

(limited to 'contrib/libc++/src')

diff --git a/contrib/libc++/src/iostream.cpp b/contrib/libc++/src/iostream.cpp
index 157c397..bfb1bfb 100644
--- a/contrib/libc++/src/iostream.cpp
+++ b/contrib/libc++/src/iostream.cpp
@@ -9,45 +9,58 @@
 
 #include "__std_stream"
 #include "string"
+#include "new"
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-static __stdinbuf<char>  __cin(stdin);
-static __stdoutbuf<char> __cout(stdout);
-static __stdoutbuf<char> __cerr(stderr);
-static __stdinbuf<wchar_t>  __wcin(stdin);
-static __stdoutbuf<wchar_t> __wcout(stdout);
-static __stdoutbuf<wchar_t> __wcerr(stderr);
-
-istream cin(&__cin);
-ostream cout(&__cout);
-ostream cerr(&__cerr);
-ostream clog(&__cerr);
-wistream wcin(&__wcin);
-wostream wcout(&__wcout);
-wostream wcerr(&__wcerr);
-wostream wclog(&__wcerr);
+alignas (__stdinbuf<char> ) static char __cin [sizeof(__stdinbuf <char>)];
+alignas (__stdoutbuf<char>) static char __cout[sizeof(__stdoutbuf<char>)];
+alignas (__stdoutbuf<char>) static char __cerr[sizeof(__stdoutbuf<char>)];
+alignas (__stdinbuf<wchar_t> ) static char __wcin [sizeof(__stdinbuf <wchar_t>)];
+alignas (__stdoutbuf<wchar_t>) static char __wcout[sizeof(__stdoutbuf<wchar_t>)];
+alignas (__stdoutbuf<wchar_t>) static char __wcerr[sizeof(__stdoutbuf<wchar_t>)];
+
+alignas (istream) char cin [sizeof(istream)];
+alignas (ostream) char cout[sizeof(ostream)];
+alignas (ostream) char cerr[sizeof(ostream)];
+alignas (ostream) char clog[sizeof(ostream)];
+alignas (wistream) char wcin [sizeof(wistream)];
+alignas (wostream) char wcout[sizeof(wostream)];
+alignas (wostream) char wcerr[sizeof(wostream)];
+alignas (wostream) char wclog[sizeof(wostream)];
 
 ios_base::Init __start_std_streams;
 
 ios_base::Init::Init()
 {
-    cin.tie(&cout);
-    _VSTD::unitbuf(cerr);
-    cerr.tie(&cout);
+    istream* cin_ptr  = ::new(cin)  istream(::new(__cin)  __stdinbuf <char>(stdin) );
+    ostream* cout_ptr = ::new(cout) ostream(::new(__cout) __stdoutbuf<char>(stdout));
+    ostream* cerr_ptr = ::new(cerr) ostream(::new(__cerr) __stdoutbuf<char>(stderr));
+                        ::new(clog) ostream(cerr_ptr->rdbuf());
+    cin_ptr->tie(cout_ptr);
+    _VSTD::unitbuf(*cerr_ptr);
+    cerr_ptr->tie(cout_ptr);
 
-    wcin.tie(&wcout);
-    _VSTD::unitbuf(wcerr);
-    wcerr.tie(&wcout);
+    wistream* wcin_ptr  = ::new(wcin)  wistream(::new(__wcin)  __stdinbuf <wchar_t>(stdin) );
+    wostream* wcout_ptr = ::new(wcout) wostream(::new(__wcout) __stdoutbuf<wchar_t>(stdout));
+    wostream* wcerr_ptr = ::new(wcerr) wostream(::new(__wcerr) __stdoutbuf<wchar_t>(stderr));
+                          ::new(wclog) wostream(wcerr_ptr->rdbuf());
+    wcin_ptr->tie(wcout_ptr);
+    _VSTD::unitbuf(*wcerr_ptr);
+    wcerr_ptr->tie(wcout_ptr);
 }
 
 ios_base::Init::~Init()
 {
-    cout.flush();
-    clog.flush();
+    ostream* cout_ptr = (ostream*)cout;
+    ostream* clog_ptr = (ostream*)clog;
+    cout_ptr->flush();
+    clog_ptr->flush();
 
-    wcout.flush();
-    wclog.flush();
+    wostream* wcout_ptr = (wostream*)wcout;
+    wostream* wclog_ptr = (wostream*)wclog;
+    wcout_ptr->flush();
+    wclog_ptr->flush();
 }
 
 _LIBCPP_END_NAMESPACE_STD
diff --git a/contrib/libc++/src/stdexcept.cpp b/contrib/libc++/src/stdexcept.cpp
index b516b0c..9fa4f59 100644
--- a/contrib/libc++/src/stdexcept.cpp
+++ b/contrib/libc++/src/stdexcept.cpp
@@ -15,7 +15,11 @@
 #include <cstdint>
 #include <cstddef>
 #include "system_error"
+
+// Use <cxxabi.h> to determine whether we're linking against libc++abi.
+#if __has_include(<cxxabi.h>)
 #include <cxxabi.h>
+#endif
 
 // Note:  optimize for size
 
diff --git a/contrib/libc++/src/utility.cpp b/contrib/libc++/src/utility.cpp
index 7dccffb..e9830e7 100644
--- a/contrib/libc++/src/utility.cpp
+++ b/contrib/libc++/src/utility.cpp
@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#define _LIBCPP_BUILDING_UTILITY
 #include "utility"
 
 _LIBCPP_BEGIN_NAMESPACE_STD
-- 
cgit v1.1