uv: enable build on z/OS

Enable libuv to build on z/OS, by fixing the file status timestamp fields, and correcting the configurations. The GYP changes allows libuv to be built as a part of Node.js. The CMake changes enable libuv to be built standalone, and makes it possible to run the unit tests. The required header file `csrsic.h` can be found in zoslib, which can be specified using the `-DZOSLIB_DIR` option. PR-URL: #7
ibmruntimes · May 1, 2020 · 57a8181 · 57a8181
1 parent 26792fb
commit 57a8181
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/deps/uv/CMakeLists.txt b/deps/uv/CMakeLists.txt
@@ -224,7 +224,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "OS390")
-  list(APPEND uv_defines PATH_MAX=255)
+  list(APPEND uv_defines PATH_MAX=1024)
   list(APPEND uv_defines _AE_BIMODAL)
   list(APPEND uv_defines _ALL_SOURCE)
   list(APPEND uv_defines _ISOC99_SOURCE)
@@ -285,6 +285,9 @@ target_include_directories(uv
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
   PRIVATE
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
+if(CMAKE_SYSTEM_NAME STREQUAL "OS390")
+  target_include_directories(uv PUBLIC $<BUILD_INTERFACE:${ZOSLIB_DIR}/include>)
+endif()
 target_link_libraries(uv ${uv_libraries})
 
 add_library(uv_a STATIC ${uv_sources})
@@ -296,6 +299,9 @@ target_include_directories(uv_a
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
   PRIVATE
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
+if(CMAKE_SYSTEM_NAME STREQUAL "OS390")
+  target_include_directories(uv_a PUBLIC $<BUILD_INTERFACE:${ZOSLIB_DIR}/include>)
+endif()
 target_link_libraries(uv_a ${uv_libraries})
 
 if(LIBUV_BUILD_TESTS)

diff --git a/deps/uv/common.gypi b/deps/uv/common.gypi
@@ -11,7 +11,7 @@
     'configurations': {
       'Debug': {
         'defines': [ 'DEBUG', '_DEBUG' ],
-        'cflags': [ '-g' ],
+        'cflags': [ '-g', '-O0' ],
         'msvs_settings': {
           'VCCLCompilerTool': {
             'target_conditions': [
@@ -35,7 +35,7 @@
         },
         'conditions': [
           ['OS != "zos"', {
-            'cflags': [ '-O0', '-fno-common', '-fwrapv' ]
+            'cflags': [ '-fno-common', '-fwrapv' ]
           }],
           ['OS == "android"', {
             'cflags': [ '-fPIE' ],

diff --git a/deps/uv/src/unix/fs.c b/deps/uv/src/unix/fs.c
@@ -1294,7 +1294,8 @@ static void uv__to_stat(struct stat* src, uv_stat_t* dst) {
   dst->st_birthtim.tv_nsec = src->st_ctimensec;
   dst->st_flags = 0;
   dst->st_gen = 0;
-#elif !defined(_AIX) && (       \
+#elif !defined(_AIX) &&         \
+    !defined(__MVS__) && (      \
     defined(__DragonFly__)   || \
     defined(__FreeBSD__)     || \
     defined(__OpenBSD__)     || \

diff --git a/deps/uv/test/test-fs.c b/deps/uv/test/test-fs.c
@@ -1404,7 +1404,8 @@ TEST_IMPL(fs_fstat) {
   ASSERT(s->st_mtim.tv_nsec == t.st_mtimespec.tv_nsec);
   ASSERT(s->st_ctim.tv_sec == t.st_ctimespec.tv_sec);
   ASSERT(s->st_ctim.tv_nsec == t.st_ctimespec.tv_nsec);
-#elif defined(_AIX)
+#elif defined(_AIX)    || \
+      defined(__MVS__)
   ASSERT(s->st_atim.tv_sec == t.st_atime);
   ASSERT(s->st_atim.tv_nsec == 0);
   ASSERT(s->st_mtim.tv_sec == t.st_mtime);

diff --git a/deps/uv/uv.gyp b/deps/uv/uv.gyp
@@ -360,7 +360,12 @@
             'src/unix/pthread-fixes.c',
             'src/unix/os390.c',
             'src/unix/os390-syscalls.c'
-          ]
+          ],
+          'cflags': [
+            '-qenum=int',
+            '-qexportall',
+            '-qascii',
+          ],
         }],
       ]
     },