Merge remote-tracking branch 'origin/eosio' into HEAD

include/ctime

@@ -62,6 +62,7 @@ using ::timespec;
 #endif
 //using ::clock;
 using ::difftime;
+using ::time;
 #ifndef _LIBCPP_HAS_NO_THREAD_UNSAFE_C_FUNCTIONS
 using ::asctime;
 using ::gmtime;

src/chrono.cpp

@@ -0,0 +1,17 @@
+#include "chrono"
+#include "cerrno"
+#include <time.h>
+
+_LIBCPP_BEGIN_NAMESPACE_STD
+
+namespace chrono
+{
+   system_clock::time_point
+
+   system_clock::from_time_t(time_t t) _NOEXCEPT
+   {
+      return system_clock::time_point(seconds(t));
+   }
+} // ns chrono
+
+_LIBCPP_END_NAMESPACE_STD

src/locale.cpp

@@ -44,10 +44,6 @@
 #pragma clang diagnostic ignored "-Wsign-conversion"
 #endif
 
-extern "C" void eosio_assert(bool, const char*);
-size_t strftime(char*, size_t, const char*, const struct tm*) { eosio_assert(false, "strftime called"); }
-size_t strftime_l(char*, size_t, const char*, const struct tm*, locale_t) { eosio_assert(false, "strftime_l called"); }
-
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 struct __libcpp_unique_locale {