Fix QNX build.

Note: this is not an officially supported target.
Contributed by Wen Yang.

diff --git a/src/lj_arch.h b/src/lj_arch.h
index 882c99cb2c3a6ff9e32a7224f7f74c0281d574ae..5fb798d9aaa3f5a88eb0e141b904672ef4ebf0da 100644 (file)
--- a/src/lj_arch.h
+++ b/src/lj_arch.h
@@ -93,6 +93,9 @@
 #elif defined(__CYGWIN__)
 #define LJ_TARGET_CYGWIN       1
 #define LUAJIT_OS      LUAJIT_OS_POSIX
+#elif defined(__QNX__)
+#define LJ_TARGET_QNX          1
+#define LUAJIT_OS      LUAJIT_OS_POSIX
 #else
 #define LUAJIT_OS      LUAJIT_OS_OTHER
 #endif

diff --git a/src/lj_prng.c b/src/lj_prng.c
index 9e57505e8102794ac49761c58a1e17fd39b5e59a..01935e57a0cb883b95a6132a01755d1a0f4c2d17 100644 (file)
--- a/src/lj_prng.c
+++ b/src/lj_prng.c
@@ -125,7 +125,7 @@ static PRGR libfunc_rgr;
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
 #define LJ_TARGET_HAS_GETENTROPY       1
 #endif
-#elif (LJ_TARGET_BSD && !defined(__NetBSD__)) || LJ_TARGET_SOLARIS || LJ_TARGET_CYGWIN
+#elif (LJ_TARGET_BSD && !defined(__NetBSD__)) || LJ_TARGET_SOLARIS || LJ_TARGET_CYGWIN || LJ_TARGET_QNX
 #define LJ_TARGET_HAS_GETENTROPY       1
 #endif
 

diff --git a/src/lj_profile.c b/src/lj_profile.c
index f0af91cb29bbee8f0916c25f1055dc6c5d4001ba..4a13537d0b823ca7a434e83482ccb6cf9a2c6cb6 100644 (file)
--- a/src/lj_profile.c
+++ b/src/lj_profile.c
@@ -185,7 +185,11 @@ static void profile_timer_start(ProfileState *ps)
   tm.it_value.tv_sec = tm.it_interval.tv_sec = interval / 1000;
   tm.it_value.tv_usec = tm.it_interval.tv_usec = (interval % 1000) * 1000;
   setitimer(ITIMER_PROF, &tm, NULL);
+#if LJ_TARGET_QNX
+  sa.sa_flags = 0;
+#else
   sa.sa_flags = SA_RESTART;
+#endif
   sa.sa_handler = profile_signal;
   sigemptyset(&sa.sa_mask);
   sigaction(SIGPROF, &sa, &ps->oldsa);