        // Oddball version of strerror_r
        const char * c_str = strerror_r( ev, bp, sz );
        return  c_str
+@@ -251,7 +251,9 @@ namespace
+     case ENOTEMPTY: return make_error_condition( directory_not_empty );
+   # endif // ENOTEMPTY != EEXIST
+   # if ENOTRECOVERABLE != ECONNRESET // the same on some Broadcom chips 
++  # ifndef __pnacl__
+     case ENOTRECOVERABLE: return make_error_condition( state_not_recoverable ); 
++  # endif
+   # endif // ENOTRECOVERABLE != ECONNRESET 
+     case ENOTSOCK: return make_error_condition( not_a_socket );
+     case ENOTSUP: return make_error_condition( not_supported );
+@@ -262,7 +264,9 @@ namespace
+   # endif // EOPNOTSUPP != ENOTSUP
+     case EOVERFLOW: return make_error_condition( value_too_large );
+   # if EOWNERDEAD != ECONNABORTED // the same on some Broadcom chips 
++  # ifndef __pnacl__
+     case EOWNERDEAD: return make_error_condition( owner_dead ); 
++  # endif
+   # endif // EOWNERDEAD != ECONNABORTED 
+     case EPERM: return make_error_condition( operation_not_permitted );
+     case EPIPE: return make_error_condition( broken_pipe );
 diff --git a/tools/build/v2/tools/gcc.jam b/tools/build/v2/tools/gcc.jam
 index ef90f05..da042de 100644
 --- a/tools/build/v2/tools/gcc.jam

diff --git a/boost/config/platform/nacl.hpp b/boost/config/platform/nacl.hpp
new file mode 100644
index 0000000..14d472f
--- /dev/null
+++ b/boost/config/platform/nacl.hpp
@@ -0,0 +1,79 @@
+// Copyright (c) 2013 The Native Client Authors.
+// Use, modification and distribution are subject to the
+// Boost Software License, Version 1.0. (See accompanying file

+// boilerplate code:
+#define BOOST_HAS_UNISTD_H
+#include <boost/config/posix_features.hpp>
+#ifdef _NEWLIB_VERSION
+  #define BOOST_HAS_SCHED_YIELD
+  #define BOOST_HAS_PTHREADS
+#endif
+
+#ifndef __GNUC__
+//
