summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Hosek <phosek@chromium.org>2019-05-09 23:42:58 +0000
committerPetr Hosek <phosek@chromium.org>2019-05-09 23:42:58 +0000
commit4fa4df9cdce793667a5c36439a0240965c99687f (patch)
tree6b60746c727a776c95121e31689ae1d77aae8d8d
parentbd588dfd594774197bd53dc555f9512b301328db (diff)
downloadbcm5719-llvm-4fa4df9cdce793667a5c36439a0240965c99687f.tar.gz
bcm5719-llvm-4fa4df9cdce793667a5c36439a0240965c99687f.zip
[compiler-rt] Migrate to _zx_clock_get_new/_zx_clock_get_monotonic
This is part of the soft-transition to the new _zx_clock_get signature. Differential Revision: https://reviews.llvm.org/D61768 llvm-svn: 360394
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_fuchsia.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_fuchsia.cc b/compiler-rt/lib/sanitizer_common/sanitizer_fuchsia.cc
index 9f6851ff019..d358e7e00f8 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_fuchsia.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_fuchsia.cc
@@ -46,9 +46,14 @@ unsigned int internal_sleep(unsigned int seconds) {
return 0;
}
-u64 NanoTime() { return _zx_clock_get(ZX_CLOCK_UTC); }
+u64 NanoTime() {
+ zx_time_t time;
+ zx_status_t status = _zx_clock_get_new(ZX_CLOCK_UTC, &time);
+ CHECK_EQ(status, ZX_OK);
+ return time;
+}
-u64 MonotonicNanoTime() { return _zx_clock_get(ZX_CLOCK_MONOTONIC); }
+u64 MonotonicNanoTime() { return _zx_clock_get_monotonic(); }
uptr internal_getpid() {
zx_info_handle_basic_t info;
OpenPOWER on IntegriCloud