deps,test: fixed failures

Signed-off-by: Paolo Insogna <paolo@cowtech.it>

Author: ShogunPanda

deps/libffi/libffi.gyp

@@ -19,7 +19,6 @@
           'variables': {
             'libffi_arch_sources': [
               'src/x86/ffiw64.c',
-              'src/x86/win64_intel.S',
             ],
             'libffi_defines': [
               'LIBFFI_HIDE_BASIC_TYPES',
@@ -146,6 +145,45 @@
           ],
         },
       ],
+      'conditions': [
+        ['OS == "win" and target_arch == "x64"', {
+          'actions': [
+            {
+              'action_name': 'preprocess_win64_intel_asm',
+              'process_outputs_as_sources': 1,
+              'inputs': [
+                'preprocess_asm.py',
+                'include/ffi_cfi.h',
+                'src/x86/asmnames.h',
+                'src/x86/win64_intel.S',
+                '<(INTERMEDIATE_DIR)/ffi.h',
+                '<(INTERMEDIATE_DIR)/fficonfig.h',
+              ],
+              'outputs': [
+                '<(INTERMEDIATE_DIR)/win64_intel.asm',
+              ],
+              'action': [
+                '<(python)',
+                'preprocess_asm.py',
+                '--input',
+                'src/x86/win64_intel.S',
+                '--output',
+                '<@(_outputs)',
+                '--include-dir',
+                'include',
+                '--include-dir',
+                'src/x86',
+                '--include-dir',
+                '<(INTERMEDIATE_DIR)',
+                '--define',
+                'FFI_BUILDING',
+                '--define',
+                'LIBFFI_HIDE_BASIC_TYPES',
+              ],
+            },
+          ],
+        }],
+      ],
       'direct_dependent_settings': {
         'include_dirs': [
           'include',

deps/libffi/preprocess_asm.py

@@ -0,0 +1,72 @@
+#!/usr/bin/env python3
+
+import argparse
+import os
+from pathlib import Path
+import shlex
+import shutil
+import subprocess
+import sys
+
+
+def split_command(value):
+    if not value:
+        return None
+    value = value.strip()
+    if not value:
+        return None
+    return shlex.split(value, posix=(os.name != 'nt'))
+
+
+def find_compiler():
+    for var in ('CC', 'CXX'):
+        command = split_command(os.environ.get(var))
+        if command and shutil.which(command[0]):
+            return command
+
+    for name in ('cl.exe', 'cl', 'clang-cl.exe', 'clang-cl', 'cc', 'clang', 'gcc'):
+        path = shutil.which(name)
+        if path:
+            return [path]
+
+    raise RuntimeError('Unable to locate a compiler for preprocessing assembly')
+
+
+def preprocess(args):
+    compiler = find_compiler()
+    output = Path(args.output)
+    output.parent.mkdir(parents=True, exist_ok=True)
+
+    if os.name == 'nt' and Path(compiler[0]).name.lower() in ('cl.exe', 'cl', 'clang-cl.exe', 'clang-cl'):
+        command = compiler + ['/nologo', '/EP', '/TC']
+        command += [f'/I{include_dir}' for include_dir in args.include_dir]
+        command += [f'/D{define}' for define in args.define]
+        command += [args.input]
+    else:
+        command = compiler + ['-E', '-P', '-x', 'c']
+        command += [f'-I{include_dir}' for include_dir in args.include_dir]
+        command += [f'-D{define}' for define in args.define]
+        command += [args.input]
+
+    result = subprocess.run(command, capture_output=True, text=True)
+    if result.returncode != 0:
+        sys.stderr.write(result.stderr)
+        raise RuntimeError(f'Preprocessing failed: {" ".join(command)}')
+
+    output.write_text(result.stdout, encoding='utf-8')
+
+
+def main(argv=None):
+    parser = argparse.ArgumentParser(description='Preprocess libffi assembly source')
+    parser.add_argument('--input', required=True)
+    parser.add_argument('--output', required=True)
+    parser.add_argument('--include-dir', action='append', default=[])
+    parser.add_argument('--define', action='append', default=[])
+    args = parser.parse_args(argv)
+
+    preprocess(args)
+    return 0
+
+
+if __name__ == '__main__':
+    raise SystemExit(main())