commit ad6c9c3dbf7541340f22ccbb333f08556ad7e000
author Elliott Hughes <enh@google.com> Thu Jan 19 17:39:12 2012 -0800
committer Elliott Hughes <enh@google.com> Fri Jan 20 14:04:02 2012 -0800
tree dc11a1165c0f145cf3e6b5edc16bea8b57ba62fe
parent d1029981c8ec2341f76376c8d8e15d72dda4c45f

Mac build fixes.

This gets us pretty close. There are a few problems with libraries we depend
on (system/core/liblog and external/icu4c) that I have workarounds for, and
a problem with gtest that I haven't yet worked around that prevents us from
linking any of the tests. But this at least gives us a Mac dex2oat binary.

Change-Id: Iac39a6c2963c3d37ab2165d7d1a70e303ba22c45

src/utils.cc

diff --git a/src/utils.cc b/src/utils.cc
index bf15bd7..cc0a702 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -16,6 +16,10 @@
 #include "object_utils.h"
 #include "os.h"
 
+#if !defined(HAVE_POSIX_CLOCKS)
+#include <sys/time.h>
+#endif
+
 #if defined(HAVE_PRCTL)
 #include <sys/prctl.h>
 #endif
@@ -66,27 +70,50 @@
 }
 
 uint64_t MilliTime() {
+#if defined(HAVE_POSIX_CLOCKS)
   struct timespec now;
   clock_gettime(CLOCK_MONOTONIC, &now);
   return static_cast<uint64_t>(now.tv_sec) * 1000LL + now.tv_nsec / 1000000LL;
+#else
+  struct timeval now;
+  gettimeofday(&now, NULL);
+  return static_cast<uint64_t>(now.tv_sec) * 1000LL + now.tv_usec / 1000LL;
+#endif
 }
 
 uint64_t MicroTime() {
+#if defined(HAVE_POSIX_CLOCKS)
   struct timespec now;
   clock_gettime(CLOCK_MONOTONIC, &now);
   return static_cast<uint64_t>(now.tv_sec) * 1000000LL + now.tv_nsec / 1000LL;
+#else
+  struct timeval now;
+  gettimeofday(&now, NULL);
+  return static_cast<uint64_t>(now.tv_sec) * 1000000LL + now.tv_usec * 1000LL;
+#endif
 }
 
 uint64_t NanoTime() {
+#if defined(HAVE_POSIX_CLOCKS)
   struct timespec now;
   clock_gettime(CLOCK_MONOTONIC, &now);
   return static_cast<uint64_t>(now.tv_sec) * 1000000000LL + now.tv_nsec;
+#else
+  struct timeval now;
+  gettimeofday(&now, NULL);
+  return static_cast<uint64_t>(now.tv_sec) * 1000000000LL + now.tv_usec * 1000LL;
+#endif
 }
 
 uint64_t ThreadCpuMicroTime() {
+#if defined(HAVE_POSIX_CLOCKS)
   struct timespec now;
   clock_gettime(CLOCK_THREAD_CPUTIME_ID, &now);
   return static_cast<uint64_t>(now.tv_sec) * 1000000LL + now.tv_nsec / 1000LL;
+#else
+  UNIMPLEMENTED(WARNING);
+  return -1;
+#endif
 }
 
 std::string PrettyDescriptor(const String* java_descriptor) {
@@ -563,7 +590,7 @@
 #elif defined(HAVE_PRCTL)
   prctl(PR_SET_NAME, (unsigned long) s, 0, 0, 0);
 #else
-#error no implementation for SetThreadName
+  UNIMPLEMENTED(WARNING) << threadName;
 #endif
 }