From c6ab4d58a0dae0d8187fa475d00cc99a7d148e1b Mon Sep 17 00:00:00 2001
From: mengxumx <mengxumx@cn.ibm.com>
Date: Mon, 11 Apr 2022 11:32:21 +0800
Subject: [PATCH 1/2] build,test: add proper support for IBM i

Python 3.9 on IBM i now properly returns "os400" for sys.platform
instead of claiming to be AIX as it did previously. While the IBM i PASE
environment is compatible with AIX, it is a subset and has numerous
differences which makes it beneficial to distinguish, however this means
that it now needs explicit support here.
---
 Makefile                                 |  3 ++
 common.gypi                              | 60 +++++++++++-------------
 configure.py                             |  9 +++-
 node.gyp                                 | 12 ++---
 node.gypi                                |  6 +--
 test/addons/common.gypi                  |  2 +-
 test/addons/dlopen-ping-pong/binding.gyp |  2 +-
 test/addons/openssl-binding/binding.gyp  |  2 +-
 test/addons/zlib-binding/binding.gyp     |  2 +-
 tools/install.py                         |  2 +-
 tools/v8_gypfiles/d8.gyp                 |  2 +-
 tools/v8_gypfiles/toolchain.gypi         | 16 +++----
 tools/v8_gypfiles/v8.gyp                 |  8 +++-
 13 files changed, 67 insertions(+), 59 deletions(-)

diff --git a/Makefile b/Makefile
index 4aace77c7c8c63..8dba4eb1ab6c7a 100644
--- a/Makefile
+++ b/Makefile
@@ -345,6 +345,9 @@ DOCBUILDSTAMP_PREREQS = tools/doc/addon-verify.mjs doc/api/addons.md
 ifeq ($(OSTYPE),aix)
 DOCBUILDSTAMP_PREREQS := $(DOCBUILDSTAMP_PREREQS) out/$(BUILDTYPE)/node.exp
 endif
+ifeq ($(OSTYPE),os400)
+DOCBUILDSTAMP_PREREQS := $(DOCBUILDSTAMP_PREREQS) out/$(BUILDTYPE)/node.exp
+endif
 
 node_use_openssl = $(call available-node,"-p" \
 			 "process.versions.openssl != undefined")
diff --git a/common.gypi b/common.gypi
index f4cec334c19a5f..8c605105888738 100644
--- a/common.gypi
+++ b/common.gypi
@@ -137,7 +137,7 @@
         'defines': [ 'DEBUG', '_DEBUG', 'V8_ENABLE_CHECKS' ],
         'cflags': [ '-g', '-O0' ],
         'conditions': [
-          ['OS=="aix"', {
+          ['OS=="aix" or OS=="os400"', {
             'cflags': [ '-gxcoff' ],
             'ldflags': [ '-Wl,-bbigtoc' ],
           }],
@@ -394,11 +394,11 @@
           'BUILDING_UV_SHARED=1',
         ],
       }],
-      [ 'OS in "linux freebsd openbsd solaris aix"', {
+      [ 'OS in "linux freebsd openbsd solaris aix os400"', {
         'cflags': [ '-pthread' ],
         'ldflags': [ '-pthread' ],
       }],
-      [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+      [ 'OS in "linux freebsd openbsd solaris android aix os400 cloudabi"', {
         'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ],
         'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++17' ],
         'defines': [ '__STDC_FORMAT_MACROS' ],
@@ -422,11 +422,11 @@
             'cflags': [ '-m64' ],
             'ldflags': [ '-m64' ],
           }],
-          [ 'target_arch=="ppc" and OS!="aix"', {
+          [ 'target_arch=="ppc" and OS not in "aix os400"', {
             'cflags': [ '-m32' ],
             'ldflags': [ '-m32' ],
           }],
-          [ 'target_arch=="ppc64" and OS!="aix"', {
+          [ 'target_arch=="ppc64" and OS not in "aix os400"', {
             'cflags': [ '-m64', '-mminimal-toc' ],
             'ldflags': [ '-m64' ],
           }],
@@ -445,39 +445,33 @@
           }],
         ],
       }],
+      [ 'OS=="os400"', {
+         'ldflags!': [ '-rdynamic', ],
+         'ldflags': [
+            '-Wl,-bbigtoc',
+            '-Wl,-blibpath:/QOpenSys/pkgs/lib:/QOpenSys/usr/lib',
+        ],
+      }],
       [ 'OS=="aix"', {
-        'variables': {
-          # Used to differentiate `AIX` and `OS400`(IBM i).
-          'aix_variant_name': '<!(uname -s)',
-        },
-        'cflags': [ '-maix64', ],
+        'cflags': [
+           '-maix64',
+          # Disable the following compiler warning:
+          #
+          #   warning: visibility attribute not supported in this
+          #   configuration; ignored [-Wattributes]
+          #
+          # This is gcc complaining about __attribute((visibility("default"))
+          # in static library builds. Legitimate but harmless and it drowns
+          # out more relevant warnings.
+          '-Wno-attributes'
+         ],
         'ldflags!': [ '-rdynamic', ],
         'ldflags': [
           '-Wl,-bbigtoc',
           '-maix64',
-        ],
-        'conditions': [
-          [ '"<(aix_variant_name)"=="OS400"', {            # a.k.a. `IBM i`
-            'ldflags': [
-              '-Wl,-blibpath:/QOpenSys/pkgs/lib:/QOpenSys/usr/lib',
-              '-Wl,-brtl',
-            ],
-          }, {                                             # else it's `AIX`
-            # Disable the following compiler warning:
-            #
-            #   warning: visibility attribute not supported in this
-            #   configuration; ignored [-Wattributes]
-            #
-            # This is gcc complaining about __attribute((visibility("default"))
-            # in static library builds. Legitimate but harmless and it drowns
-            # out more relevant warnings.
-            'cflags': [ '-Wno-attributes' ],
-            'ldflags': [
-              '-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread/ppc64',
-            ],
-          }],
-        ],
-      }],
+          '-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread/ppc64',
+         ],
+       }],
       ['OS=="android"', {
         'target_conditions': [
           ['_toolset=="target"', {
diff --git a/configure.py b/configure.py
index 6519cf3b9624d2..e4002d2bcdf31e 100755
--- a/configure.py
+++ b/configure.py
@@ -45,7 +45,7 @@
 parser = argparse.ArgumentParser()
 
 valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux',
-            'android', 'aix', 'cloudabi')
+            'android', 'aix', 'os400', 'cloudabi')
 valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64el', 'ppc',
               'ppc64', 'x64', 'x86', 'x86_64', 's390x', 'riscv64', 'loong64')
 valid_arm_float_abi = ('soft', 'softfp', 'hard')
@@ -1256,7 +1256,7 @@ def configure_node(o):
   elif sys.platform == 'zos':
     configure_zos(o)
 
-  if flavor == 'aix':
+  if flavor == 'aix' or flavor == 'os400':
     o['variables']['node_target_type'] = 'static_library'
 
   if flavor != 'linux' and (options.enable_pgo_generate or options.enable_pgo_use):
@@ -1367,6 +1367,8 @@ def configure_node(o):
     shlib_suffix = '%s.dylib'
   elif sys.platform.startswith('aix'):
     shlib_suffix = '%s.a'
+  elif sys.platform == 'os400':
+    shlib_suffix = '%s.a'
   elif sys.platform.startswith('zos'):
     shlib_suffix = '%s.x'
   else:
@@ -1863,6 +1865,9 @@ def icu_download(path):
   elif flavor == 'mac':
     icu_config['variables']['icu_asm_ext'] = 'S'
     icu_config['variables']['icu_asm_opts'] = [ '-a', 'gcc-darwin' ]
+  elif sys.platform == 'os400':
+    icu_config['variables']['icu_asm_ext'] = 'S'
+    icu_config['variables']['icu_asm_opts'] = [ '-a', 'xlc' ]
   elif sys.platform.startswith('aix'):
     icu_config['variables']['icu_asm_ext'] = 'S'
     icu_config['variables']['icu_asm_opts'] = [ '-a', 'xlc' ]
diff --git a/node.gyp b/node.gyp
index 0a6eca012daad1..7aac97140b0245 100644
--- a/node.gyp
+++ b/node.gyp
@@ -65,7 +65,7 @@
       [ 'node_shared=="true"', {
         'node_target_type%': 'shared_library',
         'conditions': [
-          ['OS=="aix"', {
+          ['OS=="aix" or OS=="os400"', {
             # For AIX, always generate static library first,
             # It needs an extra step to generate exp and
             # then use both static lib and exp to create
@@ -113,7 +113,7 @@
     },
 
     'conditions': [
-      ['OS=="aix"', {
+      ['OS=="aix" or OS=="os400"', {
         'ldflags': [
           '-Wl,-bnoerrmsg',
         ],
@@ -188,7 +188,7 @@
           },
         }],
         [ 'node_intermediate_lib_type=="static_library" and '
-            'node_shared=="true" and OS=="aix"', {
+            'node_shared=="true" and OS in "aix os400"', {
           # For AIX, shared lib is linked by static lib and .exp. In the
           # case here, the executable needs to link to shared lib.
           # Therefore, use 'node_aix_shared' target to generate the
@@ -213,7 +213,7 @@
             },
           },
           'conditions': [
-            ['OS != "aix" and OS != "mac"', {
+            ['OS != "aix" and OS != "os400" and OS != "mac"', {
               'ldflags': [
                 '-Wl,--whole-archive',
                 '<(obj_dir)/<(STATIC_LIB_PREFIX)<(node_core_target_name)<(STATIC_LIB_SUFFIX)',
@@ -728,7 +728,7 @@
               '@rpath/lib<(node_core_target_name).<(shlib_suffix)'
           },
         }],
-        ['node_shared=="true" and OS=="aix"', {
+        ['node_shared=="true" and OS in "aix os400"', {
           'product_name': 'node_base',
         }],
         [ 'v8_enable_inspector==1', {
@@ -1473,7 +1473,7 @@
   ], # end targets
 
   'conditions': [
-    ['OS=="aix" and node_shared=="true"', {
+    ['OS in "aix os400" and node_shared=="true"', {
       'targets': [
         {
           'target_name': 'node_aix_shared',
diff --git a/node.gypi b/node.gypi
index e8aa664468ac1e..1ad336b2bbb8ef 100644
--- a/node.gypi
+++ b/node.gypi
@@ -132,7 +132,7 @@
             },
           },
           'conditions': [
-            ['OS!="aix" and node_shared=="false"', {
+            ['OS not in "aix os400" and node_shared=="false"', {
               'ldflags': [
                 '-Wl,--whole-archive',
                 '<(obj_dir)/deps/zlib/<(STATIC_LIB_PREFIX)zlib<(STATIC_LIB_SUFFIX)',
@@ -171,7 +171,7 @@
             },
           },
           'conditions': [
-            ['OS!="aix" and node_shared=="false"', {
+            ['OS not in "aix os400" and node_shared=="false"', {
               'ldflags': [
                 '-Wl,--whole-archive',
                 '<(obj_dir)/deps/uv/<(STATIC_LIB_PREFIX)uv<(STATIC_LIB_SUFFIX)',
@@ -209,7 +209,7 @@
         '-lkvm',
       ],
     }],
-    [ 'OS=="aix"', {
+    [ 'OS=="aix" or OS=="os400"', {
       'defines': [
         '_LINUX_SOURCE_COMPAT',
         '__STDC_FORMAT_MACROS',
diff --git a/test/addons/common.gypi b/test/addons/common.gypi
index 3f1c11dc3cda15..5c094b8f64b869 100644
--- a/test/addons/common.gypi
+++ b/test/addons/common.gypi
@@ -1,7 +1,7 @@
 {
   'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
   'conditions': [
-    [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+    [ 'OS in "linux freebsd openbsd solaris android aix os400 cloudabi"', {
       'cflags': ['-Wno-cast-function-type'],
     }],
   ],
diff --git a/test/addons/dlopen-ping-pong/binding.gyp b/test/addons/dlopen-ping-pong/binding.gyp
index 8569b011fac8e5..c3edcf0dbedc57 100644
--- a/test/addons/dlopen-ping-pong/binding.gyp
+++ b/test/addons/dlopen-ping-pong/binding.gyp
@@ -11,7 +11,7 @@
             'OTHER_LDFLAGS': [ '-Wl,-undefined', '-Wl,dynamic_lookup' ]
         }}],
         # Enable the shared object to be linked by runtime linker
-        ['OS=="aix"', {
+        ['OS in "aix os400"', {
           'ldflags': [ '-Wl,-G' ]
         }]],
     },
diff --git a/test/addons/openssl-binding/binding.gyp b/test/addons/openssl-binding/binding.gyp
index c9ce9f1b2a6f6a..e1dc611d78edae 100644
--- a/test/addons/openssl-binding/binding.gyp
+++ b/test/addons/openssl-binding/binding.gyp
@@ -6,7 +6,7 @@
       'conditions': [
         ['node_use_openssl=="true"', {
           'conditions': [
-            ['OS=="aix"', {
+            ['OS in "aix os400"', {
               'variables': {
                 # Used to differentiate `AIX` and `OS400`(IBM i).
                 'aix_variant_name': '<!(uname -s)',
diff --git a/test/addons/zlib-binding/binding.gyp b/test/addons/zlib-binding/binding.gyp
index f0f6d62a5f248c..f6a822d47e9c7b 100644
--- a/test/addons/zlib-binding/binding.gyp
+++ b/test/addons/zlib-binding/binding.gyp
@@ -3,7 +3,7 @@
     {
       'target_name': 'binding',
       'conditions': [
-        ['OS=="aix"', {
+        ['OS in "aix os400"', {
           'variables': {
             # Used to differentiate `AIX` and `OS400`(IBM i).
             'aix_variant_name': '<!(uname -s)',
diff --git a/tools/install.py b/tools/install.py
index e2440a082f2be7..7cb69a2da780d8 100755
--- a/tools/install.py
+++ b/tools/install.py
@@ -249,7 +249,7 @@ def wanted_zoslib_headers(files_arg, dest):
   ], 'include/node/')
 
   # Add the expfile that is created on AIX
-  if sys.platform.startswith('aix'):
+  if sys.platform.startswith('aix') or sys.platform == "os400":
     action(['out/Release/node.exp'], 'include/node/')
 
   subdir_files('deps/v8/include', 'include/node/', wanted_v8_headers)
diff --git a/tools/v8_gypfiles/d8.gyp b/tools/v8_gypfiles/d8.gyp
index 1780e1ab0dbccf..f5e84bd9eb33bd 100644
--- a/tools/v8_gypfiles/d8.gyp
+++ b/tools/v8_gypfiles/d8.gyp
@@ -45,7 +45,7 @@
         }],
         ['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \
            or OS=="openbsd" or OS=="solaris" or OS=="android" \
-           or OS=="qnx" or OS=="aix")', {
+           or OS=="qnx" or OS=="aix" or OS=="os400")', {
              'sources': [ '<(V8_ROOT)/src/d8/d8-posix.cc', ]
            }],
         [ 'OS=="win"', {
diff --git a/tools/v8_gypfiles/toolchain.gypi b/tools/v8_gypfiles/toolchain.gypi
index 0f8166011ffda1..5e802de3b33bfd 100644
--- a/tools/v8_gypfiles/toolchain.gypi
+++ b/tools/v8_gypfiles/toolchain.gypi
@@ -330,11 +330,11 @@
               'V8_TARGET_ARCH_PPC_BE',
             ],
             'conditions': [
-              ['OS=="aix"', {
+              ['OS=="aix" or OS=="os400"', {
                 # Work around AIX ceil, trunc and round oddities.
                 'cflags': [ '-mcpu=power5+ -mfprnd' ],
               }],
-              ['OS=="aix"', {
+              ['OS=="aix" or OS=="os400"', {
                 # Work around AIX assembler popcntb bug.
                 'cflags': [ '-mno-popcntb' ],
               }],
@@ -1098,7 +1098,7 @@
         ],
       }],
       ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
-         or OS=="netbsd" or OS=="qnx" or OS=="aix"', {
+         or OS=="netbsd" or OS=="qnx" or OS=="aix" or OS=="os400"', {
         'conditions': [
           [ 'v8_no_strict_aliasing==1', {
             'cflags': [ '-fno-strict-aliasing' ],
@@ -1114,7 +1114,7 @@
       ['OS=="netbsd"', {
         'cflags': [ '-I/usr/pkg/include' ],
       }],
-      ['OS=="aix"', {
+      ['OS=="aix" or OS=="os400"', {
         'defines': [
           # Support for malloc(0)
           '_LINUX_SOURCE_COMPAT=1',
@@ -1147,7 +1147,7 @@
             # Support for backtrace_symbols.
             'ldflags': [ '-rdynamic' ],
           }],
-          ['OS=="aix"', {
+          ['OS=="aix" or OS=="os400"', {
             'ldflags': [ '-Wl,-bbigtoc' ],
             'conditions': [
               ['v8_target_arch=="ppc64"', {
@@ -1191,7 +1191,7 @@
             },
             'conditions': [
               ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" or \
-            OS=="qnx" or OS=="aix"', {
+            OS=="qnx" or OS=="aix" or OS=="os400"', {
                 'cflags!': [
                   '-O3',
                   '-O2',
@@ -1242,7 +1242,7 @@
             },
             'conditions': [
               ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" or \
-            OS=="qnx" or OS=="aix"', {
+            OS=="qnx" or OS=="aix" or OS=="os400"', {
                 'cflags!': [
                   '-O0',
                   '-O1',
@@ -1292,7 +1292,7 @@
         'defines!': ['ENABLE_HANDLE_ZAPPING',],
         'conditions': [
           ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \
-            or OS=="aix"', {
+            or OS=="aix" or OS=="os400"', {
             'cflags!': [
               '-Os',
             ],
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
index 2eab895d31248b..2c02324efea853 100644
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -1048,7 +1048,7 @@
             '<(V8_ROOT)/src/base/platform/platform-posix.h',
           ],
           'conditions': [
-            ['OS != "aix" and OS != "solaris"', {
+            ['OS != "aix" and OS != "os400" and OS != "solaris"', {
               'sources': [
                 '<(V8_ROOT)/src/base/platform/platform-posix-time.cc',
                 '<(V8_ROOT)/src/base/platform/platform-posix-time.h',
@@ -1088,6 +1088,12 @@
             }],
           ],
         }],
+        ['OS=="os400"', {
+          'sources': [
+            '<(V8_ROOT)/src/base/debug/stack_trace_posix.cc',
+            '<(V8_ROOT)/src/base/platform/platform-aix.cc',
+          ],
+        }],
         ['is_android', {
           'sources': [
             '<(V8_ROOT)/src/base/platform/platform-posix.cc',

From 81e3c965de7e923848667b37b8779fae469a6919 Mon Sep 17 00:00:00 2001
From: mengxumx <mengxumx@cn.ibm.com>
Date: Mon, 11 Apr 2022 14:05:35 +0800
Subject: [PATCH 2/2] build: add libuv patches

---
 deps/uv/common.gypi |  2 +-
 deps/uv/uv.gyp      | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/deps/uv/common.gypi b/deps/uv/common.gypi
index 8e2aa7160bb0a0..cc9c98e762c284 100644
--- a/deps/uv/common.gypi
+++ b/deps/uv/common.gypi
@@ -135,7 +135,7 @@
           }]
         ]
       }],
-      ['OS in "freebsd dragonflybsd linux openbsd solaris android aix"', {
+      ['OS in "freebsd dragonflybsd linux openbsd solaris android aix os400"', {
         'cflags': [ '-Wall' ],
         'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ],
         'target_conditions': [
diff --git a/deps/uv/uv.gyp b/deps/uv/uv.gyp
index 093f611fb6f6d8..cdb6af7ca0e65b 100644
--- a/deps/uv/uv.gyp
+++ b/deps/uv/uv.gyp
@@ -324,6 +324,21 @@
             }],
           ]
         }],
+        [ 'OS=="os400"', {
+          'sources': [
+            'src/unix/aix-common.c',
+            'src/unix/ibmi.c',
+            'src/unix/posix-poll.c',
+            'src/unix/no-fsevents.c',
+            'src/unix/no-proctitle.c',
+          ],
+          'defines': [
+            '_ALL_SOURCE',
+            '_XOPEN_SOURCE=500',
+            '_LINUX_SOURCE_COMPAT',
+            '_THREAD_SAFE',
+          ],
+        }],
         [ 'OS=="freebsd" or OS=="dragonflybsd"', {
           'sources': [ 'src/unix/freebsd.c' ],
         }],