illumos build fix

Author: jwntree

CMakeLists.txt

@@ -32,6 +32,12 @@ else()
     set(WATCHOS FALSE)
 endif()
 
+if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+    set(SUNOS TRUE)
+else()
+    set(SUNOS FALSE)
+endif()
+
 if(NOT CMAKE_BUILD_TYPE)
     message(STATUS "No build type selected, default to Release")
     set(CMAKE_BUILD_TYPE "Release")
@@ -62,7 +68,9 @@ xcheck_add_c_compiler_flag(-Wno-unused-but-set-variable)
 xcheck_add_c_compiler_flag(-Wno-unused-result)
 xcheck_add_c_compiler_flag(-Wno-stringop-truncation)
 xcheck_add_c_compiler_flag(-Wno-array-bounds)
+if(NOT SUNOS)
 xcheck_add_c_compiler_flag(-funsigned-char)
+endif()
 
 # ClangCL is command line compatible with MSVC, so 'MSVC' is set.
 if(MSVC)

cutils.h

@@ -59,6 +59,10 @@ extern "C" {
 #include <unistd.h>
 #endif
 
+#if defined(__sun)
+#undef __maybe_unused
+#endif
+
 #if defined(_MSC_VER) && !defined(__clang__)
 #  define likely(x)       (x)
 #  define unlikely(x)     (x)

libregexp.c

@@ -31,6 +31,10 @@
 #include "cutils.h"
 #include "libregexp.h"
 
+#if defined(__sun)
+#include <alloca.h>
+#endif
+
 /*
   TODO:
 

meson.build

@@ -33,9 +33,11 @@ qjs_gcc_warning_args = [
   '-Wno-array-bounds',
   '-Wno-format-truncation',
 ]
-qjs_gcc_args = [
-  '-funsigned-char',
-]
+qjs_gcc_args = []
+
+if host_system != 'sunos'
+  qjs_gcc_args += '-funsigned-char'
+endif
 
 if host_system == 'darwin'
   # https://github.com/quickjs-ng/quickjs/issues/453

quickjs-libc.c

@@ -73,6 +73,11 @@ typedef sig_t sighandler_t;
 #define environ (*_NSGetEnviron())
 #endif
 
+#ifdef __sun
+typedef void (*sighandler_t)(int);
+extern char **environ;
+#endif
+
 #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
 typedef sig_t sighandler_t;
 extern char **environ;

quickjs.c

@@ -65,6 +65,11 @@
 #define NO_TM_GMTOFF
 #endif
 
+#if defined(__sun)
+#include <alloca.h>
+#define NO_TM_GMTOFF
+#endif
+
 // atomic_store etc. are completely busted in recent versions of tcc;
 // somehow the compiler forgets to load |ptr| into %rdi when calling
 // the __atomic_*() helpers in its lib/stdatomic.c and lib/atomic.S

run-test262.c

@@ -38,6 +38,7 @@
 #else
 #include <dirent.h>
 #include <unistd.h>
+#include <sys/stat.h>
 #endif
 
 #include "cutils.h"
@@ -418,6 +419,11 @@ static void consider_test_file(const char *path, const char *name, int is_dir)
     while (pathlen > 0 && ispathsep(path[pathlen-1]))
         pathlen--;
     snprintf(s, sizeof(s), "%.*s/%s", (int)pathlen, path, name);
+#if !defined(_WIN32) && !defined(DT_DIR)
+    struct stat st;
+    if (is_dir < 0)
+        is_dir = !stat(s, &st) && S_ISDIR(st.st_mode);
+#endif
     if (is_dir)
         find_test_files(s);
     else
@@ -448,7 +454,11 @@ static void find_test_files(const char *path)
     n = scandir(path, &ds, NULL, alphasort);
     for (i = 0; i < n; i++) {
         d = ds[i];
+#ifdef DT_DIR
         consider_test_file(path, d->d_name, d->d_type == DT_DIR);
+#else
+        consider_test_file(path, d->d_name, -1);
+#endif
         free(d);
     }
     free(ds);