Ticket #54104: patch-libcilkrts-runtime-sysdep-tigerfix.diff

./libcilkrts/runtime/sysdep-unix.c

@@ -99 +99 @@
 //#   include <scheduler.h>  // Angle brackets include Apple's scheduler.h, not ours.
 #endif
 
+#ifdef __APPLE__
+#ifndef __MAC_OS_X_VERSION_MIN_REQUIRED
+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
+#include <Availability.h>
+#else
+#include <AvailabilityMacros.h>
+#endif
+#endif //#ifndef __MAC_OS_X_VERSION_MIN_REQUIRED
+
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#define _SC_NPROCESSORS_ONLN 58
+
+long tigersysconf(int name){
+
+    if (name == _SC_NPROCESSORS_ONLN) {
+                int nm[2];
+                size_t len = 4;
+                uint32_t count;
+                
+                nm[0] = CTL_HW; nm[1] = HW_AVAILCPU;
+                sysctl(nm, 2, &count, &len, NULL, 0);
+                
+                if (count < 1) {
+                        nm[1] = HW_NCPU;
+                        sysctl(nm, 2, &count, &len, NULL, 0);
+                        if (count < 1) { count = 1; }
+                        }
+                        
+                return (long)count;
+    }
+    return -1;
+}
+#endif //#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+#endif //#ifdef __APPLE__
+
+
+
 #ifdef __linux__
 #   include <sys/resource.h>
 #   include <sys/sysinfo.h>
@@ -733 +773 @@
 #ifdef __VXWORKS__      
     fprintf(fp, "System cores: %d\n", (int)__builtin_popcount(vxCpuEnabledGet()));
 #else    
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+    fprintf(fp, "System cores: %d\n", (int)tigersysconf(_SC_NPROCESSORS_ONLN));
+#else
     fprintf(fp, "System cores: %d\n", (int)sysconf(_SC_NPROCESSORS_ONLN));
+#endif
+
 #endif    
     fprintf(fp, "Cilk workers requested: %d\n", n);
 #if (PARALLEL_THREAD_CREATE)