Merge dd7c9e2 into d490636

Author: amyspark

azure-pipelines.yml

@@ -94,6 +94,8 @@ jobs:
   - bash: ci/intel-scripts/cache_exclude_windows.sh
     displayName: exclude unused files from cache
     condition: and(ne(variables.CACHE_RESTORED, 'true'), eq(variables.ifort, 'true'))
+  - script: choco install -y nasm
+    displayName: install NASM
   - task: UsePythonVersion@0
     inputs:
       versionSpec: '3.7'

mesonbuild/build.py

@@ -1546,6 +1546,7 @@ def get_clink_dynamic_linker_and_stdlibs(self) -> T.Tuple['Compiler', T.List[str
         MASK_LANGS = frozenset([
             # (language, linker)
             ('cpp', 'cuda'),
+            ('nasm', 'c'),
         ])
         # Pick a compiler based on the language priority-order
         for l in clink_langs:

mesonbuild/compilers/compilers.py

@@ -84,7 +84,7 @@
 # List of languages that by default consume and output libraries following the
 # C ABI; these can generally be used interchangeably
 # This must be sorted, see sort_clink().
-clib_langs = ('objcpp', 'cpp', 'objc', 'c', 'fortran')
+clib_langs = ('objcpp', 'cpp', 'objc', 'c', 'nasm', 'fortran')
 # List of languages that can be linked with C code directly by the linker
 # used in build.py:process_compilers() and build.py:get_dynamic_linker()
 # This must be sorted, see sort_clink().

mesonbuild/compilers/detect.py

@@ -189,6 +189,13 @@ def detect_static_linker(env: 'Environment', compiler: Compiler) -> StaticLinker
             trials = [['xilib']]
         elif is_windows() and compiler.id == 'pgi': # this handles cpp / nvidia HPC, in addition to just c/fortran
             trials = [['ar']]  # For PGI on Windows, "ar" is just a wrapper calling link/lib.
+        elif is_windows() and compiler.id == 'nasm':
+            # This may well be LINK.EXE if it's under a MSVC environment
+            trials = [
+                defaults['vs_static_linker'],
+                defaults['clang_cl_static_linker'],
+                default_linkers
+            ]
         else:
             trials = default_linkers
     popen_exceptions = {}

mesonbuild/compilers/mixins/visualstudio.py

@@ -437,6 +437,24 @@ def get_instruction_set_args(self, instruction_set: str) -> T.Optional[T.List[st
     def get_pch_base_name(self, header: str) -> str:
         return os.path.basename(header)
 
+    # Linking ASM-only objects into an executable or DLL
+    # require this, otherwise it'll fail to find
+    # _WinMain or _DllMainCRTStartup.
+    def get_crt_link_args(self, crt_val: str, buildtype: str) -> T.List[str]:
+        host_crt_compile_args = self.get_crt_compile_args(crt_val, buildtype)
+        for arg in host_crt_compile_args:
+            if arg == '/MTd':
+                return ['/DEFAULTLIB:libucrtd.lib', '/DEFAULTLIB:libvcruntimed.lib', '/DEFAULTLIB:libcmtd.lib']
+            elif arg == '/MT':
+                return ['/DEFAULTLIB:libucrt.lib', '/DEFAULTLIB:libvcruntime.lib', '/DEFAULTLIB:libcmt.lib']
+            elif arg == '/MDd':
+                return ['/DEFAULTLIB:ucrtd.lib', '/DEFAULTLIB:vcruntimed.lib', '/DEFAULTLIB:msvcrtd.lib']
+            elif arg == '/MD':
+                return ['/DEFAULTLIB:ucrt.lib', '/DEFAULTLIB:vcruntime.lib', '/DEFAULTLIB:msvcrt.lib']
+            else:
+                continue
+        return []
+
 
 class ClangClCompiler(VisualStudioLikeCompiler):
 

test cases/nasm/3 nasm only/dummy.asm

@@ -0,0 +1,4 @@
+global dummy
+section .rdata align=16
+dummy:
+  dd 0x00010203

test cases/nasm/3 nasm only/dummy.def

@@ -0,0 +1,2 @@
+EXPORTS
+	dummy

test cases/nasm/3 nasm only/meson.build

@@ -0,0 +1,13 @@
+project('nasm only')
+
+if not add_languages('nasm', required: false)
+  error('MESON_SKIP_TEST: nasm not found')
+endif
+
+sources = files('dummy.asm')
+
+dummy = library(
+    'dummy',
+    sources,
+    vs_module_defs: 'dummy.def',
+)

test cases/nasm/4 nasm and c together/dummy.asm

@@ -0,0 +1,4 @@
+global dummy
+section .rdata align=16
+dummy:
+  dd 0x00010203

test cases/nasm/4 nasm and c together/hello.c

@@ -0,0 +1,15 @@
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdio.h>
+
+extern uint32_t dummy[]; 
+
+int main()
+{
+    if (*dummy != 0x00010203u) {
+        fprintf(stderr, "Dummy value was: %" PRIu32 "\n", *dummy);
+        return 1;
+    }
+
+    return 0;
+}