commit cce96eb5587cf4ee8395bb7e5b4e15b7a4ac1153
author Jonathan Roelofs <jonathan@codesourcery.com> Tue Sep 02 21:14:38 2014 +0000
committer Jonathan Roelofs <jonathan@codesourcery.com> Tue Sep 02 21:14:38 2014 +0000
tree cf8a9089bc6e2c3ae3f0915bd5a961433d9b5075
parent 6552b1eac44133c6c8e7d6a11da46cba4d628763

Partially address a FIXME in steady_clock::now()

  http://reviews.llvm.org/D4045

llvm-svn: 216949
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: c59e585126d36051c0913d432ff224ef97a8583e

include/__config

diff --git a/include/__config b/include/__config
index b75176c..2eb9e55 100644
--- a/include/__config
+++ b/include/__config
@@ -650,6 +650,11 @@
 #  define _LIBCPP_TRIVIAL_PAIR_COPY_CTOR 1
 #endif
 
+#if (!defined(_POSIX_TIMERS) || _POSIX_TIMERS <= 0) || \
+    (!defined(_POSIX_MONOTONIC_CLOCK) || _POSIX_MONOTONIC_CLOCK <= 0)
+#define _LIBCPP_HAS_NO_MONOTONIC_CLOCK
+#endif
+
 #ifndef _LIBCPP_STD_VER
 #  if  __cplusplus <= 201103L
 #    define _LIBCPP_STD_VER 11

include/chrono

diff --git a/include/chrono b/include/chrono
index 2c65eee..9229234 100644
--- a/include/chrono
+++ b/include/chrono
@@ -926,6 +926,7 @@
     static time_point from_time_t(time_t __t) _NOEXCEPT;
 };
 
+#ifndef _LIBCPP_HAS_NO_MONOTONIC_CLOCK
 class _LIBCPP_TYPE_VIS steady_clock
 {
 public:
@@ -939,6 +940,9 @@
 };
 
 typedef steady_clock high_resolution_clock;
+#else
+typedef system_clock high_resolution_clock;
+#endif
 
 } // chrono
 

src/chrono.cpp

diff --git a/src/chrono.cpp b/src/chrono.cpp
index 15a6f46..83661b0 100644
--- a/src/chrono.cpp
+++ b/src/chrono.cpp
@@ -46,6 +46,7 @@
     return system_clock::time_point(seconds(t));
 }
 
+#ifndef _LIBCPP_HAS_NO_MONOTONIC_CLOCK
 // steady_clock
 
 const bool steady_clock::is_steady;
@@ -127,6 +128,8 @@
 }
 #endif  // __APPLE__
 
+#endif // !_LIBCPP_HAS_NO_MONOTONIC_CLOCK
+
 }
 
 _LIBCPP_END_NAMESPACE_STD

test/utilities/time/time.clock/time.clock.steady/consistency.pass.cpp

diff --git a/test/utilities/time/time.clock/time.clock.steady/consistency.pass.cpp b/test/utilities/time/time.clock/time.clock.steady/consistency.pass.cpp
index bec6787..2ec62c4 100644
--- a/test/utilities/time/time.clock/time.clock.steady/consistency.pass.cpp
+++ b/test/utilities/time/time.clock/time.clock.steady/consistency.pass.cpp
@@ -11,6 +11,7 @@
 // darwin11 and darwin12:
 // XFAIL: with_system_lib=x86_64-apple-darwin11
 // XFAIL: with_system_lib=x86_64-apple-darwin12
+// UNSUPPORTED: no-monotonic-clock
 
 // <chrono>
 

test/utilities/time/time.clock/time.clock.steady/now.pass.cpp

diff --git a/test/utilities/time/time.clock/time.clock.steady/now.pass.cpp b/test/utilities/time/time.clock/time.clock.steady/now.pass.cpp
index 0c6ebe6..bd1735a 100644
--- a/test/utilities/time/time.clock/time.clock.steady/now.pass.cpp
+++ b/test/utilities/time/time.clock/time.clock.steady/now.pass.cpp
@@ -6,6 +6,8 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// UNSUPPORTED: no-monotonic-clock
 
 // <chrono>