mjit.c: initial cygwin support

k0kubun · k0kubun · commit ea0cede5aa04 · 2018-06-23T07:21:12.000Z
thread_pthread.c: Drop pthread_attr_setscope usage. It seems that, at least on Linux and macOS, PTHREAD_SCOPE_PROCESS is not supported and thus PTHREAD_SCOPE_SYSTEM should be used by default. Let's just stop calling this until we find some platform that needs `pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM)`. [Misc #14854] From: fd0 (Daisuke Fujimura) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63730 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/mjit.c b/mjit.c
@@ -610,18 +610,20 @@ static const char *const CC_DLDFLAGS_ARGS[] = {
     MJIT_DLDFLAGS
 #if defined __GNUC__ && !defined __clang__
     "-nostartfiles",
-# ifndef _WIN32
+# if !defined(_WIN32) && !defined(__CYGWIN__)
     "-nodefaultlibs", "-nostdlib",
 # endif
 #endif
     NULL
 };
 
 static const char *const CC_LIBS[] = {
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__CYGWIN__)
     MJIT_LIBS
 # if defined __GNUC__ && !defined __clang__
+#  if defined(_WIN32)
     "-lmsvcrt",
+#  endif
     "-lgcc",
 # endif
 #endif
diff --git a/thread_pthread.c b/thread_pthread.c
@@ -1757,7 +1757,6 @@ rb_thread_create_mjit_thread(void (*child_hook)(void), void (*worker_func)(void)
 
     /* jit_worker thread is not to be joined */
     if (pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) == 0
-        && pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM) == 0
         && pthread_create(&worker_pid, &attr, mjit_worker, (void *)worker_func) == 0) {
         ret = TRUE;
     }

Original file line number	Diff line number	Diff line change
`@@ -1757,7 +1757,6 @@ rb_thread_create_mjit_thread(void (child_hook)(void), void (worker_func)(void)`
`1757`	`1757`
`1758`	`1758`	`/* jit_worker thread is not to be joined */`
`1759`	`1759`	`if (pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) == 0`
`1760`		`- && pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM) == 0`
`1761`	`1760`	`&& pthread_create(&worker_pid, &attr, mjit_worker, (void *)worker_func) == 0) {`
`1762`	`1761`	`ret = TRUE;`
`1763`	`1762`	`}`