4 files changed, 92 insertions, 3 deletions
diff --git a/src/Android.mk b/src/Android.mk
index c6c3d54..9613728 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -20,6 +20,7 @@ LOCAL_PATH := $(call my-dir)
 
 astl_common_src_files := \
     ios_base.cpp \
+    ios_globals.cpp \
     ios_pos_types.cpp \
     ostream.cpp \
     streambuf.cpp \
diff --git a/src/ios_base.cpp b/src/ios_base.cpp
index 4fe7921..2ed71e3 100644
--- a/src/ios_base.cpp
+++ b/src/ios_base.cpp
@@ -27,8 +27,19 @@
  */
 
 #include <ios_base.h>
+#include <new>  // for placement new.
+#include <iostream>  // For cout, cerr
+#include <ostream>
+#include <streambuf>
+
+// Defined in bionic/libstdc++/src/one_time_construction.cpp
+extern "C" int __cxa_guard_acquire(int volatile * gv);
+extern "C" void __cxa_guard_release(int volatile * gv);
 
 namespace std {
+int ios_base::Init::sGuard = 0;
+bool ios_base::Init::sDone = false;
+
 // Implementation of the ios_base, common stuff for all the streams.
 
 ios_base::ios_base()
@@ -52,4 +63,34 @@ streamsize ios_base::width(streamsize width) {
     return prev;
 }
 
+// TODO: This is a temporary class used to illustrate how the
+// construction will happen.
+
+class std_filebuf: public streambuf {
+  public:
+    std_filebuf() {}
+    virtual ~std_filebuf() {}
+};
+
+static std_filebuf real_cout;
+static std_filebuf real_cerr;
+
+ios_base::Init::Init() {
+    if (__cxa_guard_acquire(&sGuard) == 1) {
+        if (!sDone) {
+            // Create the global cout and cerr structures. cout/cerr
+            // storage is in ios_globals.cpp.
+            new (&cout) ostream(&real_cout);
+            new (&cerr) ostream(&real_cerr);
+            sDone = true;
+        }
+        __cxa_guard_release(&sGuard);
+    }
+}
+
+ios_base::Init::~Init() {
+    cout.flush();
+    cerr.flush();
+}
+
 }  // namespace std
diff --git a/src/ios_globals.cpp b/src/ios_globals.cpp
new file mode 100644
index 0000000..1333721
--- /dev/null
+++ b/src/ios_globals.cpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+// Make sure <iostream> is not included directly or indirectly. You
+// can include <ostream> and/or <istream> just fine but <iostream>
+// contains forward declarations for cout, cerr... that will conflict
+// with the ones below.
+#include <ostream>
+
+namespace std {
+
+// Global instances of cout and cerr. Here we reserve the memory for
+// the stdio filebuf. The first time ios_base::Init::Init() is called,
+// placement new is used to initialize these areas with proper
+// instances of the streams.
+
+typedef char ostream_mem[sizeof(ostream)]
+__attribute__ ((aligned(__alignof__(ostream))));
+ostream_mem cout;
+ostream_mem cerr;
+
+}  // namespace std
diff --git a/src/ostream.cpp b/src/ostream.cpp
index 63d3b0a..baa05f1 100644
--- a/src/ostream.cpp
+++ b/src/ostream.cpp
@@ -29,10 +29,10 @@
 #include <ostream>
 
 namespace std {
-// Implementation of the std::ostream class.
+// Defined in bionic/libstdc++/src/one_time_construction.cpp
 
-ostream::ostream() {}
+ostream::ostream() { }
 
-ostream::~ostream() {}
+ostream::~ostream() { }
 
 }  // namespace std