X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FRtsUtils.c;h=ce1c0a2493a67077bb234d71cbede8a71cd02237;hb=153b9cb9b11e05c4edb1b6bc0a7b972660e41f70;hp=89a8af1e667842e284288a42c2b6a95b5f2e7332;hpb=1d10874717ff05d2babc9cbf079d5895fcc0a922;p=ghc-hetmet.git

diff --git a/ghc/rts/RtsUtils.c b/ghc/rts/RtsUtils.c
index 89a8af1..ce1c0a2 100644
--- a/ghc/rts/RtsUtils.c
+++ b/ghc/rts/RtsUtils.c
@@ -32,6 +32,14 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+
+#if defined(THREADED_RTS) && defined(openbsd_HOST_OS) && defined(HAVE_PTHREAD_H)
+#include <pthread.h>
+#endif
+
 /* -----------------------------------------------------------------------------
    Result-checking malloc wrappers.
    -------------------------------------------------------------------------- */
@@ -183,7 +191,7 @@ time_str(void)
  * clean up for us.
  * -------------------------------------------------------------------------- */
 
-#if !defined(mingw32_TARGET_OS)
+#if !defined(mingw32_HOST_OS)
 void
 resetNonBlockingFd(int fd)
 {
@@ -222,7 +230,7 @@ static ullong startTime = 0;
 ullong
 msTime(void)
 {
-# if defined(HAVE_GETCLOCK) && !defined(alpha_TARGET_ARCH) && !defined(hppa1_1_TARGET_ARCH)
+# if defined(HAVE_GETCLOCK) && !defined(alpha_HOST_ARCH) && !defined(hppa1_1_HOST_ARCH)
     struct timespec tv;
 
     if (getclock(TIMEOFDAY, &tv) != 0) {
@@ -231,7 +239,7 @@ msTime(void)
 	stg_exit(EXIT_FAILURE);
     }
     return tv.tv_sec * LL(1000) + tv.tv_nsec / LL(1000000) - startTime;
-# elif HAVE_GETTIMEOFDAY && !defined(alpha_TARGET_ARCH)
+# elif HAVE_GETTIMEOFDAY && !defined(alpha_HOST_ARCH)
     struct timeval tv;
  
     if (gettimeofday(&tv, NULL) != 0) {
@@ -288,3 +296,17 @@ heapCheckFail( void )
 }
 #endif
 
+/* 
+ * It seems that pthreads and signals interact oddly in OpenBSD & FreeBSD
+ * pthreads (and possibly others). When linking with -lpthreads, we
+ * have to use pthread_kill to send blockable signals. So use that
+ * when we have a threaded rts. So System.Posix.Signals will call
+ * genericRaise(), rather than raise(3).
+ */
+int genericRaise(int sig) {
+#if defined(THREADED_RTS) && (defined(openbsd_HOST_OS) || defined(freebsd_HOST_OS))
+        return pthread_kill(pthread_self(), sig);
+#else
+        return raise(sig);
+#endif
+}