Merge branch 'master' into fakesyscall

minecraft-linux · Sep 26, 2020 · d6d6991 · d6d6991
2 parents a41dc3e + 6b46b28
commit d6d6991
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/src/common.cpp b/src/common.cpp
@@ -35,6 +35,11 @@
 #endif
 #ifdef __APPLE__
 #include <xlocale.h>
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
+// for macOS 10.10 - 10.11
+#include <mach/clock.h>
+#include <mach/mach.h>
+#endif
 #endif
 #include <inttypes.h>
 
@@ -146,7 +151,28 @@ ssize_t shim::pwrite(int fd, const void *buf, size_t len, bionic::off_t off) {
 #endif
 
 int shim::clock_gettime(bionic::clock_type clock, struct timespec *ts) {
+#if defined(__APPLE__) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
+    if(::clock_gettime != NULL) {
+#endif
     return ::clock_gettime(bionic::to_host_clock_type(clock), ts);
+#if defined(__APPLE__) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
+    } else {
+        // fallback if weak symbol is nullptr < macOS 10.12
+        clock_serv_t cclock;
+        mach_timespec_t mts;
+        if (host_get_clock_service(mach_host_self(), clock == bionic::clock_type::MONOTONIC ? SYSTEM_CLOCK : CALENDAR_CLOCK, &cclock) != KERN_SUCCESS) {
+            return -1;
+        }
+        kern_return_t r = clock_get_time(cclock, &mts);
+        mach_port_deallocate(mach_task_self(), cclock);
+        if (r != KERN_SUCCESS) {
+            return -1;
+        }
+        ts->tv_sec = mts.tv_sec;
+        ts->tv_nsec = mts.tv_nsec;
+        return 0;
+    }
+#endif
 }
 
 void* shim::memalign(size_t alignment, size_t size) {

diff --git a/src/semaphore.cpp b/src/semaphore.cpp
@@ -5,6 +5,10 @@
 #ifdef __APPLE__
 #include <errno.h>
 #include <mach/mach.h>
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
+// for shim::clock_gettime 10.10 - 10.12
+#include "common.h"
+#endif
 #endif
 
 using namespace shim;
@@ -56,7 +60,11 @@ int shim::sem_post(host_sem_t *sem) {
 
 int shim::sem_timedwait(host_sem_t *sem, const struct timespec *abs_timeout) {
     struct timespec now;
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
+    shim::clock_gettime(shim::bionic::clock_type::REALTIME, &now);
+#else
     clock_gettime(CLOCK_REALTIME, &now);
+#endif
     mach_timespec_t ts;
     if  (abs_timeout->tv_sec > now.tv_sec ||
          (abs_timeout->tv_sec == now.tv_sec && abs_timeout->tv_nsec > now.tv_nsec)) {